# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 898571364 0
# Node ID 10770ff8e88fbe80efd8ea573b35f864475178ae
# Parent  4ec5c343db1f6dfc56cc73e96bbb4b9de6b0c820
(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.

diff -r 4ec5c343db1f -r 10770ff8e88f src/keyboard.c
--- a/src/keyboard.c	Tue Jun 23 03:07:05 1998 +0000
+++ b/src/keyboard.c	Tue Jun 23 03:09:24 1998 +0000
@@ -1021,13 +1021,16 @@
 {
   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)