mirror of
https://github.com/masscollaborationlabs/emacs.git
synced 2025-07-10 14:10:51 +00:00
Fix interactive use of keymap-local-set' and
keymap-global-set'
* lisp/keymap.el (keymap-global-set, keymap-local-set): Convert the read key sequence to a string when called interactively. Based on a patch from Stephen Berman <stephen.berman@gmx.net>. (Bug#61149)
This commit is contained in:
parent
dda4baa58b
commit
f67a9a12b7
1 changed files with 6 additions and 7 deletions
|
@ -76,12 +76,9 @@ Note that if KEY has a local binding in the current buffer,
|
|||
that local binding will continue to shadow any global binding
|
||||
that you make with this function."
|
||||
(declare (compiler-macro (lambda (form) (keymap--compile-check key) form)))
|
||||
(interactive
|
||||
(let* ((menu-prompting nil)
|
||||
(key (read-key-sequence "Set key globally: " nil t)))
|
||||
(list key
|
||||
(read-command (format "Set key %s to command: "
|
||||
(key-description key))))))
|
||||
(interactive "KSet key globally:\nCSet key %s globally to command: ")
|
||||
(unless (stringp key)
|
||||
(setq key (key-description key)))
|
||||
(keymap-set (current-global-map) key command))
|
||||
|
||||
(defun keymap-local-set (key command)
|
||||
|
@ -94,10 +91,12 @@ KEY is a string that satisfies `key-valid-p'.
|
|||
The binding goes in the current buffer's local map, which in most
|
||||
cases is shared with all other buffers in the same major mode."
|
||||
(declare (compiler-macro (lambda (form) (keymap--compile-check key) form)))
|
||||
(interactive "KSet key locally: \nCSet key %s locally to command: ")
|
||||
(interactive "KSet key locally:\nCSet key %s locally to command: ")
|
||||
(let ((map (current-local-map)))
|
||||
(unless map
|
||||
(use-local-map (setq map (make-sparse-keymap))))
|
||||
(unless (stringp key)
|
||||
(setq key (key-description key)))
|
||||
(keymap-set map key command)))
|
||||
|
||||
(defun keymap-global-unset (key &optional remove)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue