X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/114f9c96795aff3b51b9060d7c9c1b77debcc99a..22bcf2046977620a7f37bbd4dff4be4a4fffc0ed:/lisp/macros.el

diff --git a/lisp/macros.el b/lisp/macros.el
index ef167bd690..554f89a8a6 100644
--- 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, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 1985-1987, 1992, 1994-1995, 2001-2011
+;;   Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: abbrev
+;; Package: emacs
 
 ;; This file is part of GNU Emacs.
 
@@ -126,7 +127,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 +139,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))
@@ -273,7 +275,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))))
 
@@ -281,5 +283,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