* subr.el (sit-for): Just sleep-for if noninteractive.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 22d4caba8843fd1fe709a431822c15702b6bf957..ffeac9d760ac944765f31d2380abdd8cd30a10c8 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2006-07-17  Chong Yidong  <cyd@stupidchicken.com>
+
+       * subr.el (sit-for): Just sleep-for if noninteractive.
+
 2006-07-17  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * emacs-lisp/autoload.el (make-autoload): Use new arg.

diff --git a/lisp/subr.el b/lisp/subr.el
index d80bec4402ab27c8ce7ef724ee3b53bd12ceb0f5..a94096b184ed23c0ee3efa97c38482b93d64dd57 100644 (file)
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -1721,22 +1721,23 @@ floating point support.
   (when (or obsolete (numberp nodisp))
     (setq seconds (+ seconds (* 1e-3 nodisp)))
     (setq nodisp obsolete))
-  (unless nodisp
-    (redisplay))
-  (or (<= seconds 0)
-      (let ((timer (timer-create))
-           (echo-keystrokes 0))
-       (if (catch 'sit-for-timeout
-             (timer-set-time timer (timer-relative-time
-                                    (current-time) seconds))
-             (timer-set-function timer 'with-timeout-handler
-                                 '(sit-for-timeout))
-             (timer-activate timer)
-             (push (read-event) unread-command-events)
-             nil)
-           t
-         (cancel-timer timer)
-         nil))))
+  (if noninteractive
+      (progn (sleep-for seconds) t)
+    (unless nodisp (redisplay))
+    (or (<= seconds 0)
+       (let ((timer (timer-create))
+             (echo-keystrokes 0))
+         (if (catch 'sit-for-timeout
+               (timer-set-time timer (timer-relative-time
+                                      (current-time) seconds))
+               (timer-set-function timer 'with-timeout-handler
+                                   '(sit-for-timeout))
+               (timer-activate timer)
+               (push (read-event) unread-command-events)
+               nil)
+             t
+           (cancel-timer timer)
+           nil)))))
 \f
 ;;; Atomic change groups.