aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Wiegley2022-08-07 08:53:36 -0700
committerGitHub2022-08-07 08:53:36 -0700
commita0ba027ee50df6bf4e2e74ee60d3a1812bce1f25 (patch)
tree40b543053583c3d8fe5b1c307bff20c72040bec7
parentca426a773289dfef07a173dc96ce9970c3b51501 (diff)
parent9be2580f5f26cc572d68a465c2fbe1159cc89a8d (diff)
downloademacs-a0ba027ee50df6bf4e2e74ee60d3a1812bce1f25.tar.gz
emacs-a0ba027ee50df6bf4e2e74ee60d3a1812bce1f25.zip
Merge pull request from wcy123/master
GitHub-reference: https://github.com/jwiegley/use-package/issues/822
-rw-r--r--lisp/use-package/bind-key.el5
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/use-package/bind-key.el b/lisp/use-package/bind-key.el
index a3179b297ee..df76c39ceed 100644
--- a/lisp/use-package/bind-key.el
+++ b/lisp/use-package/bind-key.el
@@ -173,8 +173,9 @@ can safely be called at any time."
173 (kdescvar (make-symbol "kdesc")) 173 (kdescvar (make-symbol "kdesc"))
174 (bindingvar (make-symbol "binding"))) 174 (bindingvar (make-symbol "binding")))
175 `(let* ((,namevar ,key-name) 175 `(let* ((,namevar ,key-name)
176 (,keyvar (if (vectorp ,namevar) ,namevar 176 (,keyvar ,(if (stringp key-name) (read-kbd-macro key-name)
177 (read-kbd-macro ,namevar))) 177 `(if (vectorp ,namevar) ,namevar
178 (read-kbd-macro ,namevar))))
178 (,kmapvar (or (if (and ,keymap (symbolp ,keymap)) 179 (,kmapvar (or (if (and ,keymap (symbolp ,keymap))
179 (symbol-value ,keymap) ,keymap) 180 (symbol-value ,keymap) ,keymap)
180 global-map)) 181 global-map))