diff lisp/mail/mailalias.el @ 10327:8822b968b11c

Use `mail-personal-alias-file' globally in place of hardwired "~/.mailrc".

--- a/lisp/mail/mailalias.el	Tue Jan 03 23:43:27 1995 +0000
+++ b/lisp/mail/mailalias.el	Tue Jan 03 23:43:47 1995 +0000
@@ -101,10 +101,12 @@
 	(set-marker end1 nil)))
     (set-marker end nil)))
 
-;; Called by mail-setup, or similar functions, only if ~/.mailrc exists.
+;; Called by mail-setup, or similar functions, only if the file specified
+;; by mail-personal-alias-file (usually `~/.mailrc') exists.
 (defun build-mail-aliases (&optional file)
-  "Read mail aliases from `~/.mailrc' and set `mail-aliases'."
-  (setq file (expand-file-name (or file (or (getenv "MAILRC") "~/.mailrc"))))
+  "Read mail aliases from personal aliases file and set `mail-aliases'.
+By default, this is the file specified by `mail-personal-alias-file'."
+  (setq file (expand-file-name (or file mail-personal-alias-file)))
   (let ((buffer nil)
 	(obuf (current-buffer)))
     (unwind-protect
@@ -170,7 +172,7 @@
   (if (eq mail-aliases t)
       (progn
 	(setq mail-aliases nil)
-	(if (file-exists-p (or (getenv "MAILRC") "~/.mailrc"))
+	(if (file-exists-p mail-personal-alias-file)
 	    (build-mail-aliases))))
   ;; strip garbage from front and end
   (if (string-match "\\`[ \t\n,]+" definition)