aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman1994-02-04 06:45:26 +0000
committerRichard M. Stallman1994-02-04 06:45:26 +0000
commit3f5e6d796bac2a9deccad05a6630dcead8ed4f63 (patch)
treec831f5563019d2972f57d668c1fe6b4f5a3182c3
parentb7a321a4d4a050834d74048fd5cd3f165eacea98 (diff)
downloademacs-3f5e6d796bac2a9deccad05a6630dcead8ed4f63.tar.gz
emacs-3f5e6d796bac2a9deccad05a6630dcead8ed4f63.zip
(edit-kbd-macro, edmacro-finish-edit, insert-kbd-macro):
Pass (keymap) as KEYMAP arg to where-is-internal.
-rw-r--r--lisp/edmacro.el6
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/edmacro.el b/lisp/edmacro.el
index ab2a6c1631f..6c913b7b0fb 100644
--- a/lisp/edmacro.el
+++ b/lisp/edmacro.el
@@ -143,7 +143,7 @@ With a prefix argument, format the macro in a more concise way."
143 (insert ";; Original keys: " fmt "\n") 143 (insert ";; Original keys: " fmt "\n")
144 (unless store-hook 144 (unless store-hook
145 (insert "\nCommand: " (if cmd (symbol-name cmd) "none") "\n") 145 (insert "\nCommand: " (if cmd (symbol-name cmd) "none") "\n")
146 (let ((keys (where-is-internal (or cmd mac) nil))) 146 (let ((keys (where-is-internal (or cmd mac) '(keymap))))
147 (if keys 147 (if keys
148 (while keys 148 (while keys
149 (insert "Key: " (edmacro-format-keys (pop keys) 1) "\n")) 149 (insert "Key: " (edmacro-format-keys (pop keys) 1) "\n"))
@@ -278,7 +278,7 @@ or nil, use a compact 80-column format."
278 (fset cmd mac))) 278 (fset cmd mac)))
279 (if no-keys 279 (if no-keys
280 (when cmd 280 (when cmd
281 (loop for key in (where-is-internal cmd nil) do 281 (loop for key in (where-is-internal cmd '(keymap)) do
282 (global-unset-key key))) 282 (global-unset-key key)))
283 (when keys 283 (when keys
284 (if (= (length mac) 0) 284 (if (= (length mac) 0)
@@ -682,7 +682,7 @@ use this command, and then save the file."
682 (prin1 definition (current-buffer)) 682 (prin1 definition (current-buffer))
683 (insert "))\n") 683 (insert "))\n")
684 (if keys 684 (if keys
685 (let ((keys (where-is-internal macroname nil))) 685 (let ((keys (where-is-internal macroname '(keymap))))
686 (while keys 686 (while keys
687 (insert (format "(global-set-key %S '%s)\n" (car keys) macroname)) 687 (insert (format "(global-set-key %S '%s)\n" (car keys) macroname))
688 (setq keys (cdr keys))))))) 688 (setq keys (cdr keys)))))))