[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/keyboard.c
From: |
Richard M . Stallman |
Subject: |
[Emacs-diffs] Changes to emacs/src/keyboard.c |
Date: |
Sun, 13 Jun 2004 18:41:19 -0400 |
Index: emacs/src/keyboard.c
diff -c emacs/src/keyboard.c:1.779 emacs/src/keyboard.c:1.780
*** emacs/src/keyboard.c:1.779 Sun Jun 13 15:34:11 2004
--- emacs/src/keyboard.c Sun Jun 13 22:39:20 2004
***************
*** 1158,1164 ****
Vinhibit_quit = Qnil;
#ifdef MULTI_KBOARD
! any_kboard_state ();
#endif
return make_number (0);
--- 1158,1165 ----
Vinhibit_quit = Qnil;
#ifdef MULTI_KBOARD
! if (command_loop_level == 0 && minibuf_level == 0)
! any_kboard_state ();
#endif
return make_number (0);
***************
*** 1247,1252 ****
--- 1248,1257 ----
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;