(command-line): Init user-mail-address here, after reading init file.

(normal-top-level): Not here.

diff --git a/lisp/startup.el b/lisp/startup.el
index 772d619f8893aff3530409670a0be58c38f9f481..987bb8b781483a845ca996d381389226e8261352 100644 (file)
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -275,9 +275,6 @@ this prefix to create a unique file name.")
                           (delete (concat "PWD=" pwd)
                                   process-environment)))))))
     (setq default-directory (abbreviate-file-name default-directory))
-    (setq user-mail-address (concat (user-login-name) "@"
-                                   (or mail-host-address
-                                       (system-name))))
     ;; Specify the file for recording all the auto save files of this session.
     ;; This is used by recover-session.
     (setq auto-save-list-file-name
@@ -525,6 +522,12 @@ this prefix to create a unique file name.")
     (if debug-on-error-should-be-set
        (setq debug-on-error debug-on-error-from-init-file)))
 
+  ;; Do this here in case the init file sets mail-host-address.
+  (or user-mail-address
+      (setq user-mail-address (concat (user-login-name) "@"
+                                     (or mail-host-address
+                                         (system-name)))))
+
   (run-hooks 'after-init-hook)
 
   ;; If *scratch* exists and init file didn't change its mode, initialize it.