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.

3 files changed, 8 insertions, 28 deletions

diff --git a/lisp/mail/feedmail.el b/lisp/mail/feedmail.el
index 53791565bb1..e0bd4590b13 100644
--- a/lisp/mail/feedmail.el
+++ b/lisp/mail/feedmail.el
@@ -2759,24 +2759,17 @@ return that value."
   (cond
    ;; nil means do nothing
    ((eq nil feedmail-from-line) nil)
-   ;; t is the same a using the default computation, so compute it and recurse
+   ;; t is the same as using the default computation, so compute it and recurse
    ;; user-full-name suggested by kpc@ptolemy.arc.nasa.gov (=Kimball Collins)
    ;; improvement using user-mail-address suggested by
    ;;   gray@austin.apc.slb.com (Douglas Gray Stephens)
-   ;; improvement using mail-host-address suggested by "Jason Eisner" <jason@cs.jhu.edu>
-   ;; ((this situation really is hopeless, though)
    ((eq t feedmail-from-line)
     (let ((feedmail-from-line
-           (let ((at-stuff
-                  (if (> (length user-mail-address) 0)
-                      user-mail-address
-                    (concat (user-login-name) "@"
-                            (or mail-host-address (system-name))))))
-             (cond
-              ((eq mail-from-style nil) at-stuff)
-              ((eq mail-from-style 'parens) (concat at-stuff " (" (user-full-name) ")"))
-              ((eq mail-from-style 'angles) (concat "\"" (user-full-name) "\" <" at-stuff ">"))
-              ))))
+           (cond
+            ((eq mail-from-style nil) user-mail-address)
+            ((eq mail-from-style 'parens) (concat user-mail-address " (" (user-full-name) ")"))
+            ((eq mail-from-style 'angles) (concat "\"" (user-full-name) "\" <" user-mail-address ">"))
+            )))
       (feedmail-fiddle-from)))
 
    ;; if it's a string, simply make a fiddle-plex out of it and recurse
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 695638fa062..4b72b3562d1 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -2665,12 +2665,7 @@ Ask the user whether to add that list name to `mail-mailing-lists'."
                               (concat "^\\("
                                       (regexp-quote (user-login-name))
                                       "\\($\\|@\\)\\|"
-                                      (regexp-quote
-                                       (if (> (length user-mail-address) 0)
-                                           user-mail-address
-                                         (concat (user-login-name) "@"
-                                                 (or mail-host-address
-                                                     (system-name)))))
+                                      (regexp-quote user-mail-address)
                                       "\\>\\)"))
                           addr))
                         (y-or-n-p
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.