# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1087166360 0
# Node ID 53ee2494768312c274f3cf01f29c936d6b7b2e4a
# Parent  5839db7619ca90aa7a19e4c1221b0ac9ef9aef9d
(cmd_error): Don't call any_kboard_state if inside a recursive edit level.

(command_loop): Call any_kboard_state before command_loop_2 when at top level.

diff -r 5839db7619ca -r 53ee24947683 src/keyboard.c
--- a/src/keyboard.c	Sun Jun 13 22:37:07 2004 +0000
+++ b/src/keyboard.c	Sun Jun 13 22:39:20 2004 +0000
@@ -1158,7 +1158,8 @@
 
   Vinhibit_quit = Qnil;
 #ifdef MULTI_KBOARD
-  any_kboard_state ();
+  if (command_loop_level == 0 && minibuf_level == 0)
+    any_kboard_state ();
 #endif
 
   return make_number (0);
@@ -1247,6 +1248,10 @@
     while (1)
       {
 	internal_catch (Qtop_level, top_level_1, Qnil);
+	/* Reset single_kboard in case top-level set it while
+	   evaluating an -f option, or we are stuck there for some
+	   other reason.  */
+	any_kboard_state ();
 	internal_catch (Qtop_level, command_loop_2, Qnil);
 	executing_macro = Qnil;