diff options
| author | Richard M. Stallman | 2003-08-29 16:13:31 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 2003-08-29 16:13:31 +0000 |
| commit | 74f8a3338490f7ce2fadac60d26a9024fc007f70 (patch) | |
| tree | fd6256ba250ce0971f5c04aefb366138f37a929d | |
| parent | f7e85dcf23383000d40c1c997ecd5f3df83c9ac2 (diff) | |
| download | emacs-74f8a3338490f7ce2fadac60d26a9024fc007f70.tar.gz emacs-74f8a3338490f7ce2fadac60d26a9024fc007f70.zip | |
(sendmail-sync-aliases, mail-setup):
Do nothing with mail-personal-alias-file if it is nil.
| -rw-r--r-- | lisp/mail/sendmail.el | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el index ab9c89a02f9..f7229408dbd 100644 --- a/lisp/mail/sendmail.el +++ b/lisp/mail/sendmail.el | |||
| @@ -387,10 +387,11 @@ actually occur.") | |||
| 387 | 387 | ||
| 388 | 388 | ||
| 389 | (defun sendmail-sync-aliases () | 389 | (defun sendmail-sync-aliases () |
| 390 | (let ((modtime (nth 5 (file-attributes mail-personal-alias-file)))) | 390 | (when mail-personal-alias-file |
| 391 | (or (equal mail-alias-modtime modtime) | 391 | (let ((modtime (nth 5 (file-attributes mail-personal-alias-file)))) |
| 392 | (setq mail-alias-modtime modtime | 392 | (or (equal mail-alias-modtime modtime) |
| 393 | mail-aliases t)))) | 393 | (setq mail-alias-modtime modtime |
| 394 | mail-aliases t))))) | ||
| 394 | 395 | ||
| 395 | (defun mail-setup (to subject in-reply-to cc replybuffer actions) | 396 | (defun mail-setup (to subject in-reply-to cc replybuffer actions) |
| 396 | (or mail-default-reply-to | 397 | (or mail-default-reply-to |
| @@ -399,8 +400,9 @@ actually occur.") | |||
| 399 | (if (eq mail-aliases t) | 400 | (if (eq mail-aliases t) |
| 400 | (progn | 401 | (progn |
| 401 | (setq mail-aliases nil) | 402 | (setq mail-aliases nil) |
| 402 | (if (file-exists-p mail-personal-alias-file) | 403 | (when mail-personal-alias-file |
| 403 | (build-mail-aliases)))) | 404 | (if (file-exists-p mail-personal-alias-file) |
| 405 | (build-mail-aliases))))) | ||
| 404 | ;; Don't leave this around from a previous message. | 406 | ;; Don't leave this around from a previous message. |
| 405 | (kill-local-variable 'buffer-file-coding-system) | 407 | (kill-local-variable 'buffer-file-coding-system) |
| 406 | ;; This doesn't work for enable-multibyte-characters. | 408 | ;; This doesn't work for enable-multibyte-characters. |