Commit 3f5e6d79 authored by Richard M. Stallman's avatar Richard M. Stallman

(edit-kbd-macro, edmacro-finish-edit, insert-kbd-macro):

Pass (keymap) as KEYMAP arg to where-is-internal.
parent b7a321a4
...@@ -143,7 +143,7 @@ With a prefix argument, format the macro in a more concise way." ...@@ -143,7 +143,7 @@ With a prefix argument, format the macro in a more concise way."
(insert ";; Original keys: " fmt "\n") (insert ";; Original keys: " fmt "\n")
(unless store-hook (unless store-hook
(insert "\nCommand: " (if cmd (symbol-name cmd) "none") "\n") (insert "\nCommand: " (if cmd (symbol-name cmd) "none") "\n")
(let ((keys (where-is-internal (or cmd mac) nil))) (let ((keys (where-is-internal (or cmd mac) '(keymap))))
(if keys (if keys
(while keys (while keys
(insert "Key: " (edmacro-format-keys (pop keys) 1) "\n")) (insert "Key: " (edmacro-format-keys (pop keys) 1) "\n"))
...@@ -278,7 +278,7 @@ or nil, use a compact 80-column format." ...@@ -278,7 +278,7 @@ or nil, use a compact 80-column format."
(fset cmd mac))) (fset cmd mac)))
(if no-keys (if no-keys
(when cmd (when cmd
(loop for key in (where-is-internal cmd nil) do (loop for key in (where-is-internal cmd '(keymap)) do
(global-unset-key key))) (global-unset-key key)))
(when keys (when keys
(if (= (length mac) 0) (if (= (length mac) 0)
...@@ -682,7 +682,7 @@ use this command, and then save the file." ...@@ -682,7 +682,7 @@ use this command, and then save the file."
(prin1 definition (current-buffer)) (prin1 definition (current-buffer))
(insert "))\n") (insert "))\n")
(if keys (if keys
(let ((keys (where-is-internal macroname nil))) (let ((keys (where-is-internal macroname '(keymap))))
(while keys (while keys
(insert (format "(global-set-key %S '%s)\n" (car keys) macroname)) (insert (format "(global-set-key %S '%s)\n" (car keys) macroname))
(setq keys (cdr keys))))))) (setq keys (cdr keys)))))))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment