3 files changed, 27 insertions, 27 deletions

diff --git a/src/keyboard.c b/src/keyboard.c
index b9f4b7595bc..3e7510205af 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -1173,13 +1173,13 @@ cmd_error (data)
     cancel_hourglass ();
 #endif
 
-  if (!NILP (executing_macro))
+  if (!NILP (executing_kbd_macro))
     {
-      if (executing_macro_iterations == 1)
+      if (executing_kbd_macro_iterations == 1)
         sprintf (macroerror, "After 1 kbd macro iteration: ");
       else
         sprintf (macroerror, "After %d kbd macro iterations: ",
-                 executing_macro_iterations);
+                 executing_kbd_macro_iterations);
     }
   else
     *macroerror = 0;
@@ -1187,7 +1187,7 @@ cmd_error (data)
   Vstandard_output = Qt;
   Vstandard_input = Qt;
   Vexecuting_kbd_macro = Qnil;
-  executing_macro = Qnil;
+  executing_kbd_macro = Qnil;
   current_kboard->Vprefix_arg = Qnil;
   current_kboard->Vlast_prefix_arg = Qnil;
   cancel_echoing ();
@@ -1288,7 +1288,7 @@ command_loop ()
     {
       Lisp_Object val;
       val = internal_catch (Qexit, command_loop_2, Qnil);
-      executing_macro = Qnil;
+      executing_kbd_macro = Qnil;
       return val;
     }
   else
@@ -1300,7 +1300,7 @@ command_loop ()
            other reason.  */
         any_kboard_state ();
         internal_catch (Qtop_level, command_loop_2, Qnil);
-        executing_macro = Qnil;
+        executing_kbd_macro = Qnil;
 
         /* End of file in -batch run causes exit here.  */
         if (noninteractive)
@@ -2517,18 +2517,18 @@ read_char (commandflag, nmaps, maps, prev_event, used_mouse_menu)
          Also, some things replace the macro with t
          to force an early exit.  */
       if (EQ (Vexecuting_kbd_macro, Qt)
-          || executing_macro_index >= XFASTINT (Flength (Vexecuting_kbd_macro)))
+          || executing_kbd_macro_index >= XFASTINT (Flength (Vexecuting_kbd_macro)))
         {
           XSETINT (c, -1);
           goto exit;
         }
 
-      c = Faref (Vexecuting_kbd_macro, make_number (executing_macro_index));
+      c = Faref (Vexecuting_kbd_macro, make_number (executing_kbd_macro_index));
       if (STRINGP (Vexecuting_kbd_macro)
           && (XINT (c) & 0x80) && (XUINT (c) <= 0xff))
         XSETFASTINT (c, CHAR_META | (XINT (c) & ~0x80));
 
-      executing_macro_index++;
+      executing_kbd_macro_index++;
 
       goto from_macro;
     }
diff --git a/src/macros.c b/src/macros.c
index 04c8e1cd61f..8b17c9fb261 100644
--- a/src/macros.c
+++ b/src/macros.c
@@ -35,21 +35,21 @@ Lisp_Object Vexecuting_kbd_macro;
 
 /* Index of next character to fetch from that macro.  */
 
-EMACS_INT executing_macro_index;
+EMACS_INT executing_kbd_macro_index;
 
 /* Number of successful iterations so far
    for innermost keyboard macro.
    This is not bound at each level,
    so after an error, it describes the innermost interrupted macro.  */
 
-int executing_macro_iterations;
+int executing_kbd_macro_iterations;
 
 /* This is the macro that was executing.
    This is not bound at each level,
    so after an error, it describes the innermost interrupted macro.
    We use it only as a kind of flag, so no need to protect it.  */
 
-Lisp_Object executing_macro;
+Lisp_Object executing_kbd_macro;
 
 extern Lisp_Object real_this_command;
 
@@ -114,7 +114,7 @@ macro before appending to it. */)
         }
 
       /* Must convert meta modifier when copying string to vector.  */
-      cvt = STRINGP (current_kboard->Vlast_kbd_macro); 
+      cvt = STRINGP (current_kboard->Vlast_kbd_macro);
       for (i = 0; i < len; i++)
         {
           Lisp_Object c;
@@ -285,8 +285,8 @@ each iteration of the macro.  Iteration stops if LOOPFUNC returns nil.  */)
   return Qnil;
 }
 
