From: Richard M. Stallman <rms@gnu.org>
Date: Fri, 4 Feb 1994 06:45:26 +0000 (+0000)
Subject: (edit-kbd-macro, edmacro-finish-edit, insert-kbd-macro):
X-Git-Tag: emacs-19.34~10079
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3f5e6d796bac2a9deccad05a6630dcead8ed4f63;p=emacs.git

(edit-kbd-macro, edmacro-finish-edit, insert-kbd-macro):
Pass (keymap) as KEYMAP arg to where-is-internal.
---

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."
 	(insert ";; Original keys: " fmt "\n")
 	(unless store-hook
 	  (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
 		(while keys
 		  (insert "Key: " (edmacro-format-keys (pop keys) 1) "\n"))
@@ -278,7 +278,7 @@ or nil, use a compact 80-column format."
 		(fset cmd mac)))
 	    (if no-keys
 		(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)))
 	      (when keys
 		(if (= (length mac) 0)
@@ -682,7 +682,7 @@ use this command, and then save the file."
     (prin1 definition (current-buffer))
     (insert "))\n")
     (if keys
-	(let ((keys (where-is-internal macroname nil)))
+	(let ((keys (where-is-internal macroname '(keymap))))
 	  (while keys
 	    (insert (format "(global-set-key %S '%s)\n" (car keys) macroname))
 	    (setq keys (cdr keys)))))))