(mark_byte_stack): Use XMARKBIT and XMARK.

[gnu-emacs] / src / macros.c

diff --git a/src/macros.c b/src/macros.c
index ad429f1f5e6c733cffe495a2b382eb451c12b58c..a0212e1044a12a72b62c45b29308a302638c86bf 100644 (file)
--- a/src/macros.c
+++ b/src/macros.c
@@ -51,6 +51,8 @@ int executing_macro_iterations;
 
 Lisp_Object executing_macro;
 
+extern Lisp_Object real_this_command;
+
 Lisp_Object Fexecute_kbd_macro ();
 \f
 DEFUN ("start-kbd-macro", Fstart_kbd_macro, Sstart_kbd_macro, 1, 1, "P",
@@ -208,7 +210,9 @@ defining others, use \\[name-last-kbd-macro].")
 {
   /* Don't interfere with recognition of the previous command
      from before this macro started.  */
-  this_command = current_kboard->Vlast_command;
+  Vthis_command = current_kboard->Vlast_command;
+  /* C-x z after the macro should repeat the macro.  */
+  real_this_command = current_kboard->Vlast_kbd_macro;
 
   if (! NILP (current_kboard->defining_kbd_macro))
     error ("Can't execute anonymous macro while defining one");
@@ -220,7 +224,7 @@ defining others, use \\[name-last-kbd-macro].")
   /* command_loop_1 sets this to nil before it returns;
      get back the last command within the macro
      so that it can be last, again, after we return.  */
-  this_command = current_kboard->Vlast_command;
+  Vthis_command = current_kboard->Vlast_command;
 
   return Qnil;
 }
@@ -233,9 +237,10 @@ pop_kbd_macro (info)
      Lisp_Object info;
 {
   Lisp_Object tem;
-  Vexecuting_macro = Fcar (info);
-  tem = Fcdr (info);
-  executing_macro_index = XINT (tem);
+  Vexecuting_macro = XCAR (info);
+  tem = XCDR (info);
+  executing_macro_index = XINT (XCAR (tem));
+  real_this_command = XCDR (tem);
   return Qnil;
 }
 
@@ -253,6 +258,8 @@ COUNT is a repeat count, or nil for once, or 0 for infinite loop.")
   struct gcpro gcpro1;
   int success_count = 0;
 
+  executing_macro_iterations = 0;
+
   if (!NILP (count))
     {
       count = Fprefix_numeric_value (count);
@@ -263,8 +270,9 @@ COUNT is a repeat count, or nil for once, or 0 for infinite loop.")
   if (!STRINGP (final) && !VECTORP (final))
     error ("Keyboard macros must be strings or vectors");
 
-  XSETFASTINT (tem, executing_macro_index);
-  tem = Fcons (Vexecuting_macro, tem);
+  tem = Fcons (Vexecuting_macro,
+              Fcons (make_number (executing_macro_index),
+                     real_this_command));
   record_unwind_protect (pop_kbd_macro, tem);
 
   GCPRO1 (final);
@@ -286,6 +294,8 @@ COUNT is a repeat count, or nil for once, or 0 for infinite loop.")
 
   executing_macro = Qnil;
 
+  real_this_command = Vexecuting_macro;
+
   UNGCPRO;
   return unbind_to (pdlcount, Qnil);
 }