Change Vexecuting_macro to Vexecuting_kbd_macro.

1 files changed, 17 insertions, 17 deletions

diff --git a/src/keyboard.c b/src/keyboard.c
index c6c7fd8c056..b9f4b7595bc 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -1186,7 +1186,7 @@ cmd_error (data)
 
   Vstandard_output = Qt;
   Vstandard_input = Qt;
-  Vexecuting_macro = Qnil;
+  Vexecuting_kbd_macro = Qnil;
   executing_macro = Qnil;
   current_kboard->Vprefix_arg = Qnil;
   current_kboard->Vlast_prefix_arg = Qnil;
@@ -1453,7 +1453,7 @@ command_loop_1 ()
 	  if (NILP (Vunread_command_events)
 	      && NILP (Vunread_input_method_events)
 	      && NILP (Vunread_post_input_method_events)
-	      && NILP (Vexecuting_macro)
+	      && NILP (Vexecuting_kbd_macro)
 	      && !NILP (sit_for (0, post_command_idle_delay, 0, 1, 1)))
 	    safe_run_hooks (Qpost_command_idle_hook);
 	}
@@ -1582,11 +1582,11 @@ command_loop_1 ()
 	}
 
       cmd = read_key_sequence_cmd;
-      if (!NILP (Vexecuting_macro))
+      if (!NILP (Vexecuting_kbd_macro))
 	{
 	  if (!NILP (Vquit_flag))
 	    {
-	      Vexecuting_macro = Qt;
+	      Vexecuting_kbd_macro = Qt;
 	      QUIT;		/* Make some noise. */
 				/* Will return since macro now empty. */
 	    }
@@ -1685,7 +1685,7 @@ command_loop_1 ()
 		      && EQ (current_buffer->selective_display, Qnil)
 		      && !detect_input_pending ()
 		      && NILP (XWINDOW (selected_window)->column_number_displayed)
-		      && NILP (Vexecuting_macro))
+		      && NILP (Vexecuting_kbd_macro))
 		    direct_output_forward_char (1);
 		  goto directly_done;
 		}
@@ -1720,7 +1720,7 @@ command_loop_1 ()
 		      && EQ (current_buffer->selective_display, Qnil)
 		      && !detect_input_pending ()
 		      && NILP (XWINDOW (selected_window)->column_number_displayed)
-		      && NILP (Vexecuting_macro))
+		      && NILP (Vexecuting_kbd_macro))
 		    direct_output_forward_char (-1);
 		  goto directly_done;
 		}
@@ -1733,7 +1733,7 @@ command_loop_1 ()
 		    = translate_char (Vtranslation_table_for_input,
 				      XFASTINT (last_command_char), 0, 0, 0);
 		  int value;
-		  if (NILP (Vexecuting_macro)
+		  if (NILP (Vexecuting_kbd_macro)
 		      && !EQ (minibuf_window, selected_window))
 		    {
 		      if (!nonundocount || nonundocount >= 20)
@@ -1755,7 +1755,7 @@ command_loop_1 ()
 			  || !EQ (current_buffer->selective_display, Qnil)
 			  || detect_input_pending ()
 			  || !NILP (XWINDOW (selected_window)->column_number_displayed)
-			  || !NILP (Vexecuting_macro));
+			  || !NILP (Vexecuting_kbd_macro));
 
 		  value = internal_self_insert (c, 0);
 
@@ -1783,7 +1783,7 @@ command_loop_1 ()
             int scount = SPECPDL_INDEX ();
 
             if (display_hourglass_p
-                && NILP (Vexecuting_macro))
+                && NILP (Vexecuting_kbd_macro))
               {
                 record_unwind_protect (cancel_hourglass_unwind, Qnil);
                 start_hourglass ();
@@ -1801,7 +1801,7 @@ command_loop_1 ()
 	     hourglass cursor anyway.
 	     But don't cancel the hourglass within a macro
 	     just because a command in the macro finishes.  */
-	  if (NILP (Vexecuting_macro))
+	  if (NILP (Vexecuting_kbd_macro))
             unbind_to (scount, Qnil);
 #endif
           }
@@ -1827,7 +1827,7 @@ command_loop_1 ()
 	  if (NILP (Vunread_command_events)
 	      && NILP (Vunread_input_method_events)
 	      && NILP (Vunread_post_input_method_events)
-	      && NILP (Vexecuting_macro)
+	      && NILP (Vexecuting_kbd_macro)
 	      && !NILP (sit_for (0, post_command_idle_delay, 0, 1, 1)))
 	    safe_run_hooks (Qpost_command_idle_hook);
 	}
@@ -2499,7 +2499,7 @@ read_char (commandflag, nmaps, maps, prev_event, used_mouse_menu)
 
   this_command_key_count_reset = 0;
 
-  if (!NILP (Vexecuting_macro))
+  if (!NILP (Vexecuting_kbd_macro))
     {
       /* We set this to Qmacro; since that's not a frame, nobody will
 	 try to switch frames on us, and the selected window will
@@ -2516,15 +2516,15 @@ read_char (commandflag, nmaps, maps, prev_event, used_mouse_menu)
       /* Exit the macro if we are at the end.
 	 Also, some things replace the macro with t
 	 to force an early exit.  */
-      if (EQ (Vexecuting_macro, Qt)
-	  || executing_macro_index >= XFASTINT (Flength (Vexecuting_macro)))
+      if (EQ (Vexecuting_kbd_macro, Qt)
+	  || executing_macro_index >= XFASTINT (Flength (Vexecuting_kbd_macro)))
 	{
 	  XSETINT (c, -1);
 	  goto exit;
 	}
 
-      c = Faref (Vexecuting_macro, make_number (executing_macro_index));
-      if (STRINGP (Vexecuting_macro)
+      c = Faref (Vexecuting_kbd_macro, make_number (executing_macro_index));
+      if (STRINGP (Vexecuting_kbd_macro)
 	  && (XINT (c) & 0x80) && (XUINT (c) <= 0xff))
 	XSETFASTINT (c, CHAR_META | (XINT (c) & ~0x80));
 
@@ -9817,7 +9817,7 @@ DEFUN ("execute-extended-command", Fexecute_extended_command, Sexecute_extended_
 
   /* If enabled, show which key runs this command.  */
   if (!NILP (Vsuggest_key_bindings)
-      && NILP (Vexecuting_macro)
+      && NILP (Vexecuting_kbd_macro)
       && SYMBOLP (function))
     bindings = Fwhere_is_internal (function, Voverriding_local_map,
 				   Qt, Qnil, Qnil);