[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/kmacro.el
From: |
Kim F . Storm |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/kmacro.el |
Date: |
Mon, 11 Oct 2004 18:32:50 -0400 |
Index: emacs/lisp/kmacro.el
diff -c emacs/lisp/kmacro.el:1.22 emacs/lisp/kmacro.el:1.23
*** emacs/lisp/kmacro.el:1.22 Thu Sep 30 13:27:45 2004
--- emacs/lisp/kmacro.el Mon Oct 11 22:13:20 2004
***************
*** 248,254 ****
"Insert macro counter and increment with ARG or 1 if missing.
With \\[universal-argument], insert previous kmacro-counter (but do not
modify counter)."
(interactive "P")
! (setq kmacro-initial-counter-value nil)
(if (and arg (listp arg))
(insert (format kmacro-counter-format kmacro-last-counter))
(insert (format kmacro-counter-format kmacro-counter))
--- 248,256 ----
"Insert macro counter and increment with ARG or 1 if missing.
With \\[universal-argument], insert previous kmacro-counter (but do not
modify counter)."
(interactive "P")
! (if kmacro-initial-counter-value
! (setq kmacro-counter kmacro-initial-counter-value
! kmacro-initial-counter-value nil))
(if (and arg (listp arg))
(insert (format kmacro-counter-format kmacro-last-counter))
(insert (format kmacro-counter-format kmacro-counter))
***************
*** 275,297 ****
"Set kmacro-counter to ARG or prompt if missing.
With \\[universal-argument] prefix, reset counter to its value prior to this
iteration of the macro."
(interactive "NMacro counter value: ")
! (setq kmacro-last-counter kmacro-counter
! kmacro-counter (if (and current-prefix-arg (listp current-prefix-arg))
! kmacro-counter-value-start
! arg))
! ;; setup initial macro counter value if we are not executing a macro.
! (setq kmacro-initial-counter-value
! (and (not (or defining-kbd-macro executing-kbd-macro))
! kmacro-counter))
! (unless executing-kbd-macro
! (kmacro-display-counter)))
(defun kmacro-add-counter (arg)
"Add numeric prefix arg (prompt if missing) to macro counter.
With \\[universal-argument], restore previous counter value."
(interactive "NAdd to macro counter: ")
! (setq kmacro-initial-counter-value nil)
(let ((last kmacro-last-counter))
(setq kmacro-last-counter kmacro-counter
kmacro-counter (if (and current-prefix-arg (listp current-prefix-arg))
--- 277,299 ----
"Set kmacro-counter to ARG or prompt if missing.
With \\[universal-argument] prefix, reset counter to its value prior to this
iteration of the macro."
(interactive "NMacro counter value: ")
! (if (not (or defining-kbd-macro executing-kbd-macro))
! (kmacro-display-counter (setq kmacro-initial-counter-value arg))
! (setq kmacro-last-counter kmacro-counter
! kmacro-counter (if (and current-prefix-arg (listp current-prefix-arg))
! kmacro-counter-value-start
! arg))
! (unless executing-kbd-macro
! (kmacro-display-counter))))
(defun kmacro-add-counter (arg)
"Add numeric prefix arg (prompt if missing) to macro counter.
With \\[universal-argument], restore previous counter value."
(interactive "NAdd to macro counter: ")
! (if kmacro-initial-counter-value
! (setq kmacro-counter kmacro-initial-counter-value
! kmacro-initial-counter-value nil))
(let ((last kmacro-last-counter))
(setq kmacro-last-counter kmacro-counter
kmacro-counter (if (and current-prefix-arg (listp current-prefix-arg))
***************
*** 394,400 ****
(m (format-kbd-macro macro))
(l (length m))
(z (and nil trunc (> l x))))
! (message (format "%s: %s%s" (or descr "Macro")
(if z (substring m 0 (1- x)) m) (if z "..." ""))))
(message (or empty "No keyboard macros defined"))))
--- 396,405 ----
(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"))))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/lisp/kmacro.el,
Kim F . Storm <=