]> code.delx.au - gnu-emacs/commitdiff
(kmacro-call-macro): Deal with a non-numeric prefix arg.
authorMiles Bader <miles@gnu.org>
Tue, 10 Sep 2002 01:23:22 +0000 (01:23 +0000)
committerMiles Bader <miles@gnu.org>
Tue, 10 Sep 2002 01:23:22 +0000 (01:23 +0000)
lisp/kmacro.el

index e4388964423f21341c9470329a4e02a2679252fb..71d498159543d338efac73ed740efdc96d613057 100644 (file)
@@ -583,9 +583,13 @@ others, use M-x name-last-kbd-macro."
     (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)))
+                    (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,7 +600,8 @@ others, use M-x name-last-kbd-macro."
        (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)
+             (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