aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Innes1999-05-04 17:34:36 +0000
committerAndrew Innes1999-05-04 17:34:36 +0000
commit5d18c0b3e63af02cf3de5e521177f733d2363173 (patch)
tree309cdde17e0f14e14bde2cb05466eddeb555a249
parent1c885fe1ad42e6616f028c9686b6c4725952c699 (diff)
downloademacs-5d18c0b3e63af02cf3de5e521177f733d2363173.tar.gz
emacs-5d18c0b3e63af02cf3de5e521177f733d2363173.zip
(display-time-update): Allow for wrap-around when
checking against display-time-server-down-time.
-rw-r--r--lisp/time.el8
1 files changed, 5 insertions, 3 deletions
diff --git a/lisp/time.el b/lisp/time.el
index 49b9c604ae0..9e80c636af1 100644
--- a/lisp/time.el
+++ b/lisp/time.el
@@ -213,9 +213,11 @@ would give mode line times like `94/12/30 21:07:48 (UTC)'."
213 (mail (and (stringp mail-spool-file) 213 (mail (and (stringp mail-spool-file)
214 (or (null display-time-server-down-time) 214 (or (null display-time-server-down-time)
215 ;; If have been down for 20 min, try again. 215 ;; If have been down for 20 min, try again.
216 (> (- (nth 1 (current-time)) 216 (> (- (nth 1 now) display-time-server-down-time)
217 display-time-server-down-time) 217 1200)
218 1200)) 218 (and (< (nth 1 now) display-time-server-down-time)
219 (> (- (nth 1 now) display-time-server-down-time)
220 -64336)))
219 (let ((start-time (current-time))) 221 (let ((start-time (current-time)))
220 (prog1 222 (prog1
221 (display-time-file-nonempty-p mail-spool-file) 223 (display-time-file-nonempty-p mail-spool-file)