From 556f7d7737f3b0e053c2902a388b079aa5b4608b Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Sun, 8 Oct 1995 19:30:41 +0000 Subject: [PATCH] (command-line): Init user-mail-address here, after reading init file. (normal-top-level): Not here. --- lisp/startup.el | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lisp/startup.el b/lisp/startup.el index 772d619f889..987bb8b7814 100644 --- 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. -- 2.39.2