Commit 68c46464 authored by Richard M. Stallman's avatar Richard M. Stallman

(command_loop): Reset executing_macro after

command_loop_2 has returned, in case a throw to exit or top-level
was executed as part of a keyboard macro.
parent 3ffde7d6
......@@ -1021,13 +1021,16 @@ command_loop ()
{
if (command_loop_level > 0 || minibuf_level > 0)
{
return internal_catch (Qexit, command_loop_2, Qnil);
Lisp_Object val = internal_catch (Qexit, command_loop_2, Qnil);
executing_macro = Qnil;
return val;
}
else
while (1)
{
internal_catch (Qtop_level, top_level_1, Qnil);
internal_catch (Qtop_level, command_loop_2, Qnil);
executing_macro = Qnil;
/* End of file in -batch run causes exit here. */
if (noninteractive)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment