Use value of `rmail-spool-directory' as a default for the `file'

mail-sources entry, if that variable is defined.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a096b16..a103e3f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2000-10-13  Kai Gro\e,A_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+
+       * mail-source.el (defvar mail-source-keyword-map): Use
+       `rmail-spool-directory' as a default directory for the `file'
+       source, if the variable is defined.  Fall back to hardcoded
+       "/usr/spool/mail/", as before.  Suggestion by Steven E. Harris
+       <seh@speakeasy.org>.
+
 2000-10-13 12:01:15  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * message.el (message-send-mail-partially): Replace the header

diff --git a/lisp/mail-source.el b/lisp/mail-source.el
index ec1ec29..1e4b5c4 100644 (file)
--- a/lisp/mail-source.el
+++ b/lisp/mail-source.el
@@ -233,7 +233,10 @@ Common keywords should be listed here.")
        (:prescript-delay)
        (:postscript)
        (:path (or (getenv "MAIL")
-                 (concat "/usr/spool/mail/" (user-login-name)))))
+                  (and (boundp 'rmail-spool-directory)
+                       (expand-file-name (user-login-name)
+                                         rmail-spool-directory))
+                 (expand-file-name (user-login-name) "/usr/spool/mail/"))))
       (directory
        (:path)
        (:suffix ".spool")