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

[Miles Bader]

Index: emacs/lisp/kmacro.el
diff -c emacs/lisp/kmacro.el:1.8 emacs/lisp/kmacro.el:1.9
*** emacs/lisp/kmacro.el:1.8    Sun Sep  8 16:38:04 2002
--- emacs/lisp/kmacro.el        Mon Sep  9 21:23:22 2002
***************
*** 583,591 ****
      (if end-macro
        (kmacro-end-macro arg)
        (call-last-kbd-macro arg #'kmacro-loop-setup-function))
      (when (and (or (null arg) (> arg 0))
               (setq repeat-key
!                    (if (eq kmacro-call-repeat-key t) repeat-key 
kmacro-call-repeat-key)))
        (setq repeat-key-str (format-kbd-macro (vector repeat-key) nil))
        (while repeat-key
        (message "Repeat macro %swith `%s'..." 
--- 583,595 ----
      (if end-macro
        (kmacro-end-macro arg)
        (call-last-kbd-macro arg #'kmacro-loop-setup-function))
+     (when (consp arg)
+       (setq arg (car arg)))
      (when (and (or (null arg) (> arg 0))
               (setq repeat-key
!                    (if (eq kmacro-call-repeat-key t)
!                        repeat-key
!                      kmacro-call-repeat-key)))
        (setq repeat-key-str (format-kbd-macro (vector repeat-key) nil))
        (while repeat-key
        (message "Repeat macro %swith `%s'..." 
***************
*** 596,602 ****
        (if (equal repeat-key (read-event))
            (progn
              (clear-this-command-keys t)
!             (call-last-kbd-macro (and kmacro-call-repeat-with-arg arg) 
#'kmacro-loop-setup-function)
              (setq last-input-event nil))
          (setq repeat-key nil)))
        (when last-input-event
--- 600,607 ----
        (if (equal repeat-key (read-event))
            (progn
              (clear-this-command-keys t)
!             (call-last-kbd-macro (and kmacro-call-repeat-with-arg arg)
!                                  #'kmacro-loop-setup-function)
              (setq last-input-event nil))
          (setq repeat-key nil)))
        (when last-input-event