diff options
| author | Noah Friedman <friedman@splode.com> | 1995-01-03 23:43:47 +0000 |
|---|---|---|
| committer | Noah Friedman <friedman@splode.com> | 1995-01-03 23:43:47 +0000 |
| commit | eb3c9a3a2990d1ab58c63845751e99636a05207b (patch) | |
| tree | d6795ee14f15594be1198ec0611b9c108ff997d0 | |
| parent | b778dc427c235579e9d7d2b72e67df9bd94c990a (diff) | |
| download | emacs-eb3c9a3a2990d1ab58c63845751e99636a05207b.tar.gz | |
Use `mail-personal-alias-file' globally in place of hardwired "~/.mailrc".
| -rw-r--r-- | lisp/mail/mailalias.el | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lisp/mail/mailalias.el b/lisp/mail/mailalias.el index ca788757cf1..84f12876eb6 100644 --- a/lisp/mail/mailalias.el +++ b/lisp/mail/mailalias.el @@ -101,10 +101,12 @@ removed from alias expansions." (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 @@ An address can contain spaces if it is quoted with double-quotes." (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) |