# HG changeset patch
# User Karl Heuer <kwzh@gnu.org>
# Date 779757651 0
# Node ID 0e668dd3f1207fd6e4344dfd8aa21874731fcb45
# Parent  18bf41f29a7dce24f304f02b9abec8ce7a5dd814
(display-time-24hr-format): Doc fix.
(display-time-filter): Reenable code that got deleted during a mispatch.

diff -r 18bf41f29a7d -r 0e668dd3f120 lisp/time.el
--- a/lisp/time.el	Fri Sep 16 23:10:44 1994 +0000
+++ b/lisp/time.el	Fri Sep 16 23:20:51 1994 +0000
@@ -41,7 +41,7 @@
   "*Seconds between updates of time in the mode line.")
 
 (defvar display-time-24hr-format nil
-  "*Non-nill indicates time should be displayed as hh:mm, 0 <= hh <= 23.
+  "*Non-nil indicates time should be displayed as hh:mm, 0 <= hh <= 23.
 Nil means 1 <= hh <= 12, and an AM/PM suffix is used.")
 
 (defvar display-time-string nil)
@@ -126,18 +126,25 @@
          (mail-spool-file (or display-time-mail-file
                               (getenv "MAIL")
                               (concat rmail-spool-directory
-                                      (or (getenv "LOGNAME")
-                                          (getenv "USER")
-                                          (user-login-name)))))
-         (mail (and (file-exists-p mail-spool-file)
-                    (display-time-file-nonempty-p mail-spool-file)))
+                                      (user-login-name))))
+	 (mail (and (or (null display-time-server-down-time)
+			;; If have been down for 20 min, try again.
+			(> (- (nth 1 (current-time))
+			      display-time-server-down-time)
+			   1200))
+		    (let ((start-time (current-time)))
+		      (prog1
+			  (display-time-file-nonempty-p mail-spool-file)
+			(if (> (- (nth 1 (current-time)) (nth 1 start-time))
+			       20)
+			    ;; Record that mail file is not accessible.
+			    (setq display-time-server-down-time 
+				  (nth 1 (current-time)))
+			  ;; Record that mail file is accessible.
+			  (setq display-time-server-down-time nil))))))
          (24-hours (substring time 11 13))
          (hour (string-to-int 24-hours))
-         (12-hours (int-to-string (if (> hour 12)
-                                      (- hour 12)
-                                    (if (= hour 0)
-                                        12
-                                      hour))))
+         (12-hours (int-to-string (1+ (% (+ hour 11) 12))))
          (am-pm (if (>= hour 12) "pm" "am"))
          (minutes (substring time 14 16))
          (seconds (substring time 17 19))