X-Git-Url: https://git.hcoop.net/bpt/emacs.git/blobdiff_plain/4b7da890ac7f238870530808fd7367c272529fff..37a99821999c7198aeff9bb68b159c3e5fcf1b60:/src/macros.c

diff --git a/src/macros.c b/src/macros.c
index 0d86d9cf54..5c37f0daa3 100644
--- a/src/macros.c
+++ b/src/macros.c
@@ -90,10 +90,38 @@ Non-nil arg (prefix arg) means append to last macro defined;\n\
     }
   else
     {
-      message ("Appending to kbd macro...");
-      current_kboard->kbd_macro_ptr = current_kboard->kbd_macro_end;
+      int i, len;
+
+      /* Check the type of last-kbd-macro in case Lisp code changed it.  */
+      if (!STRINGP (current_kboard->Vlast_kbd_macro)
+	  && !VECTORP (current_kboard->Vlast_kbd_macro))
+	current_kboard->Vlast_kbd_macro
+	  = wrong_type_argument (Qarrayp, current_kboard->Vlast_kbd_macro);
+
+      len = XINT (Flength (current_kboard->Vlast_kbd_macro));
+
+      /* Copy last-kbd-macro into the buffer, in case the Lisp code
+	 has put another macro there.  */
+      if (current_kboard->kbd_macro_bufsize < len + 30)
+	{
+	  current_kboard->kbd_macro_bufsize = len + 30;
+	  current_kboard->kbd_macro_buffer
+	    = (Lisp_Object *)xrealloc (current_kboard->kbd_macro_buffer,
+				       (len + 30) * sizeof (Lisp_Object));
+	}
+      for (i = 0; i < len; i++)
+	current_kboard->kbd_macro_buffer[i]
+	  = Faref (current_kboard->Vlast_kbd_macro, make_number (i));
+
+      current_kboard->kbd_macro_ptr = current_kboard->kbd_macro_buffer + len;
+      current_kboard->kbd_macro_end = current_kboard->kbd_macro_ptr;
+
+      /* Re-execute the macro we are appending to,
+	 for consistency of behavior.  */
       Fexecute_kbd_macro (current_kboard->Vlast_kbd_macro,
 			  make_number (1));
+
+      message ("Appending to kbd macro...");
     }
   current_kboard->defining_kbd_macro = Qt;
   
@@ -211,6 +239,8 @@ defining others, use \\[name-last-kbd-macro].")
   /* 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");
@@ -235,9 +265,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;
 }
 
@@ -267,8 +298,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);