Commit 8ed8ef30 authored by Glenn Morris's avatar Glenn Morris
Browse files

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, 680ebfa6, where
the value of user-mail-address during initialization was changed
from nil to the empty string.
parent adfb6f1d
......@@ -2768,7 +2768,8 @@ return that value."
((eq t feedmail-from-line)
(let ((feedmail-from-line
(let ((at-stuff
(if user-mail-address user-mail-address
(if (> (length user-mail-address) 0)
user-mail-address
(concat (user-login-name) "@"
(or mail-host-address (system-name))))))
(cond
......
......@@ -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
......
......@@ -757,10 +757,11 @@ the message being processed."
;; Don't lose if run from init file
;; where user-mail-address is not
;; set yet.
(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)))))
"\\>\\)"))
from))
;; No From field, or it's this user.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment