# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1153186488 0
# Node ID f2a11961b9d89314bfff8fd2e664b8ad94691ef1
# Parent  1df664b7bac5d258a92af82d2eba9b0c6b91f924
	* subr.el (sit-for): Just sleep-for if noninteractive.

diff -r 1df664b7bac5 -r f2a11961b9d8 lisp/ChangeLog
--- a/lisp/ChangeLog	Tue Jul 18 00:11:20 2006 +0000
+++ b/lisp/ChangeLog	Tue Jul 18 01:34:48 2006 +0000
@@ -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 -r 1df664b7bac5 -r f2a11961b9d8 lisp/subr.el
--- a/lisp/subr.el	Tue Jul 18 00:11:20 2006 +0000
+++ b/lisp/subr.el	Tue Jul 18 01:34:48 2006 +0000
@@ -1721,22 +1721,23 @@
   (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)))))
 
 ;;; Atomic change groups.