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

Improve edit-kbd-macro prompting in case of remapped keys (Bug#29399)

Browse source 
* lisp/edmacro.el (edit-kbd-macro): Use substitute-command-keys to
present the current bindings in the prompt.  Check the the
non-remapped binding of the entered key sequence as well.
This commit is contained in:
Noam Postavsky 2017-11-26 19:16:16 -05:00
parent c02c1f6be7
commit 98ca7d5f26
1 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

23
lisp/edmacro.el
View file

@ -88,20 +88,26 @@ Default nil means to write characters above \\177 in octal notation."
(defun edit-kbd-macro (keys &optional prefix finish-hook store-hook) (defun edit-kbd-macro (keys &optional prefix finish-hook store-hook)
"Edit a keyboard macro. "Edit a keyboard macro.
At the prompt, type any key sequence which is bound to a keyboard macro. At the prompt, type any key sequence which is bound to a keyboard macro.
Or, type `C-x e' or RET to edit the last keyboard macro, `C-h l' to edit Or, type `\\[kmacro-end-and-call-macro]' or RET to edit the last
the last 300 keystrokes as a keyboard macro, or `\\[execute-extended-command]' to edit a macro by keyboard macro, `\\[view-lossage]' to edit the last 300
its command name. keystrokes as a keyboard macro, or `\\[execute-extended-command]'
to edit a macro by its command name.
With a prefix argument, format the macro in a more concise way." With a prefix argument, format the macro in a more concise way."
(interactive "kKeyboard macro to edit (C-x e, M-x, C-h l, or keys): \nP") (interactive
(list (read-key-sequence (substitute-command-keys "Keyboard macro to edit \
\(\\[kmacro-end-and-call-macro], \\[execute-extended-command], \\[view-lossage],\
or keys): "))
current-prefix-arg))
(when keys (when keys
(let ((cmd (if (arrayp keys) (key-binding keys) keys)) (let ((cmd (if (arrayp keys) (key-binding keys) keys))
(cmd-noremap (when (arrayp keys) (key-binding keys nil t)))
(mac nil) (mac-counter nil) (mac-format nil) (mac nil) (mac-counter nil) (mac-format nil)
kmacro) kmacro)
(cond (store-hook (cond (store-hook
(setq mac keys) (setq mac keys)
(setq cmd nil)) (setq cmd nil))
((or (memq cmd '(call-last-kbd-macro kmacro-call-macro ((or (memq cmd '(call-last-kbd-macro kmacro-call-macro kmacro-end-or-call-macro kmacro-end-and-call-macro))
kmacro-end-or-call-macro kmacro-end-and-call-macro)) (memq cmd-noremap '(call-last-kbd-macro kmacro-call-macro kmacro-end-or-call-macro kmacro-end-and-call-macro))
(member keys '("\r" [return]))) (member keys '("\r" [return])))
(or last-kbd-macro (or last-kbd-macro
(y-or-n-p "No keyboard macro defined. Create one? ") (y-or-n-p "No keyboard macro defined. Create one? ")
@ -109,13 +115,14 @@ With a prefix argument, format the macro in a more concise way."
(setq mac (or last-kbd-macro "")) (setq mac (or last-kbd-macro ""))
(setq keys nil) (setq keys nil)
(setq cmd 'last-kbd-macro)) (setq cmd 'last-kbd-macro))
((eq cmd 'execute-extended-command) ((memq 'execute-extended-command (list cmd cmd-noremap))
(setq cmd (read-command "Name of keyboard macro to edit: ")) (setq cmd (read-command "Name of keyboard macro to edit: "))
(if (string-equal cmd "") (if (string-equal cmd "")
(error "No command name given")) (error "No command name given"))
(setq keys nil) (setq keys nil)
(setq mac (symbol-function cmd))) (setq mac (symbol-function cmd)))
((memq cmd '(view-lossage electric-view-lossage)) ((or (memq cmd '(view-lossage electric-view-lossage))
(memq cmd-noremap '(view-lossage electric-view-lossage)))
(setq mac (recent-keys)) (setq mac (recent-keys))
(setq keys nil) (setq keys nil)
(setq cmd 'last-kbd-macro)) (setq cmd 'last-kbd-macro))