summaryrefslogtreecommitdiff
path: root/lisp/mail/rmail.el
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2017-02-15 20:23:07 -0500
committerGlenn Morris <rgm@gnu.org>2017-02-15 20:23:07 -0500
commit8ed8ef307d9a28f6c3336a448c7fbdfe8a733d83 (patch)
treec0fd8a241de4668ca1a52ec91c72263bbe46c965 /lisp/mail/rmail.el
parentadfb6f1dc26a927cf4bab24bdfae54b51e3ae0ec (diff)
downloademacs-8ed8ef307d9a28f6c3336a448c7fbdfe8a733d83.tar.gz
Handle user-mail-address being the empty string
* lisp/mail/feedmail.el (feedmail-fiddle-from): * lisp/mail/rmail.el (rmail-unknown-mail-followup-to): * lisp/mail/rmailsum.el (rmail-header-summary): Belated update for 2002-09-29 startup.el change, 680ebfa, where the value of user-mail-address during initialization was changed from nil to the empty string.
Diffstat (limited to 'lisp/mail/rmail.el')
-rw-r--r--lisp/mail/rmail.el9
1 files changed, 5 insertions, 4 deletions
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index aeaba5862fc..695638fa062 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -2666,10 +2666,11 @@ Ask the user whether to add that list name to `mail-mailing-lists'."
(regexp-quote (user-login-name))
"\\($\\|@\\)\\|"
(regexp-quote
- (or user-mail-address
- (concat (user-login-name) "@"
- (or mail-host-address
- (system-name)))))
+ (if (> (length user-mail-address) 0)
+ user-mail-address
+ (concat (user-login-name) "@"
+ (or mail-host-address
+ (system-name)))))
"\\>\\)"))
addr))
(y-or-n-p