Merge from emacs--devo--0

[gnu-emacs] / src / dispnew.c

diff --git a/src/dispnew.c b/src/dispnew.c
index e8833376701de253b828cc3e5b529ccb8933abea..f239d6969f4e831a8e7ebc0ef0a09f331fe59b24 100644 (file)
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -355,8 +355,7 @@ static unsigned history_tick;
 
 static void add_frame_display_history P_ ((struct frame *, int));
 static void add_window_display_history P_ ((struct window *, char *, int));
-
-
+\f
 /* Add to the redisplay history how window W has been displayed.
    MSG is a trace containing the information how W's glyph matrix
    has been constructed.  PAUSED_P non-zero means that the update
@@ -6391,7 +6390,9 @@ sit_for (sec, usec, reading, display, initial_display)
 {
   swallow_events (display);
 
-  if (detect_input_pending_run_timers (display) || !NILP (Vexecuting_kbd_macro))
+  if ((detect_input_pending_run_timers (display)
+       && !redisplay_dont_pause)
+      || !NILP (Vexecuting_kbd_macro))
     return Qnil;
 
   if (initial_display)
@@ -6421,6 +6422,9 @@ Redisplay is preempted as always if input arrives, and does not happen
 if input is available before it starts.
 Value is t if waited the full time with no input arriving.
 
+Redisplay will occur even when input is available if you bind
+`redisplay-dont-pause' to a non-nil value.
+
 An obsolete but still supported form is
 \(sit-for SECONDS &optional MILLISECONDS NODISP)
 Where the optional arg MILLISECONDS specifies an additional wait period,