aboutsummaryrefslogtreecommitdiffstats
path: root/src/keyboard.c
diff options
context:
space:
mode:
authorStefan Monnier2014-12-17 17:08:07 -0500
committerStefan Monnier2014-12-17 17:08:07 -0500
commitec10ba2792eef613caf47fff83e869d4bc177616 (patch)
tree1c16a8df5eb677cbbc696284df6ce8c8d16a69aa /src/keyboard.c
parent92bad2aa0589d837e48af58f09134b48b32cfbb7 (diff)
downloademacs-ec10ba2792eef613caf47fff83e869d4bc177616.tar.gz
emacs-ec10ba2792eef613caf47fff83e869d4bc177616.zip
* src/keyboard.c (swallow_events): Don't redisplay if there's input pending.
Diffstat (limited to 'src/keyboard.c')
-rw-r--r--src/keyboard.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/keyboard.c b/src/keyboard.c
index beb34592d1c..9e12f590c57 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -2582,7 +2582,7 @@ read_char (int commandflag, Lisp_Object map,
2582 user-visible, such as X selection_request events. */ 2582 user-visible, such as X selection_request events. */
2583 if (input_pending 2583 if (input_pending
2584 || detect_input_pending_run_timers (0)) 2584 || detect_input_pending_run_timers (0))
2585 swallow_events (0); /* May clear input_pending. */ 2585 swallow_events (false); /* May clear input_pending. */
2586 2586
2587 /* Redisplay if no pending input. */ 2587 /* Redisplay if no pending input. */
2588 while (!input_pending) 2588 while (!input_pending)
@@ -2598,7 +2598,7 @@ read_char (int commandflag, Lisp_Object map,
2598 2598
2599 /* Input arrived and pre-empted redisplay. 2599 /* Input arrived and pre-empted redisplay.
2600 Process any events which are not user-visible. */ 2600 Process any events which are not user-visible. */
2601 swallow_events (0); 2601 swallow_events (false);
2602 /* If that cleared input_pending, try again to redisplay. */ 2602 /* If that cleared input_pending, try again to redisplay. */
2603 } 2603 }
2604 2604
@@ -4370,7 +4370,7 @@ swallow_events (bool do_display)
4370 old_timers_run = timers_run; 4370 old_timers_run = timers_run;
4371 get_input_pending (READABLE_EVENTS_DO_TIMERS_NOW); 4371 get_input_pending (READABLE_EVENTS_DO_TIMERS_NOW);
4372 4372
4373 if (timers_run != old_timers_run && do_display) 4373 if (!input_pending && timers_run != old_timers_run && do_display)
4374 redisplay_preserve_echo_area (7); 4374 redisplay_preserve_echo_area (7);
4375} 4375}
4376 4376