(mark_byte_stack): Use XMARKBIT and XMARK.

[gnu-emacs] / src / macros.c

diff --git a/src/macros.c b/src/macros.c
index 2592faeba19217906665480fd3a311946321c834..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",
@@ -112,7 +114,7 @@ An argument of zero means repeat until error.")
      Lisp_Object repeat;
 {
   if (NILP (current_kboard->defining_kbd_macro))
-    error ("Not defining kbd macro.");
+    error ("Not defining kbd macro");
 
   if (NILP (repeat))
     XSETFASTINT (repeat, 1);
@@ -143,6 +145,7 @@ An argument of zero means repeat until error.")
 
 /* Store character c into kbd macro being defined */
 
+void
 store_kbd_macro_char (c)
      Lisp_Object c;
 {
@@ -170,6 +173,7 @@ store_kbd_macro_char (c)
 /* Declare that all chars stored so far in the kbd macro being defined
  really belong to it.  This is done in between editor commands.  */
 
+void
 finalize_kbd_macro_chars ()
 {
   current_kboard->kbd_macro_end = current_kboard->kbd_macro_ptr;
@@ -204,12 +208,24 @@ defining others, use \\[name-last-kbd-macro].")
   (prefix)
      Lisp_Object prefix;
 {
+  /* Don't interfere with recognition of the previous command
+     from before this macro started.  */
+  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");
   else if (NILP (current_kboard->Vlast_kbd_macro))
     error ("No kbd macro has been defined");
   else
     Fexecute_kbd_macro (current_kboard->Vlast_kbd_macro, prefix);
+
+  /* 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.  */
+  Vthis_command = current_kboard->Vlast_command;
+
   return Qnil;
 }
 
@@ -221,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;
 }
 
@@ -241,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);
@@ -249,10 +268,11 @@ COUNT is a repeat count, or nil for once, or 0 for infinite loop.")
 
   final = indirect_function (macro);
   if (!STRINGP (final) && !VECTORP (final))
-    error ("Keyboard macros must be strings or vectors.");
+    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);
@@ -274,15 +294,20 @@ 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);
 }
 \f
+void
 init_macros ()
 {
   Vexecuting_macro = Qnil;
+  executing_macro = Qnil;
 }
 
+void
 syms_of_macros ()
 {
   Qexecute_kbd_macro = intern ("execute-kbd-macro");
@@ -308,6 +333,7 @@ syms_of_macros ()
     "Last kbd macro defined, as a string or vector; nil if none defined.");
 }
 
+void
 keys_of_macros ()
 {
   initial_define_key (control_x_map, ('e'), "call-last-kbd-macro");