bug#7158: 24.0.50; Incorrect handling of variable 'display-time-mail-function'

[Detlev Zundel <dzu@denx.de>]

[-- Attachment #1: Type: text/plain, Size: 2432 bytes --]

As I understand the documentation, the variable
'display-time-mail-function' should allow to provide a function which
decides whether to display the mail icon in the status area.

Unfortunately the code does not allow this semantic, as the code uses an
or expression over several possibilities (lisp/time.el:407):

        (mail (or (and display-time-mail-function
                       (funcall display-time-mail-function))
                  (and display-time-mail-directory
                       (display-time-mail-check-directory))
                  (and (stringp mail-spool-file)
                       (or (null display-time-server-down-time)
                           ;; If have been down for 20 min, try again.
                           (> (- (nth 1 now) display-time-server-down-time)
                              1200)
                           (and (< (nth 1 now) display-time-server-down-time)
                                (> (- (nth 1 now)
                                      display-time-server-down-time)
                                   -64336)))
                       (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)))))))


So when display-time-mail-function is set but returns nil, then the
following tests will still be evaluated instead of using this negative
result.

As a fix I propose the attached patch.

Thanks
  Detlev


In GNU Emacs 24.0.50.1 (i686-pc-linux-gnu, GTK+ Version 2.18.9)
 of 2010-08-16 on ohwell
Windowing system distributor `The X.Org Foundation', version 11.0.10707000


-- 
... and I will continue to use a  low-level language to indicate how
machines actually compute.  Readers  who only want to see algorithms
that are already packaged in a plug-in way, using a trendy language,
should buy other people's books.
                                         -- Donald Knuth, Fascicle 1


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: time.el.patch --]
[-- Type: text/x-diff, Size: 2413 bytes --]

diff --git a/lisp/time.el b/lisp/time.el
index d512fae..80bb176 100644
--- a/lisp/time.el
+++ b/lisp/time.el
@@ -404,30 +404,31 @@ update which can wait for the next redisplay."
                               (getenv "MAIL")
                               (concat rmail-spool-directory
                                       (user-login-name))))
-	 (mail (or (and display-time-mail-function
-			(funcall display-time-mail-function))
-		   (and display-time-mail-directory
-			(display-time-mail-check-directory))
-		   (and (stringp mail-spool-file)
-			(or (null display-time-server-down-time)
-			    ;; If have been down for 20 min, try again.
-			    (> (- (nth 1 now) display-time-server-down-time)
-			       1200)
-			    (and (< (nth 1 now) display-time-server-down-time)
-				 (> (- (nth 1 now)
-				       display-time-server-down-time)
-				    -64336)))
-			(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)))))))
+	 (mail (cond (display-time-mail-function
+		      (funcall display-time-mail-function))
+		     (display-time-mail-directory
+		      (display-time-mail-check-directory))
+		     ((stringp mail-spool-fail)
+		      (and
+		       (or (null display-time-server-down-time)
+			   ;; If have been down for 20 min, try again.
+			   (> (- (nth 1 now) display-time-server-down-time)
+			      1200)
+			   (and (< (nth 1 now) display-time-server-down-time)
+				(> (- (nth 1 now)
+				      display-time-server-down-time)
+				   -64336)))
+		       (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-number 24-hours))
          (12-hours (int-to-string (1+ (% (+ hour 11) 12))))