diff options
| author | Glenn Morris <rgm@gnu.org> | 2017-02-17 19:06:15 -0500 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2017-02-17 19:06:15 -0500 |
| commit | 8675f9c8b8a002530d0c4e0263bb3d4cf3a649fa (patch) | |
| tree | 458537063b7b9974209a0fbedcba2799247f2153 /lisp/mail/rmailsum.el | |
| parent | f3eaab0a3749822592ddf36e591dcafd31451177 (diff) | |
| download | emacs-8675f9c8b8a002530d0c4e0263bb3d4cf3a649fa.tar.gz emacs-8675f9c8b8a002530d0c4e0263bb3d4cf3a649fa.tar.bz2 emacs-8675f9c8b8a002530d0c4e0263bb3d4cf3a649fa.zip | |
Ensure that user-mail-address always has a value
* lisp/startup.el (user-mail-address): Initialize in the normal way.
(command-line): Reset user-mail-address if needed using
standard custom machinery.
* lisp/mail/feedmail.el (feedmail-fiddle-from):
* lisp/mail/rmail.el (rmail-unknown-mail-followup-to):
* lisp/mail/rmailsum.el (rmail-header-summary):
Simplify now that user-mail-address is always set.
; * doc/lispref/os.texi (System Environment): Remove fixme comment.
Diffstat (limited to 'lisp/mail/rmailsum.el')
| -rw-r--r-- | lisp/mail/rmailsum.el | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/lisp/mail/rmailsum.el b/lisp/mail/rmailsum.el index 729538173a0..37ac46c6af6 100644 --- a/lisp/mail/rmailsum.el +++ b/lisp/mail/rmailsum.el @@ -753,15 +753,7 @@ the message being processed." (concat "^\\(" (regexp-quote (user-login-name)) "\\($\\|@\\)\\|" - (regexp-quote - ;; Don't lose if run from init file - ;; where user-mail-address is not - ;; set yet. - (if (> (length user-mail-address) 0) - user-mail-address - (concat (user-login-name) "@" - (or mail-host-address - (system-name))))) + (regexp-quote user-mail-address) "\\>\\)")) from)) ;; No From field, or it's this user. |