*** empty log message ***

4 files changed, 22 insertions, 3 deletions

diff --git a/etc/NEWS b/etc/NEWS
index 9c8156b72e7..80a85e5efd3 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -4900,8 +4900,12 @@ of the display margins.
 *** `sit-for' can now be called with args (SECONDS &optional NODISP).
 
 +++
-*** `sit-for' called with a negative SECONDS value now forces an
-immediate redisplay even if input is pending.
+*** Iconifying or deiconifying a frame no longer makes sit-for return.
+
++++
+*** New function `redisplay' causes an immediate redisplay if no input is
+available, equivalent to (sit-for 0).  The call (redisplay t) forces
+an immediate redisplay even if input is pending.
 
 +++
 *** New function `force-window-update' can initiate a full redisplay of
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d6a7d9dea03..821cf6357f0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,7 +1,7 @@
 2006-07-11  Kim F. Storm  <storm@cua.dk>
 
         * subr.el (sit-for): Doc fix.  Specify normal arg list using fn-form.
-        Simplify by calling redisplay with non-nil arg if seconds < 0.
+        Remove special case for seconds < 0.  Use (redisplay t) instead.
 
 2006-07-10  Chong Yidong  <cyd@stupidchicken.com>
 
diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index c49c4fee2ab..d9453268709 100644
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -1,3 +1,12 @@
+2006-07-11  Kim F. Storm  <storm@cua.dk>
+
+        * display.texi (Forcing Redisplay): Add `redisplay' function.
+        Don't mention (sit-for -1) -- use (redisplay t) instead.
+
+        * commands.texi (Waiting): (sit-for -1) is no longer special.
+        (sit-for 0) is equivalent to (redisplay).
+        Iconifying/deiconifying no longer makes sit-for return.
+
 2006-07-11  Nick Roberts  <nickrob@snap.net.nz>
 
         * tips.texi (Coding Conventions): Mention macros.
diff --git a/src/ChangeLog b/src/ChangeLog
index cefc2f4048d..d9f914218e1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2006-07-11  Kim F. Storm  <storm@cua.dk>
+
+        * dispnew.c (Fredisplay): Add FORCE argument to force redisplay when
+        input is available.  Fix test for redisplay_dont_pause non-nil.
+        Specbind redisplay-dont-pause to t if FORCE non-nil.
+
 2006-07-10  Chong Yidong  <cyd@stupidchicken.com>
 
         * puresize.h (BASE_PURESIZE): Increment to 1211000.