Merged in changes from CVS trunk.

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-672
   Update from CVS


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-266

1 files changed, 8 insertions, 1 deletions

diff --git a/lisp/macros.el b/lisp/macros.el
index 0de5d223ee0..bb9fda41a45 100644
--- a/lisp/macros.el
+++ b/lisp/macros.el
@@ -63,7 +63,14 @@ bindings.
 
 To save a kbd macro, visit a file of Lisp code such as your `~/.emacs',
 use this command, and then save the file."
-  (interactive "CInsert kbd macro (name): \nP")
+  (interactive (list (intern (completing-read "Insert kbd macro (name): " 
+                                              obarray 
+                                              (lambda (elt)
+                                                (and (fboundp elt)
+                                                     (or (stringp (symbol-function elt))
+                                                         (vectorp (symbol-function elt)))))
+                                              t))
+                     current-prefix-arg))
   (let (definition)
     (if (string= (symbol-name macroname) "")
         (progn