From efcf38c7c2c336fdc89a55ac0ce29086d767700d Mon Sep 17 00:00:00 2001 From: Karl Heuer Date: Wed, 29 May 1996 17:17:34 +0000 Subject: [PATCH] Use executing-kbd-macro, not executing-macro. --- lisp/emacs-lisp/debug.el | 2 +- lisp/emacs-lisp/edebug.el | 16 ++++++++-------- lisp/icomplete.el | 2 +- lisp/macros.el | 14 +++++++------- lisp/simple.el | 2 +- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/lisp/emacs-lisp/debug.el b/lisp/emacs-lisp/debug.el index 873c908c965..fb2a1324331 100644 --- a/lisp/emacs-lisp/debug.el +++ b/lisp/emacs-lisp/debug.el @@ -77,7 +77,7 @@ first will be printed into the backtrace buffer." (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)) diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el index 7931e449b75..5196b6a5ecc 100644 --- a/lisp/emacs-lisp/edebug.el +++ b/lisp/emacs-lisp/edebug.el @@ -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 @@ error is signaled again." (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 @@ error is signaled again." (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 @@ error is signaled again." (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 @@ Return the result of the last expression." (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 @@ Return the result of the last expression." 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 diff --git a/lisp/icomplete.el b/lisp/icomplete.el index f23a9d43fde..025af152a9d 100644 --- a/lisp/icomplete.el +++ b/lisp/icomplete.el @@ -134,7 +134,7 @@ Conditions are: 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 () 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: \\ \\[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?\\\ (\\[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: \\ (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)) diff --git a/lisp/simple.el b/lisp/simple.el index bdacf04b1df..5b3177d3a4c 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -1557,7 +1557,7 @@ In Transient Mark mode, this does not activate the mark." (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))) -- 2.39.2