diff options
| author | Noah Friedman | 1995-01-03 23:43:27 +0000 |
|---|---|---|
| committer | Noah Friedman | 1995-01-03 23:43:27 +0000 |
| commit | 8790b6984afaf67c0780cd3f99b785d20ba1aabc (patch) | |
| tree | acc4f645d7bfae89aaee92fc697f55873ca2ed9c | |
| parent | c0bcb2393b65411a747b0cd33394098bfd07ea57 (diff) | |
| download | emacs-8790b6984afaf67c0780cd3f99b785d20ba1aabc.tar.gz emacs-8790b6984afaf67c0780cd3f99b785d20ba1aabc.zip | |
(mail-personal-alias-file): New variable.
Use globally in place of hardwired "~/.mailrc".
| -rw-r--r-- | lisp/mail/sendmail.el | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el index cde6c9e894c..9287b18d4bd 100644 --- a/lisp/mail/sendmail.el +++ b/lisp/mail/sendmail.el | |||
| @@ -80,6 +80,13 @@ This file defines aliases to be expanded by the mailer; this is a different | |||
| 80 | feature from that of defining aliases in `.mailrc' to be expanded in Emacs. | 80 | feature from that of defining aliases in `.mailrc' to be expanded in Emacs. |
| 81 | This variable has no effect unless your system uses sendmail as its mailer.") | 81 | This variable has no effect unless your system uses sendmail as its mailer.") |
| 82 | 82 | ||
| 83 | ;;;###autoload | ||
| 84 | (defvar mail-personal-alias-file "~/.mailrc" | ||
| 85 | "*If non-nil, the name of the user's personal mail alias file. | ||
| 86 | This file typically should be in same format as the `.mailrc' file used by | ||
| 87 | the `Mail' or `mailx' program. | ||
| 88 | This file need not actually exist.") | ||
| 89 | |||
| 83 | (defvar mail-aliases t | 90 | (defvar mail-aliases t |
| 84 | "Alist of mail address aliases, | 91 | "Alist of mail address aliases, |
| 85 | or t meaning should be initialized from your mail aliases file. | 92 | or t meaning should be initialized from your mail aliases file. |
| @@ -119,7 +126,7 @@ instead of no action.") | |||
| 119 | (defvar mail-mode-map nil) | 126 | (defvar mail-mode-map nil) |
| 120 | 127 | ||
| 121 | (autoload 'build-mail-aliases "mailalias" | 128 | (autoload 'build-mail-aliases "mailalias" |
| 122 | "Read mail aliases from `~/.mailrc' and set `mail-aliases'." | 129 | "Read mail aliases from user's personal aliases file and set `mail-aliases'." |
| 123 | nil) | 130 | nil) |
| 124 | 131 | ||
| 125 | (autoload 'expand-mail-aliases "mailalias" | 132 | (autoload 'expand-mail-aliases "mailalias" |
| @@ -192,7 +199,7 @@ actually occur.") | |||
| 192 | "Normal hook run before sending mail, in Mail mode.") | 199 | "Normal hook run before sending mail, in Mail mode.") |
| 193 | 200 | ||
| 194 | (defun sendmail-synch-aliases () | 201 | (defun sendmail-synch-aliases () |
| 195 | (let ((modtime (nth 5 (file-attributes (or (getenv "MAILRC") "~/.mailrc"))))) | 202 | (let ((modtime (nth 5 (file-attributes mail-personal-alias-file)))) |
| 196 | (or (equal mail-alias-modtime modtime) | 203 | (or (equal mail-alias-modtime modtime) |
| 197 | (setq mail-alias-modtime modtime | 204 | (setq mail-alias-modtime modtime |
| 198 | mail-aliases t)))) | 205 | mail-aliases t)))) |
| @@ -204,7 +211,7 @@ actually occur.") | |||
| 204 | (if (eq mail-aliases t) | 211 | (if (eq mail-aliases t) |
| 205 | (progn | 212 | (progn |
| 206 | (setq mail-aliases nil) | 213 | (setq mail-aliases nil) |
| 207 | (if (file-exists-p "~/.mailrc") | 214 | (if (file-exists-p mail-personal-alias-file) |
| 208 | (build-mail-aliases)))) | 215 | (build-mail-aliases)))) |
| 209 | (setq mail-send-actions actions) | 216 | (setq mail-send-actions actions) |
| 210 | (setq mail-reply-buffer replybuffer) | 217 | (setq mail-reply-buffer replybuffer) |