[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.5 emacs/lisp/kmacro.el:1.16.6.6
*** emacs/lisp/kmacro.el:1.16.6.5       Thu Nov  4 08:55:35 2004
--- emacs/lisp/kmacro.el        Wed Dec  8 05:02:12 2004
***************
*** 237,242 ****
--- 237,244 ----
  (defvar kmacro-counter 0
    "*Current keyboard macro counter.")
  
+ (defvar kmacro-default-counter-format "%d")
+ 
  (defvar kmacro-counter-format "%d"
    "*Current keyboard macro counter format.")
  
***************
*** 268,279 ****
  
  (defun kmacro-set-format (format)
    "Set macro counter FORMAT."
!   (interactive "sMacro Counter Format (printf 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)))
  
  
  (defun kmacro-display-counter (&optional value)
--- 270,281 ----
  
  (defun kmacro-set-format (format)
    "Set macro counter 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-default-counter-format kmacro-counter-format)))
  
  
  (defun kmacro-display-counter (&optional value)
***************
*** 404,415 ****
        (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 "..." ""))))
      (message (or empty "No keyboard macros defined"))))
  
  
--- 406,417 ----
        (let* ((x 60)
             (m (format-kbd-macro macro))
             (l (length m))
!            (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"))))
  
  
***************
*** 588,594 ****
              kmacro-initial-counter-value nil
              kmacro-counter-value-start kmacro-counter
              kmacro-last-counter kmacro-counter
!             kmacro-counter-format-start kmacro-counter-format))
  
        (start-kbd-macro append
                       (and append
--- 590,597 ----
              kmacro-initial-counter-value nil
              kmacro-counter-value-start kmacro-counter
              kmacro-last-counter kmacro-counter
!             kmacro-counter-format kmacro-default-counter-format
!             kmacro-counter-format-start kmacro-default-counter-format))
  
        (start-kbd-macro append
                       (and append