From: Luc Teirlinck Date: Wed, 8 Dec 2004 01:10:13 +0000 (+0000) Subject: `edit-kbd-macro' is now bound to `C-x C-k e'. X-Git-Tag: ttn-vms-21-2-B4~3377 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b680abcbeb4b5192c35a5602a8d6e9240ffdde74;p=emacs.git `edit-kbd-macro' is now bound to `C-x C-k e'. (edmacro-finish-edit): Further update for keyboard macros that are lambda forms. (edmacro-sanitize-for-string): Correctly remove Meta modifier (as suggested by Kim Storm). --- diff --git a/lisp/edmacro.el b/lisp/edmacro.el index 0db09d7eebe..67be9f34a15 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 ;; Maintainer: Dave Gillespie @@ -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)