Lisp_Object Qexecute_kbd_macro;
+/* Kbd macro currently being executed (a string or vector). */
+
Lisp_Object Vexecuting_macro;
+
+/* Index of next character to fetch from that macro. */
+
int executing_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;
+
+/* 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 Fexecute_kbd_macro ();
\f
DEFUN ("start-kbd-macro", Fstart_kbd_macro, Sstart_kbd_macro, 1, 1, "P",
{
current_kboard->kbd_macro_bufsize = 30;
current_kboard->kbd_macro_buffer
- = (Lisp_Object *)malloc (30 * sizeof (Lisp_Object));
+ = (Lisp_Object *)xmalloc (30 * sizeof (Lisp_Object));
}
update_mode_lines++;
if (NILP (append))
{
+ if (current_kboard->kbd_macro_bufsize > 200)
+ {
+ current_kboard->kbd_macro_bufsize = 30;
+ current_kboard->kbd_macro_buffer
+ = (Lisp_Object *)xrealloc (current_kboard->kbd_macro_buffer,
+ 30 * sizeof (Lisp_Object));
+ }
current_kboard->kbd_macro_ptr = current_kboard->kbd_macro_buffer;
current_kboard->kbd_macro_end = current_kboard->kbd_macro_buffer;
- message("Defining kbd macro...");
+ message ("Defining kbd macro...");
}
else
{
- message("Appending to kbd macro...");
+ message ("Appending to kbd macro...");
current_kboard->kbd_macro_ptr = current_kboard->kbd_macro_end;
Fexecute_kbd_macro (current_kboard->Vlast_kbd_macro,
make_number (1));
= make_event_array ((current_kboard->kbd_macro_end
- current_kboard->kbd_macro_buffer),
current_kboard->kbd_macro_buffer);
- message("Keyboard macro defined");
+ message ("Keyboard macro defined");
}
if (XFASTINT (repeat) == 0)
(prefix)
Lisp_Object prefix;
{
+ /* Don't interfere with recognition of the previous command
+ from before this macro started. */
+ this_command = current_kboard->Vlast_command;
+
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. */
+ this_command = current_kboard->Vlast_command;
+
return Qnil;
}
/* Restore Vexecuting_macro and executing_macro_index - called when
the unwind-protect in Fexecute_kbd_macro gets invoked. */
+
static Lisp_Object
pop_kbd_macro (info)
Lisp_Object info;
int pdlcount = specpdl_ptr - specpdl;
int repeat = 1;
struct gcpro gcpro1;
+ int success_count = 0;
if (!NILP (count))
{
do
{
Vexecuting_macro = final;
+ executing_macro = final;
executing_macro_index = 0;
current_kboard->Vprefix_arg = Qnil;
command_loop_1 ();
+ executing_macro_iterations = ++success_count;
+
QUIT;
}
while (--repeat
&& (STRINGP (Vexecuting_macro) || VECTORP (Vexecuting_macro)));
+ executing_macro = Qnil;
+
UNGCPRO;
return unbind_to (pdlcount, Qnil);
}
init_macros ()
{
Vexecuting_macro = Qnil;
+ executing_macro = Qnil;
}
syms_of_macros ()