Mercurial > emacs
changeset 16673:932451713b13
(display-time-event-handler): If Don't run the timer
for successive times that are already in the past.
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Fri, 13 Dec 1996 01:31:43 +0000 |
parents | 1facf218a14f |
children | 91590d8f74c3 |
files | lisp/time.el |
diffstat | 1 files changed, 17 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/time.el Thu Dec 12 23:00:31 1996 +0000 +++ b/lisp/time.el Fri Dec 13 01:31:43 1996 +0000 @@ -134,7 +134,23 @@ (defun display-time-event-handler () (display-time-update) ;; Do redisplay right now, if no input pending. - (sit-for 0)) + (sit-for 0) + (let ((current (current-time)) + (timer display-time-timer)) + ;; If the next activation time is already in the past, + ;; skip executions until we reach a time in the future. + ;; This avoids a long pause if Emacs has been suspended for hours. + (or (> (aref timer 1) (nth 0 current)) + (and (= (aref timer 1) (nth 0 current)) + (> (aref timer 2) (nth 1 current))) + (and (= (aref timer 1) (nth 0 current)) + (= (aref timer 2) (nth 1 current)) + (> (aref timer 3) (nth 2 current))) + (progn + (cancel-timer timer) + (timer-set-time timer (timer-next-integral-multiple-of-time + current display-time-interval)) + (timer-activate timer))))) ;; Update the display-time info for the mode line ;; but don't redisplay right now. This is used for