aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Wiegley2018-03-05 10:09:44 -0800
committerGitHub2018-03-05 10:09:44 -0800
commit76e6d3e8bc348abc48f1bbb2ea100f069e18380c (patch)
tree5836caab8ea225817e488a4f685a6d844a127eea
parent10b4dcb53abf4b2e258167fa1c1373489e194963 (diff)
parent2250f89ac0b8d2c19875dab67e73ac1cfe6ca3df (diff)
downloademacs-76e6d3e8bc348abc48f1bbb2ea100f069e18380c.tar.gz
emacs-76e6d3e8bc348abc48f1bbb2ea100f069e18380c.zip
Merge pull request from matthewbauer/patch-1
Support ":package" in use-package GitHub-reference: https://github.com/jwiegley/use-package/issues/633
-rw-r--r--lisp/use-package/use-package-bind-key.el4
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/use-package/use-package-bind-key.el b/lisp/use-package/use-package-bind-key.el
index d8fe56dfaa5..d17ecb2cf75 100644
--- a/lisp/use-package/use-package-bind-key.el
+++ b/lisp/use-package/use-package-bind-key.el
@@ -87,12 +87,14 @@ deferred until the prefix key sequence is pressed."
87 ;; :prefix STRING 87 ;; :prefix STRING
88 ;; :filter SEXP 88 ;; :filter SEXP
89 ;; :menu-name STRING 89 ;; :menu-name STRING
90 ;; :package SYMBOL
90 ((or (and (eq x :map) (symbolp (cadr arg))) 91 ((or (and (eq x :map) (symbolp (cadr arg)))
91 (and (eq x :prefix) (stringp (cadr arg))) 92 (and (eq x :prefix) (stringp (cadr arg)))
92 (and (eq x :prefix-map) (symbolp (cadr arg))) 93 (and (eq x :prefix-map) (symbolp (cadr arg)))
93 (and (eq x :prefix-docstring) (stringp (cadr arg))) 94 (and (eq x :prefix-docstring) (stringp (cadr arg)))
94 (eq x :filter) 95 (eq x :filter)
95 (and (eq x :menu-name) (stringp (cadr arg)))) 96 (and (eq x :menu-name) (stringp (cadr arg)))
97 (and (eq x :package) (symbolp (cadr arg))))
96 (setq args* (nconc args* (list x (cadr arg)))) 98 (setq args* (nconc args* (list x (cadr arg))))
97 (setq arg (cddr arg))) 99 (setq arg (cddr arg)))
98 ((listp x) 100 ((listp x)