(Vexecuting_kbd_macro): Declare instead of Vexecuting_macro.

diff --git a/src/commands.h b/src/commands.h
index f7831bc36a9b3ee2117be2644eecb8d0c7e2c6dc..b9b1ad4193370118f8ddd57ef434da186f2844c6 100644 (file)
--- a/src/commands.h
+++ b/src/commands.h
@@ -76,11 +76,11 @@ extern Lisp_Object last_point_position_buffer;
 /* Nonzero means ^G can quit instantly */
 extern int immediate_quit;
 
-extern Lisp_Object Vexecuting_macro;
+extern Lisp_Object Vexecuting_kbd_macro;
 
 /* Nonzero if input is coming from the keyboard */
 
-#define INTERACTIVE (NILP (Vexecuting_macro) && !noninteractive)
+#define INTERACTIVE (NILP (Vexecuting_kbd_macro) && !noninteractive)
 
 /* Set this nonzero to force reconsideration of mode line. */
 

diff --git a/src/macros.h b/src/macros.h
index 41a32efe2e0f246a9ff3cf855837f6c7897b410d..f406d62559fbc78bd834e96698a3b0ddf8aa68ee 100644 (file)
--- a/src/macros.h
+++ b/src/macros.h
@@ -21,7 +21,7 @@ Boston, MA 02111-1307, USA.  */
 
 /* Kbd macro currently being executed (a string or vector).  */
 
-extern Lisp_Object Vexecuting_macro;
+extern Lisp_Object Vexecuting_kbd_macro;
 
 /* Index of next character to fetch from that macro.  */