(bad-packages-alist): Revert previous change.

[gnu-emacs] / lisp / macros.el

diff --git a/lisp/macros.el b/lisp/macros.el
index bb9fda41a4552fa14399af1d8668526ac92cb8fe..23d0a33fde19c6acfab987d86b7a2c61743e32f1 100644 (file)
--- a/lisp/macros.el
+++ b/lisp/macros.el
@@ -1,6 +1,7 @@
 ;;; macros.el --- non-primitive commands for keyboard macros
 
-;; Copyright (C) 1985, 86, 87, 92, 94, 95, 04 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1986, 1987, 1992, 1994, 1995, 2001, 2002, 2003,
+;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: abbrev
@@ -9,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -19,8 +20,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -63,12 +64,13 @@ 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 (list (intern (completing-read "Insert kbd macro (name): " 
-                                             obarray 
+  (interactive (list (intern (completing-read "Insert kbd macro (name): "
+                                             obarray
                                              (lambda (elt)
                                                (and (fboundp elt)
                                                     (or (stringp (symbol-function elt))
-                                                        (vectorp (symbol-function elt)))))
+                                                        (vectorp (symbol-function elt))
+                                                        (get elt 'kmacro))))
                                              t))
                     current-prefix-arg))
   (let (definition)
@@ -128,7 +130,7 @@ use this command, and then save the file."
       (if (vectorp definition)
          (let ((len (length definition)) (i 0) char mods)
            (while (< i len)
-             (insert (if (zerop i) ?\[ ?\ ))
+             (insert (if (zerop i) ?\[ ?\s))
              (setq char (aref definition i)
                    i (1+ i))
              (cond ((not (numberp char))