[Emacs-diffs] Changes to emacs/lisp/edmacro.el

[Luc Teirlinck]

Index: emacs/lisp/edmacro.el
diff -c emacs/lisp/edmacro.el:1.33 emacs/lisp/edmacro.el:1.34
*** emacs/lisp/edmacro.el:1.33  Thu Sep 30 13:27:35 2004
--- emacs/lisp/edmacro.el       Wed Dec  8 01:10:13 2004
***************
*** 1,6 ****
  ;;; edmacro.el --- keyboard macro editor
  
! ;; Copyright (C) 1993, 1994 Free Software Foundation, Inc.
  
  ;; Author: Dave Gillespie <address@hidden>
  ;; Maintainer: Dave Gillespie <address@hidden>
--- 1,6 ----
  ;;; edmacro.el --- keyboard macro editor
  
! ;; Copyright (C) 1993, 1994, 2004 Free Software Foundation, Inc.
  
  ;; Author: Dave Gillespie <address@hidden>
  ;; Maintainer: Dave Gillespie <address@hidden>
***************
*** 28,34 ****
  
  ;;; Usage:
  ;;
! ;; The `C-x C-k' (`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:
  ;;
--- 28,34 ----
  
  ;;; Usage:
  ;;
! ;; 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,272 ****
                            (and b (commandp b) (not (arrayp b))
                                 (not (kmacro-extract-lambda b))
                                 (or (not (fboundp b))
!                                    (not (arrayp (symbol-function b))))
                                 (not (y-or-n-p
                                       (format "Key %s is already defined; %s"
                                               (edmacro-format-keys key 1)
--- 266,273 ----
                            (and b (commandp b) (not (arrayp b))
                                 (not (kmacro-extract-lambda b))
                                 (or (not (fboundp 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,661 ****
  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)
            (setf (aref seq i) (logand (aref seq i) 127))))
    seq)
  
--- 656,662 ----
  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 (logand (aref seq i) 128)
            (setf (aref seq i) (logand (aref seq i) 127))))
    seq)