diff options
| author | Miles Bader <miles@gnu.org> | 2004-12-08 05:21:02 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2004-12-08 05:21:02 +0000 |
| commit | 80cc9c8108fd48b04d6114c3a73596a0d596d8af (patch) | |
| tree | 5eb87377bedf819a917304e6c201e6458b361aff /lisp/edmacro.el | |
| parent | 000fc2b1fad05ccd9e6cdb5810febb091f4b5738 (diff) | |
| parent | c90d0a390cdccf1e0d111d5b28f508934cec8753 (diff) | |
| download | emacs-80cc9c8108fd48b04d6114c3a73596a0d596d8af.tar.gz | |
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-75
Merge from emacs--cvs-trunk--0
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-717
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-718
RCS keyword removal
Diffstat (limited to 'lisp/edmacro.el')
| -rw-r--r-- | lisp/edmacro.el | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lisp/edmacro.el b/lisp/edmacro.el index b40cbaafe2d..09872f3ef2c 100644 --- a/lisp/edmacro.el +++ b/lisp/edmacro.el @@ -1,6 +1,6 @@ ;;; edmacro.el --- keyboard macro editor -;; Copyright (C) 1993, 1994 Free Software Foundation, Inc. +;; Copyright (C) 1993, 1994, 2004 Free Software Foundation, Inc. ;; Author: Dave Gillespie <daveg@synaptics.com> ;; Maintainer: Dave Gillespie <daveg@synaptics.com> @@ -28,7 +28,7 @@ ;;; Usage: ;; -;; The `C-x C-k' (`edit-kbd-macro') command edits a keyboard macro +;; The `C-x C-k e' (`edit-kbd-macro') command edits a keyboard macro ;; in a special buffer. It prompts you to type a key sequence, ;; which should be one of: ;; @@ -266,7 +266,8 @@ or nil, use a compact 80-column format." (and b (commandp b) (not (arrayp b)) (not (kmacro-extract-lambda b)) (or (not (fboundp b)) - (not (arrayp (symbol-function b)))) + (not (or (arrayp (symbol-function b)) + (get b 'kmacro)))) (not (y-or-n-p (format "Key %s is already defined; %s" (edmacro-format-keys key 1) @@ -655,7 +656,7 @@ The string represents the same events; Meta is indicated by bit 7. This function assumes that the events can be stored in a string." (setq seq (copy-sequence seq)) (loop for i below (length seq) do - (when (< (aref seq i) 0) + (when (logand (aref seq i) 128) (setf (aref seq i) (logand (aref seq i) 127)))) seq) |