(goto-address-mail-regexp): Allow = in username.

[gnu-emacs] / lisp / kmacro.el

diff --git a/lisp/kmacro.el b/lisp/kmacro.el
index 2b4cbcaf323f06d24732e9cad0a5571603158e5b..3f4ff73177f0c3c3523f62fcaa74bf873de8432b 100644 (file)
--- a/lisp/kmacro.el
+++ b/lisp/kmacro.el
@@ -1,6 +1,6 @@
 ;;; kmacro.el --- enhanced keyboard macros
 
-;; Copyright (C) 2002  Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004  Free Software Foundation, Inc.
 
 ;; Author: Kim F. Storm <storm@cua.dk>
 ;; Keywords: keyboard convenience
@@ -120,6 +120,7 @@
   "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,12 +223,22 @@ macro to be executed before appending to it."
   (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
 
 (defvar kmacro-counter 0
   "*Current keyboard macro counter.")
 
+(defvar kmacro-default-counter-format "%d")
+
 (defvar kmacro-counter-format "%d"
   "*Current keyboard macro counter format.")
 
@@ -259,12 +270,12 @@ With \\[universal-argument], insert previous kmacro-counter (but do not modify c
 
 (defun kmacro-set-format (format)
   "Set macro counter FORMAT."
-  (interactive "sMacro Counter Format (printf format): ")
+  (interactive "sMacro Counter Format: ")
   (setq kmacro-counter-format
        (if (equal format "") "%d" format))
   ;; redefine initial macro counter if we are not executing a macro.
   (if (not (or defining-kbd-macro executing-kbd-macro))
-      (setq kmacro-counter-format-start kmacro-counter-format)))
+      (setq kmacro-default-counter-format kmacro-counter-format)))
 
 
 (defun kmacro-display-counter (&optional value)
@@ -395,12 +406,12 @@ Optional arg EMPTY is message to print if no macros are defined."
       (let* ((x 60)
             (m (format-kbd-macro macro))
             (l (length m))
-            (z (and nil trunc (> l x))))
-       (message (format "%s%s: %s%s" (or descr "Macro")
-                        (if (= kmacro-counter 0) ""
-                          (format " [%s]"
-                                  (format kmacro-counter-format-start kmacro-counter)))
-                        (if z (substring m 0 (1- x)) m) (if z "..." ""))))
+            (z (and trunc (> l x))))
+       (message "%s%s: %s%s" (or descr "Macro")
+                (if (= kmacro-counter 0) ""
+                  (format " [%s]"
+                          (format kmacro-counter-format-start kmacro-counter)))
+                (if z (substring m 0 (1- x)) m) (if z "..." "")))
     (message (or empty "No keyboard macros defined"))))
 
 
@@ -579,13 +590,16 @@ Use \\[kmacro-bind-to-key] to bind it to a key sequence."
              kmacro-initial-counter-value nil
              kmacro-counter-value-start kmacro-counter
              kmacro-last-counter kmacro-counter
-             kmacro-counter-format-start kmacro-counter-format))
+             kmacro-counter-format kmacro-default-counter-format
+             kmacro-counter-format-start kmacro-default-counter-format))
 
       (start-kbd-macro append
                       (and append
                            (if kmacro-execute-before-append
                                (> (car arg) 4)
-                             (= (car arg) 4)))))))
+                             (= (car arg) 4))))
+      (if (and defining-kbd-macro append)
+         (setq defining-kbd-macro 'append)))))
 
 
 ;;;###autoload