From: Kim F. Storm <storm@cua.dk>
Date: Tue, 11 Jul 2006 00:17:43 +0000 (+0000)
Subject: (sit-for): Doc fix.  Specify normal arg list using fn-form.
X-Git-Tag: emacs-pretest-22.0.90~1561
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d8120806749ce933cf24c59514d9553a2edb05d6;p=emacs.git

(sit-for): Doc fix.  Specify normal arg list using fn-form.
Remove special case for seconds < 0.  Use (redisplay t) instead.
---

diff --git a/lisp/subr.el b/lisp/subr.el
index 5c7e1c30cf4..d80bec4402a 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -1708,22 +1708,21 @@ second, floating-point values are rounded down to the nearest integer.)
 
 If optional arg NODISP is t, don't redisplay, just wait for input.
 Redisplay does not happen if input is available before it starts.
-However, as a special exception, redisplay will occur even when
-input is available if SECONDS is negative.
 
 Value is t if waited the full time with no input arriving, and nil otherwise.
 
-An obsolete but still supported form is
+An obsolete, but still supported form is
 \(sit-for SECONDS &optional MILLISECONDS NODISP)
-Where the optional arg MILLISECONDS specifies an additional wait period,
+where the optional arg MILLISECONDS specifies an additional wait period,
 in milliseconds; this was useful when Emacs was built without
-floating point support."
+floating point support.
+
+\(fn SECONDS &optional NODISP)"
   (when (or obsolete (numberp nodisp))
     (setq seconds (+ seconds (* 1e-3 nodisp)))
     (setq nodisp obsolete))
   (unless nodisp
-    (let ((redisplay-dont-pause (or (< seconds 0) redisplay-dont-pause)))
-      (redisplay)))
+    (redisplay))
   (or (<= seconds 0)
       (let ((timer (timer-create))
 	    (echo-keystrokes 0))