diff options
| author | Karl Heuer <kwzh@gnu.org> | 1996-05-29 17:17:34 +0000 |
|---|---|---|
| committer | Karl Heuer <kwzh@gnu.org> | 1996-05-29 17:17:34 +0000 |
| commit | 920f0e76d874fd3afb51934801b685470f6be371 (patch) | |
| tree | 37c46d320bff107540177f2ec92f7c220dfccc8d /lisp/macros.el | |
| parent | 051835b46e17e28d228076877c380f3edf189b82 (diff) | |
| download | emacs-920f0e76d874fd3afb51934801b685470f6be371.tar.gz | |
Use executing-kbd-macro, not executing-macro.
Diffstat (limited to 'lisp/macros.el')
| -rw-r--r-- | lisp/macros.el | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lisp/macros.el b/lisp/macros.el index fc79959e9f9..6263a6957c2 100644 --- a/lisp/macros.el +++ b/lisp/macros.el @@ -182,20 +182,20 @@ Your options are: \\<query-replace-map> \\[recenter] Redisplay the screen, then ask again. \\[edit] Enter recursive edit; ask again when you exit from that." (interactive "P") - (or executing-macro + (or executing-kbd-macro defining-kbd-macro (error "Not defining or executing kbd macro")) (if flag - (let (executing-macro defining-kbd-macro) + (let (executing-kbd-macro defining-kbd-macro) (recursive-edit)) - (if (not executing-macro) + (if (not executing-kbd-macro) nil (let ((loop t) (msg (substitute-command-keys "Proceed with macro?\\<query-replace-map>\ (\\[act], \\[skip], \\[exit], \\[recenter], \\[edit]) "))) (while loop - (let ((key (let ((executing-macro nil) + (let ((key (let ((executing-kbd-macro nil) (defining-kbd-macro nil)) (message "%s" msg) (read-event))) @@ -206,14 +206,14 @@ Your options are: \\<query-replace-map> (setq loop nil)) ((eq def 'skip) (setq loop nil) - (setq executing-macro "")) + (setq executing-kbd-macro "")) ((eq def 'exit) (setq loop nil) - (setq executing-macro t)) + (setq executing-kbd-macro t)) ((eq def 'recenter) (recenter nil)) ((eq def 'edit) - (let (executing-macro defining-kbd-macro) + (let (executing-kbd-macro defining-kbd-macro) (recursive-edit))) ((eq def 'quit) (setq quit-flag t)) |