Replace "Maintainer: FSF" with the emacs-devel mailing address

[bpt/emacs.git] / lisp / macros.el

diff --git a/lisp/macros.el b/lisp/macros.el
index 974b19a..eb7f980 100644 (file)
--- a/lisp/macros.el
+++ b/lisp/macros.el
@@ -1,10 +1,11 @@
 ;;; macros.el --- non-primitive commands for keyboard macros
 
-;; Copyright (C) 1985, 1986, 1987, 1992, 1994, 1995, 2001, 2002, 2003,
-;;   2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+;; Copyright (C) 1985-1987, 1992, 1994-1995, 2001-2014 Free Software
+;; Foundation, Inc.
 
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: abbrev
+;; Package: emacs
 
 ;; This file is part of GNU Emacs.
 
@@ -50,7 +51,8 @@ Such a \"function\" cannot be called from Lisp, but it is a valid editor command
 
 ;;;###autoload
 (defun insert-kbd-macro (macroname &optional keys)
-  "Insert in buffer the definition of kbd macro NAME, as Lisp code.
+  "Insert in buffer the definition of kbd macro MACRONAME, as Lisp code.
+MACRONAME should be a symbol.
 Optional second arg KEYS means also record the keys it is on
 \(this is the prefix argument, when calling interactively).
 
@@ -126,7 +128,7 @@ use this command, and then save the file."
                     (delete-region (point) (1+ (point)))
                     (insert "\\M-\\C-?"))))))
       (if (vectorp definition)
-         (let ((len (length definition)) (i 0) char mods)
+         (let ((len (length definition)) (i 0) char)
            (while (< i len)
              (insert (if (zerop i) ?\[ ?\s))
              (setq char (aref definition i)
@@ -138,7 +140,8 @@ use this command, and then save the file."
        (prin1 definition (current-buffer))))
     (insert ")\n")
     (if keys
-       (let ((keys (where-is-internal macroname '(keymap))))
+       (let ((keys (where-is-internal (symbol-function macroname)
+                                      '(keymap))))
          (while keys
            (insert "(global-set-key ")
            (prin1 (car keys) (current-buffer))
@@ -209,8 +212,7 @@ Possibilities: \\<query-replace-map>
 \\[exit]       Stop the macro entirely right now.
 \\[recenter]   Redisplay the screen, then ask again.
 \\[edit]       Enter recursive edit; ask again when you exit from that."))
-                    (save-excursion
-                      (set-buffer standard-output)
+                    (with-current-buffer standard-output
                       (help-mode)))))))))))
 
 ;;;###autoload
@@ -274,7 +276,7 @@ and then select the region of un-tablified names and use
          (set-marker next-line-marker (point)))
        (save-excursion
          (let ((mark-active nil))
-           (execute-kbd-macro (or macro last-kbd-macro)))))
+           (execute-kbd-macro macro))))
       (set-marker end-marker nil)
       (set-marker next-line-marker nil))))
 
@@ -282,5 +284,4 @@ and then select the region of un-tablified names and use
 
 (provide 'macros)
 
-;; arch-tag: 346ed1a5-1220-4bc8-b533-961ee704361f
 ;;; macros.el ends here