From 68c46464e63fab99ae49c59b3f48deb77a8bff28 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Tue, 23 Jun 1998 03:09:24 +0000 Subject: [PATCH] (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. --- src/keyboard.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/keyboard.c b/src/keyboard.c index 9db0bca9683..0df3f09cd86 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -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) -- 2.39.2