summaryrefslogtreecommitdiff
path: root/lisp/use-package/use-package-bind-key.el
diff options
context:
space:
mode:
authorJohn Wiegley <johnw@newartisans.com>2022-11-15 09:28:30 -0800
committerGitHub <noreply@github.com>2022-11-15 09:28:30 -0800
commitf4ee1c3839a7cc5818198cd1031aee2bef15a7d6 (patch)
tree3b7699e4ffab2312c14f697da11059409ba4b86c /lisp/use-package/use-package-bind-key.el
parentcf8ab8b52eae65a108d899e896e1171355122bb7 (diff)
parent49fffe7cf4beb7b35d90758f4e6c24ebfe3615e1 (diff)
downloademacs-f4ee1c3839a7cc5818198cd1031aee2bef15a7d6.tar.gz
emacs-f4ee1c3839a7cc5818198cd1031aee2bef15a7d6.tar.bz2
emacs-f4ee1c3839a7cc5818198cd1031aee2bef15a7d6.zip
Merge pull request from jwiegley/johnw/multi-keymap
GitHub-reference: https://github.com/jwiegley/use-package/issues/1019
Diffstat (limited to 'lisp/use-package/use-package-bind-key.el')
-rw-r--r--lisp/use-package/use-package-bind-key.el13
1 files changed, 7 insertions, 6 deletions
diff --git a/lisp/use-package/use-package-bind-key.el b/lisp/use-package/use-package-bind-key.el
index 5e6a10925ca..460d6255e93 100644
--- a/lisp/use-package/use-package-bind-key.el
+++ b/lisp/use-package/use-package-bind-key.el
@@ -86,19 +86,20 @@ deferred until the prefix key sequence is pressed."
;; :prefix-docstring STRING
;; :prefix-map SYMBOL
;; :prefix STRING
- ;; :repeat-docstring STRING
+ ;; :repeat-docstring STRING
;; :repeat-map SYMBOL
;; :filter SEXP
;; :menu-name STRING
;; :package SYMBOL
- ;; :continue and :exit are used within :repeat-map
- ((or (and (eq x :map) (symbolp (cadr arg)))
+ ;; :continue and :exit are used within :repeat-map
+ ((or (and (eq x :map) (or (symbolp (cadr arg))
+ (listp (cadr arg))))
(and (eq x :prefix) (stringp (cadr arg)))
(and (eq x :prefix-map) (symbolp (cadr arg)))
(and (eq x :prefix-docstring) (stringp (cadr arg)))
- (and (eq x :repeat-map) (symbolp (cadr arg)))
- (eq x :continue)
- (eq x :exit)
+ (and (eq x :repeat-map) (symbolp (cadr arg)))
+ (eq x :continue)
+ (eq x :exit)
(and (eq x :repeat-docstring) (stringp (cadr arg)))
(eq x :filter)
(and (eq x :menu-name) (stringp (cadr arg)))