[Emacs-diffs] Changes to emacs/lisp/kmacro.el [emacs-unicode-2]

[Miles Bader]

Index: emacs/lisp/kmacro.el
diff -c emacs/lisp/kmacro.el:1.16.6.4 emacs/lisp/kmacro.el:1.16.6.5
*** emacs/lisp/kmacro.el:1.16.6.4       Thu Oct 14 08:49:59 2004
--- emacs/lisp/kmacro.el        Thu Nov  4 08:55:35 2004
***************
*** 1,6 ****
  ;;; kmacro.el --- enhanced keyboard macros
  
! ;; Copyright (C) 2002  Free Software Foundation, Inc.
  
  ;; Author: Kim F. Storm <address@hidden>
  ;; Keywords: keyboard convenience
--- 1,6 ----
  ;;; kmacro.el --- enhanced keyboard macros
  
! ;; Copyright (C) 2002, 2003, 2004  Free Software Foundation, Inc.
  
  ;; Author: Kim F. Storm <address@hidden>
  ;; Keywords: keyboard convenience
***************
*** 120,125 ****
--- 120,126 ----
    "Simplified keyboard macro user interface."
    :group 'keyboard
    :group 'convenience
+   :version "21.4"
    :link '(emacs-commentary-link :tag "Commentary" "kmacro.el")
    :link '(emacs-library-link :tag "Lisp File" "kmacro.el"))
  
***************
*** 222,227 ****
--- 223,236 ----
    (global-set-key (vector kmacro-call-mouse-event) 'kmacro-end-call-mouse))
  
  
+ ;;; Called from keyboard-quit
+ 
+ (defun kmacro-keyboard-quit ()
+   (or (not defining-kbd-macro)
+       (eq defining-kbd-macro 'append)
+       (kmacro-ring-empty-p)
+       (kmacro-pop-ring)))
+ 
  
  ;;; Keyboard macro counter
  
***************
*** 585,591 ****
                       (and append
                            (if kmacro-execute-before-append
                                (> (car arg) 4)
!                             (= (car arg) 4)))))))
  
  
  ;;;###autoload
--- 594,602 ----
                       (and append
                            (if kmacro-execute-before-append
                                (> (car arg) 4)
!                             (= (car arg) 4))))
!       (if (and defining-kbd-macro append)
!         (setq defining-kbd-macro 'append)))))
  
  
  ;;;###autoload