(display-time-event-handler): If Don't run the timer

for successive times that are already in the past.

diff --git a/lisp/time.el b/lisp/time.el
index 9d418d4f8f736a20244206000f4f5230f1709b9b..d400d75ff37fd15de562eb10efbcd2b17a3c6430 100644 (file)
--- a/lisp/time.el
+++ b/lisp/time.el
@@ -134,7 +134,23 @@ would give mode line times like `94/12/30 21:07:48 (UTC)'.")
 (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