;;; 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.
+;; 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.
(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))
\\[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
(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))))
(provide 'macros)
-;; arch-tag: 346ed1a5-1220-4bc8-b533-961ee704361f
;;; macros.el ends here