[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
emacs-29 f67a9a12b7b: Fix interactive use of `keymap-local-set' and `key
From: |
Robert Pluim |
Subject: |
emacs-29 f67a9a12b7b: Fix interactive use of `keymap-local-set' and `keymap-global-set' |
Date: |
Mon, 30 Jan 2023 08:25:09 -0500 (EST) |
branch: emacs-29
commit f67a9a12b7b0cdd6030cb080a6d6838255789a08
Author: Robert Pluim <rpluim@gmail.com>
Commit: Robert Pluim <rpluim@gmail.com>
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)
---
lisp/keymap.el | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/lisp/keymap.el b/lisp/keymap.el
index 791221f2459..caabedd5aec 100644
--- a/lisp/keymap.el
+++ b/lisp/keymap.el
@@ -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)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- emacs-29 f67a9a12b7b: Fix interactive use of `keymap-local-set' and `keymap-global-set',
Robert Pluim <=