HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Spelling fixes.
[bpt/emacs.git]
/
lisp
/
macros.el
diff --git
a/lisp/macros.el
b/lisp/macros.el
index
ef167bd
..
554f89a
100644
(file)
--- a/
lisp/macros.el
+++ b/
lisp/macros.el
@@
-1,10
+1,11
@@
;;; macros.el --- non-primitive commands for keyboard macros
;;; 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
;; Maintainer: FSF
;; Keywords: abbrev
+;; Package: emacs
;; This file is part of GNU 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)
(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)
(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
(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))
(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))
(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))))
(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)
(provide 'macros)
-;; arch-tag: 346ed1a5-1220-4bc8-b533-961ee704361f
;;; macros.el ends here
;;; macros.el ends here