Mercurial > emacs
changeset 15302:c23c9712ef5c
Use executing-kbd-macro, not executing-macro.
| author | Karl Heuer <kwzh@gnu.org> |
|---|---|
| date | Wed, 29 May 1996 17:17:34 +0000 |
| parents | a68e276baffd |
| children | 85073711a289 |
| files | lisp/emacs-lisp/debug.el lisp/emacs-lisp/edebug.el lisp/icomplete.el lisp/macros.el lisp/simple.el |
| diffstat | 5 files changed, 18 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/emacs-lisp/debug.el Wed May 29 14:56:45 1996 +0000 +++ b/lisp/emacs-lisp/debug.el Wed May 29 17:17:34 1996 +0000 @@ -77,7 +77,7 @@ (debugger-old-buffer (current-buffer)) (debugger-step-after-exit nil) ;; Don't keep reading from an executing kbd macro! - (executing-macro nil) + (executing-kbd-macro nil) ;; Save the outer values of these vars for the `e' command ;; before we replace the values. (debugger-outer-match-data (match-data))
--- a/lisp/emacs-lisp/edebug.el Wed May 29 14:56:45 1996 +0000 +++ b/lisp/emacs-lisp/edebug.el Wed May 29 17:17:34 1996 +0000 @@ -8,7 +8,7 @@ ;; LCD Archive Entry: ;; edebug|Daniel LaLiberte|liberte@cs.uiuc.edu ;; |A source level debugger for Emacs Lisp. -;; |$Date: 1996/03/20 13:19:48 $|$Revision: 3.5.1.27 $|~/modes/edebug.el| +;; |$Date: 1996/03/20 13:30:16 $|$Revision: 3.6 $|~/modes/edebug.el| ;; This file is part of GNU Emacs. @@ -85,7 +85,7 @@ ;;; Code: (defconst edebug-version - (let ((raw-version "$Revision: 3.5.1.27 $")) + (let ((raw-version "$Revision: 3.6 $")) (substring raw-version (string-match "[0-9.]*" raw-version) (match-end 0)))) @@ -2263,7 +2263,7 @@ (cl-lexical-debug t) ;; Save the outside value of executing macro. (here??) - (edebug-outside-executing-macro executing-macro) + (edebug-outside-executing-macro executing-kbd-macro) (edebug-outside-pre-command-hook pre-command-hook) (edebug-outside-post-command-hook post-command-hook) (edebug-outside-post-command-idle-hook post-command-idle-hook)) @@ -2271,8 +2271,8 @@ (let (;; Don't keep reading from an executing kbd macro ;; within edebug unless edebug-continue-kbd-macro is ;; non-nil. Again, local binding may not be best. - (executing-macro - (if edebug-continue-kbd-macro executing-macro)) + (executing-kbd-macro + (if edebug-continue-kbd-macro executing-kbd-macro)) ;; Disable command hooks. This is essential when ;; a hook function is instrumented - to avoid infinite loop. @@ -2290,7 +2290,7 @@ (edebug-enter edebug-function edebug-args edebug-body) (fset 'signal (symbol-function 'edebug-original-signal)))) ;; Reset global variables in case outside value was changed. - (setq executing-macro edebug-outside-executing-macro + (setq executing-kbd-macro edebug-outside-executing-macro pre-command-hook edebug-outside-pre-command-hook post-command-hook edebug-outside-post-command-hook post-command-idle-hook edebug-outside-post-command-idle-hook @@ -3565,7 +3565,7 @@ (standard-output edebug-outside-standard-output) (standard-input edebug-outside-standard-input) - (executing-macro edebug-outside-executing-macro) + (executing-kbd-macro edebug-outside-executing-macro) (defining-kbd-macro edebug-outside-defining-kbd-macro) (pre-command-hook edebug-outside-pre-command-hook) (post-command-hook edebug-outside-post-command-hook) @@ -3607,7 +3607,7 @@ edebug-outside-standard-output standard-output edebug-outside-standard-input standard-input - edebug-outside-executing-macro executing-macro + edebug-outside-executing-macro executing-kbd-macro edebug-outside-defining-kbd-macro defining-kbd-macro edebug-outside-pre-command-hook pre-command-hook edebug-outside-post-command-hook post-command-hook
--- a/lisp/icomplete.el Wed May 29 14:56:45 1996 +0000 +++ b/lisp/icomplete.el Wed May 29 17:17:34 1996 +0000 @@ -134,7 +134,7 @@ like file-name and other custom-func completions)." (and (window-minibuffer-p (selected-window)) - (not executing-macro) + (not executing-kbd-macro) (not (symbolp minibuffer-completion-table)))) ;;;_ > icomplete-minibuffer-setup ()
--- a/lisp/macros.el Wed May 29 14:56:45 1996 +0000 +++ b/lisp/macros.el Wed May 29 17:17:34 1996 +0000 @@ -182,20 +182,20 @@ \\[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 @@ (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))
--- a/lisp/simple.el Wed May 29 14:56:45 1996 +0000 +++ b/lisp/simple.el Wed May 29 17:17:34 1996 +0000 @@ -1557,7 +1557,7 @@ (move-marker (car (nthcdr global-mark-ring-max global-mark-ring)) nil) (setcdr (nthcdr (1- global-mark-ring-max) global-mark-ring) nil)))) - (or nomsg executing-macro (> (minibuffer-depth) 0) + (or nomsg executing-kbd-macro (> (minibuffer-depth) 0) (message "Mark set")) (if (or activate (not transient-mark-mode)) (set-mark (mark t)))