/[emacs]/emacs/lisp/kmacro.el
ViewVC logotype

Diff of /emacs/lisp/kmacro.el

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.16.6.3 by miles, Mon Oct 4 01:04:16 2004 UTC revision 1.16.6.4 by miles, Thu Oct 14 08:49:59 2004 UTC
# Line 248  macro to be executed before appending to Line 248  macro to be executed before appending to
248    "Insert macro counter and increment with ARG or 1 if missing.    "Insert macro counter and increment with ARG or 1 if missing.
249  With \\[universal-argument], insert previous kmacro-counter (but do not modify counter)."  With \\[universal-argument], insert previous kmacro-counter (but do not modify counter)."
250    (interactive "P")    (interactive "P")
251    (setq kmacro-initial-counter-value nil)    (if kmacro-initial-counter-value
252          (setq kmacro-counter kmacro-initial-counter-value
253                kmacro-initial-counter-value nil))
254    (if (and arg (listp arg))    (if (and arg (listp arg))
255        (insert (format kmacro-counter-format kmacro-last-counter))        (insert (format kmacro-counter-format kmacro-last-counter))
256      (insert (format kmacro-counter-format kmacro-counter))      (insert (format kmacro-counter-format kmacro-counter))
# Line 275  With \\[universal-argument], insert prev Line 277  With \\[universal-argument], insert prev
277    "Set kmacro-counter to ARG or prompt if missing.    "Set kmacro-counter to ARG or prompt if missing.
278  With \\[universal-argument] prefix, reset counter to its value prior to this iteration of the macro."  With \\[universal-argument] prefix, reset counter to its value prior to this iteration of the macro."
279    (interactive "NMacro counter value: ")    (interactive "NMacro counter value: ")
280    (setq kmacro-last-counter kmacro-counter    (if (not (or defining-kbd-macro executing-kbd-macro))
281          kmacro-counter (if (and current-prefix-arg (listp current-prefix-arg))        (kmacro-display-counter (setq kmacro-initial-counter-value arg))
282                             kmacro-counter-value-start      (setq kmacro-last-counter kmacro-counter
283                           arg))            kmacro-counter (if (and current-prefix-arg (listp current-prefix-arg))
284    ;; setup initial macro counter value if we are not executing a macro.                               kmacro-counter-value-start
285    (setq kmacro-initial-counter-value                             arg))
286          (and (not (or defining-kbd-macro executing-kbd-macro))      (unless executing-kbd-macro
287               kmacro-counter))        (kmacro-display-counter))))
   (unless executing-kbd-macro  
     (kmacro-display-counter)))  
288    
289    
290  (defun kmacro-add-counter (arg)  (defun kmacro-add-counter (arg)
291    "Add numeric prefix arg (prompt if missing) to macro counter.    "Add numeric prefix arg (prompt if missing) to macro counter.
292  With \\[universal-argument], restore previous counter value."  With \\[universal-argument], restore previous counter value."
293    (interactive "NAdd to macro counter: ")    (interactive "NAdd to macro counter: ")
294    (setq kmacro-initial-counter-value nil)    (if kmacro-initial-counter-value
295          (setq kmacro-counter kmacro-initial-counter-value
296                kmacro-initial-counter-value nil))
297    (let ((last kmacro-last-counter))    (let ((last kmacro-last-counter))
298      (setq kmacro-last-counter kmacro-counter      (setq kmacro-last-counter kmacro-counter
299            kmacro-counter (if (and current-prefix-arg (listp current-prefix-arg))            kmacro-counter (if (and current-prefix-arg (listp current-prefix-arg))
# Line 394  Optional arg EMPTY is message to print i Line 396  Optional arg EMPTY is message to print i
396               (m (format-kbd-macro macro))               (m (format-kbd-macro macro))
397               (l (length m))               (l (length m))
398               (z (and nil trunc (> l x))))               (z (and nil trunc (> l x))))
399          (message (format "%s: %s%s" (or descr "Macro")          (message (format "%s%s: %s%s" (or descr "Macro")
400                             (if (= kmacro-counter 0) ""
401                               (format " [%s]"
402                                       (format kmacro-counter-format-start kmacro-counter)))
403                           (if z (substring m 0 (1- x)) m) (if z "..." ""))))                           (if z (substring m 0 (1- x)) m) (if z "..." ""))))
404      (message (or empty "No keyboard macros defined"))))      (message (or empty "No keyboard macros defined"))))
405    

Legend:
Removed from v.1.16.6.3  
changed lines
  Added in v.1.16.6.4

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26