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",
}
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;
/* 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");
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;
}
struct gcpro gcpro1;
int success_count = 0;
+ executing_macro_iterations = 0;
+
if (!NILP (count))
{
count = Fprefix_numeric_value (count);
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);
executing_macro = Qnil;
+ real_this_command = Vexecuting_macro;
+
UNGCPRO;
return unbind_to (pdlcount, Qnil);
}