583 |
(if end-macro |
(if end-macro |
584 |
(kmacro-end-macro arg) |
(kmacro-end-macro arg) |
585 |
(call-last-kbd-macro arg #'kmacro-loop-setup-function)) |
(call-last-kbd-macro arg #'kmacro-loop-setup-function)) |
586 |
|
(when (consp arg) |
587 |
|
(setq arg (car arg))) |
588 |
(when (and (or (null arg) (> arg 0)) |
(when (and (or (null arg) (> arg 0)) |
589 |
(setq repeat-key |
(setq repeat-key |
590 |
(if (eq kmacro-call-repeat-key t) repeat-key kmacro-call-repeat-key))) |
(if (eq kmacro-call-repeat-key t) |
591 |
|
repeat-key |
592 |
|
kmacro-call-repeat-key))) |
593 |
(setq repeat-key-str (format-kbd-macro (vector repeat-key) nil)) |
(setq repeat-key-str (format-kbd-macro (vector repeat-key) nil)) |
594 |
(while repeat-key |
(while repeat-key |
595 |
(message "Repeat macro %swith `%s'..." |
(message "Repeat macro %swith `%s'..." |
600 |
(if (equal repeat-key (read-event)) |
(if (equal repeat-key (read-event)) |
601 |
(progn |
(progn |
602 |
(clear-this-command-keys t) |
(clear-this-command-keys t) |
603 |
(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) |
604 |
|
#'kmacro-loop-setup-function) |
605 |
(setq last-input-event nil)) |
(setq last-input-event nil)) |
606 |
(setq repeat-key nil))) |
(setq repeat-key nil))) |
607 |
(when last-input-event |
(when last-input-event |