diff options
| author | John Wiegley <johnw@newartisans.com> | 2022-11-15 15:28:53 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-15 15:28:53 -0800 |
| commit | 7087a97a24fe0d9fba756369bfb23b28093f6e67 (patch) | |
| tree | 1f7f09a99f93707a7d9e2d1ad7955febe8f13c05 /lisp/use-package/use-package-bind-key.el | |
| parent | f4ee1c3839a7cc5818198cd1031aee2bef15a7d6 (diff) | |
| parent | 3e81af80a2fdf200395aea6bdf15dd897303956f (diff) | |
| download | emacs-7087a97a24fe0d9fba756369bfb23b28093f6e67.tar.gz emacs-7087a97a24fe0d9fba756369bfb23b28093f6e67.tar.bz2 emacs-7087a97a24fe0d9fba756369bfb23b28093f6e67.zip | |
Merge pull request from jwiegley/revert-1019-johnw/multi-keymap
GitHub-reference: https://github.com/jwiegley/use-package/issues/1021
Diffstat (limited to 'lisp/use-package/use-package-bind-key.el')
| -rw-r--r-- | lisp/use-package/use-package-bind-key.el | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/lisp/use-package/use-package-bind-key.el b/lisp/use-package/use-package-bind-key.el index 460d6255e93..5e6a10925ca 100644 --- a/lisp/use-package/use-package-bind-key.el +++ b/lisp/use-package/use-package-bind-key.el @@ -86,20 +86,19 @@ 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) (or (symbolp (cadr arg)) - (listp (cadr arg)))) + ;; :continue and :exit are used within :repeat-map + ((or (and (eq x :map) (symbolp (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))) |