aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman1994-10-18 02:39:40 +0000
committerRichard M. Stallman1994-10-18 02:39:40 +0000
commit7ff974482e2c90a827846675de48dd7235ebee14 (patch)
treec6635ee60b650c1a34bbc020eaf8f4839a7d7c65
parenteac358efdda83be41da19e8f224771d624a53951 (diff)
downloademacs-7ff974482e2c90a827846675de48dd7235ebee14.tar.gz
emacs-7ff974482e2c90a827846675de48dd7235ebee14.zip
(display-time-filter): Ignore mail-spool-file if not string.
-rw-r--r--lisp/time.el6
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/time.el b/lisp/time.el
index 77325f98a27..14a6a17d398 100644
--- a/lisp/time.el
+++ b/lisp/time.el
@@ -29,7 +29,8 @@
29 29
30(defvar display-time-mail-file nil 30(defvar display-time-mail-file nil
31 "*File name of mail inbox file, for indicating existence of new mail. 31 "*File name of mail inbox file, for indicating existence of new mail.
32Default is system-dependent, and is the same as used by Rmail.") 32Non-nil and not a string means don't check for mail. nil means use
33default, which is system-dependent, and is the same as used by Rmail.")
33 34
34;;;###autoload 35;;;###autoload
35(defvar display-time-day-and-date nil "\ 36(defvar display-time-day-and-date nil "\
@@ -127,7 +128,8 @@ would give mode line times like `94/12/30 21:07:48 (UTC)'.")
127 (getenv "MAIL") 128 (getenv "MAIL")
128 (concat rmail-spool-directory 129 (concat rmail-spool-directory
129 (user-login-name)))) 130 (user-login-name))))
130 (mail (and (or (null display-time-server-down-time) 131 (mail (and (stringp mail-spool-file)
132 (or (null display-time-server-down-time)
131 ;; If have been down for 20 min, try again. 133 ;; If have been down for 20 min, try again.
132 (> (- (nth 1 (current-time)) 134 (> (- (nth 1 (current-time))
133 display-time-server-down-time) 135 display-time-server-down-time)