-/* Restore Vexecuting_kbd_macro and executing_macro_index - called when
-   the unwind-protect in Fexecute_kbd_macro gets invoked.  */
+/* Restore Vexecuting_kbd_macro and executing_kbd_macro_index.
+   Called when the unwind-protect in Fexecute_kbd_macro gets invoked.  */
 
 static Lisp_Object
 pop_kbd_macro (info)
@@ -295,7 +295,7 @@ pop_kbd_macro (info)
   Lisp_Object tem;
   Vexecuting_kbd_macro = XCAR (info);
   tem = XCDR (info);
-  executing_macro_index = XINT (XCAR (tem));
+  executing_kbd_macro_index = XINT (XCAR (tem));
   real_this_command = XCDR (tem);
   Frun_hooks (1, &Qkbd_macro_termination_hook);
   return Qnil;
@@ -318,7 +318,7 @@ each iteration of the macro.  Iteration stops if LOOPFUNC returns nil.  */)
   struct gcpro gcpro1, gcpro2;
   int success_count = 0;
 
-  executing_macro_iterations = 0;
+  executing_kbd_macro_iterations = 0;
 
   if (!NILP (count))
     {
@@ -331,7 +331,7 @@ each iteration of the macro.  Iteration stops if LOOPFUNC returns nil.  */)
     error ("Keyboard macros must be strings or vectors");
 
   tem = Fcons (Vexecuting_kbd_macro,
-               Fcons (make_number (executing_macro_index),
+               Fcons (make_number (executing_kbd_macro_index),
                       real_this_command));
   record_unwind_protect (pop_kbd_macro, tem);
 
@@ -339,8 +339,8 @@ each iteration of the macro.  Iteration stops if LOOPFUNC returns nil.  */)
   do
     {
       Vexecuting_kbd_macro = final;
-      executing_macro = final;
-      executing_macro_index = 0;
+      executing_kbd_macro = final;
+      executing_kbd_macro_index = 0;
 
       current_kboard->Vprefix_arg = Qnil;
 
@@ -354,14 +354,14 @@ each iteration of the macro.  Iteration stops if LOOPFUNC returns nil.  */)
 
       command_loop_1 ();
 
-      executing_macro_iterations = ++success_count;
+      executing_kbd_macro_iterations = ++success_count;
 
       QUIT;
     }
   while (--repeat
          && (STRINGP (Vexecuting_kbd_macro) || VECTORP (Vexecuting_kbd_macro)));
 
-  executing_macro = Qnil;
+  executing_kbd_macro = Qnil;
 
   real_this_command = Vexecuting_kbd_macro;
 
@@ -373,7 +373,7 @@ void
 init_macros ()
 {
   Vexecuting_kbd_macro = Qnil;
-  executing_macro = Qnil;
+  executing_kbd_macro = Qnil;
 }
 
 void
@@ -400,7 +400,7 @@ an existing macro.  */);
                doc: /* Currently executing keyboard macro (string or vector).
 This is nil when not executing a keyboard macro.  */);
 
-  DEFVAR_INT ("executing-macro-index", &executing_macro_index,
+  DEFVAR_INT ("executing-kbd-macro-index", &executing_kbd_macro_index,
               doc: /* Index in currently executing keyboard macro; undefined if none executing.  */);
 
   DEFVAR_KBOARD ("last-kbd-macro", Vlast_kbd_macro,
diff --git a/src/macros.h b/src/macros.h
index f406d62559f..bf33ea8325b 100644
--- a/src/macros.h
+++ b/src/macros.h
@@ -25,20 +25,20 @@ extern Lisp_Object Vexecuting_kbd_macro;
 
 /* Index of next character to fetch from that macro.  */
 
-extern EMACS_INT executing_macro_index;
+extern EMACS_INT executing_kbd_macro_index;
 
 /* Number of successful iterations so far
    for innermost keyboard macro.
    This is not bound at each level,
    so after an error, it describes the innermost interrupted macro.  */
 
-extern int executing_macro_iterations;
+extern int executing_kbd_macro_iterations;
 
 /* This is the macro that was executing.
    This is not bound at each level,
    so after an error, it describes the innermost interrupted macro.  */
 
-extern Lisp_Object executing_macro;
+extern Lisp_Object executing_kbd_macro;
 
 /* Finish defining the current keyboard macro.  */