Mercurial > emacs
comparison src/keyboard.c @ 56093:53ee24947683
(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.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Sun, 13 Jun 2004 22:39:20 +0000 |
| parents | 343ad07ce78b |
| children | 8715315bd4ab 38500c0c86ab |
comparison
equal
deleted
inserted
replaced
| 56092:5839db7619ca | 56093:53ee24947683 |
|---|---|
| 1156 | 1156 |
| 1157 Vquit_flag = Qnil; | 1157 Vquit_flag = Qnil; |
| 1158 | 1158 |
| 1159 Vinhibit_quit = Qnil; | 1159 Vinhibit_quit = Qnil; |
| 1160 #ifdef MULTI_KBOARD | 1160 #ifdef MULTI_KBOARD |
| 1161 any_kboard_state (); | 1161 if (command_loop_level == 0 && minibuf_level == 0) |
| 1162 any_kboard_state (); | |
| 1162 #endif | 1163 #endif |
| 1163 | 1164 |
| 1164 return make_number (0); | 1165 return make_number (0); |
| 1165 } | 1166 } |
| 1166 | 1167 |
| 1245 } | 1246 } |
| 1246 else | 1247 else |
| 1247 while (1) | 1248 while (1) |
| 1248 { | 1249 { |
| 1249 internal_catch (Qtop_level, top_level_1, Qnil); | 1250 internal_catch (Qtop_level, top_level_1, Qnil); |
| 1251 /* Reset single_kboard in case top-level set it while | |
| 1252 evaluating an -f option, or we are stuck there for some | |
| 1253 other reason. */ | |
| 1254 any_kboard_state (); | |
| 1250 internal_catch (Qtop_level, command_loop_2, Qnil); | 1255 internal_catch (Qtop_level, command_loop_2, Qnil); |
| 1251 executing_macro = Qnil; | 1256 executing_macro = Qnil; |
| 1252 | 1257 |
| 1253 /* End of file in -batch run causes exit here. */ | 1258 /* End of file in -batch run causes exit here. */ |
| 1254 if (noninteractive) | 1259 if (noninteractive) |