[elpa] externals/company a3e4879 2/2: Merge pull request #1157 from yugaego/quick-access

[ELPA Syncer]

branch: externals/company
commit a3e487966f7e116a328aa5764ab907c1f7729d21
Merge: 824b5fd 42ede0f
Author: Dmitry Gutov <dgutov@yandex.ru>
Commit: GitHub <noreply@github.com>

    Merge pull request #1157 from yugaego/quick-access
    
    Allow Control quick-access modifier key
---
 company.el | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/company.el b/company.el
index a0313b1..d35698f 100644
--- a/company.el
+++ b/company.el
@@ -692,7 +692,8 @@ See `company-quick-access-keys' for more details."
   :set #'company-custom--set-quick-access
   :type '(choice (const :tag "Meta key" meta)
                  (const :tag "Super key" super)
-                 (const :tag "Hyper key" hyper))
+                 (const :tag "Hyper key" hyper)
+                 (const :tag "Control key" control))
   :package-version '(company . "0.9.14"))
 
 (defun company-keymap--quick-access-modifier ()
@@ -700,7 +701,8 @@ See `company-quick-access-keys' for more details."
   (if-let ((modifier (assoc-default company-quick-access-modifier
                                     '((meta . "M")
                                       (super . "s")
-                                      (hyper . "H")))))
+                                      (hyper . "H")
+                                      (control . "C")))))
       modifier
     (warn "company-quick-access-modifier value unknown: %S"
           company-quick-access-modifier)