procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve keymap-global-set and keymap-local-set interactive use fix

Browse source 
* lisp/keymap.el (keymap-global-set, keymap-local-set): Add optional
`interactive' arg and use it to decide when to convert the key
specification to a string.  Add `advertised-calling-convention'
declarations.  (Bug#61149)
This commit is contained in:
Robert Pluim 2023-02-02 11:37:45 +01:00
parent 96ea27278b
commit e444115d02
1 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
lisp/keymap.el
View file

@ -65,7 +65,7 @@ DEFINITION is anything that can be a key's definition:
(setq definition (key-parse definition))) (setq definition (key-parse definition)))
(define-key keymap (key-parse key) definition)) (define-key keymap (key-parse key) definition))
(defun keymap-global-set (key command) (defun keymap-global-set (key command &optional interactive)
"Give KEY a global binding as COMMAND. "Give KEY a global binding as COMMAND.
COMMAND is the command definition to use; usually it is COMMAND is the command definition to use; usually it is
a symbol naming an interactively-callable function. a symbol naming an interactively-callable function.
@ -75,13 +75,14 @@ KEY is a string that satisfies `key-valid-p'.
Note that if KEY has a local binding in the current buffer, Note that if KEY has a local binding in the current buffer,
that local binding will continue to shadow any global binding that local binding will continue to shadow any global binding
that you make with this function." that you make with this function."
(declare (compiler-macro (lambda (form) (keymap--compile-check key) form))) (declare (compiler-macro (lambda (form) (keymap--compile-check key) form))
(interactive "KSet key globally:\nCSet key %s globally to command: ") (advertised-calling-convention (key command) "29.1"))
(unless (stringp key) (interactive "KSet key globally: \nCSet key %s globally to command: \np")
(when interactive
(setq key (key-description key))) (setq key (key-description key)))
(keymap-set (current-global-map) key command)) (keymap-set (current-global-map) key command))
(defun keymap-local-set (key command) (defun keymap-local-set (key command &optional interactive)
"Give KEY a local binding as COMMAND. "Give KEY a local binding as COMMAND.
COMMAND is the command definition to use; usually it is COMMAND is the command definition to use; usually it is
a symbol naming an interactively-callable function. a symbol naming an interactively-callable function.
@ -90,12 +91,13 @@ KEY is a string that satisfies `key-valid-p'.
The binding goes in the current buffer's local map, which in most 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." cases is shared with all other buffers in the same major mode."
(declare (compiler-macro (lambda (form) (keymap--compile-check key) form))) (declare (compiler-macro (lambda (form) (keymap--compile-check key) form))
(interactive "KSet key locally:\nCSet key %s locally to command: ") (advertised-calling-convention (key command) "29.1"))
(interactive "KSet key locally: \nCSet key %s locally to command: \np")
(let ((map (current-local-map))) (let ((map (current-local-map)))
(unless map (unless map
(use-local-map (setq map (make-sparse-keymap)))) (use-local-map (setq map (make-sparse-keymap))))
(unless (stringp key) (when interactive
(setq key (key-description key))) (setq key (key-description key)))
(keymap-set map key command))) (keymap-set map key command)))