diff options
| author | Richard M. Stallman <rms@gnu.org> | 1995-10-08 19:30:41 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 1995-10-08 19:30:41 +0000 |
| commit | 556f7d7737f3b0e053c2902a388b079aa5b4608b (patch) | |
| tree | bf526a11302cf87f6b35927a315f2a26d78ab4c2 /lisp | |
| parent | 5a31e1d01c89b9c4d0487f341415e88341182c32 (diff) | |
| download | emacs-556f7d7737f3b0e053c2902a388b079aa5b4608b.tar.gz | |
(command-line): Init user-mail-address here, after reading init file.
(normal-top-level): Not here.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/startup.el | 9 |
1 files 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. |