From c1fdbde6c8c1e007d5abe6fba012fb1a2c09c448 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Tue, 18 Jul 2006 01:34:48 +0000 Subject: [PATCH] * subr.el (sit-for): Just sleep-for if noninteractive. --- lisp/ChangeLog | 4 ++++ lisp/subr.el | 33 +++++++++++++++++---------------- 2 files changed, 21 insertions(+), 16 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 22d4caba884..ffeac9d760a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2006-07-17 Chong Yidong + + * subr.el (sit-for): Just sleep-for if noninteractive. + 2006-07-17 Stefan Monnier * emacs-lisp/autoload.el (make-autoload): Use new arg. diff --git a/lisp/subr.el b/lisp/subr.el index d80bec4402a..a94096b184e 100644 --- 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))))) ;;; Atomic change groups. -- 2.39.2