from trunk

[gnu-emacs] / lisp / macros.el

diff --git a/lisp/macros.el b/lisp/macros.el
index 4f0194ea59558fbcf484d2e7ed1fb5723f2242fe..fa45d8c6108a78adb10638a291cad9a29f137689 100644 (file)
--- a/lisp/macros.el
+++ b/lisp/macros.el
@@ -1,7 +1,7 @@
 ;;; macros.el --- non-primitive commands for keyboard macros
 
 ;; Copyright (C) 1985, 1986, 1987, 1992, 1994, 1995, 2001, 2002, 2003,
-;;   2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: abbrev
@@ -131,46 +131,15 @@ use this command, and then save the file."
              (insert (if (zerop i) ?\[ ?\s))
              (setq char (aref definition i)
                    i (1+ i))
-             (cond ((not (numberp char))
-                    (prin1 char (current-buffer)))
-                   (t
-                    (insert "?")
-                    (setq mods (event-modifiers char)
-                          char (event-basic-type char))
-                    (while mods
-                      (cond ((eq (car mods) 'control)
-                             (insert "\\C-"))
-                            ((eq (car mods) 'meta)
-                             (insert "\\M-"))
-                            ((eq (car mods) 'hyper)
-                             (insert "\\H-"))
-                            ((eq (car mods) 'super)
-                             (insert "\\s-"))
-                            ((eq (car mods) 'alt)
-                             (insert "\\A-"))
-                            ((and (eq (car mods) 'shift)
-                                  (>= char ?a)
-                                  (<= char ?z))
-                             (setq char (upcase char)))
-                            ((eq (car mods) 'shift)
-                             (insert "\\S-")))
-                      (setq mods (cdr mods)))
-                    (cond ((= char ?\\)
-                           (insert "\\\\"))
-                           ((= char ?\")
-                            (insert "\\\""))
-                          ((= char ?\;)
-                           (insert "\\;"))
-                          ((= char 127)
-                           (insert "\\C-?"))
-                          ((< char 127)
-                           (insert char))
-                          (t (insert "\\" (format "%o" char)))))))
+             (if (not (numberp char))
+                  (prin1 char (current-buffer))
+                (princ (prin1-char char) (current-buffer))))
            (insert ?\]))
        (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))
@@ -241,8 +210,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
@@ -306,7 +274,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))))