Mercurial > emacs
changeset 13153:c9694633f7ca
(command-line): Init user-mail-address here, after reading init file.
(normal-top-level): Not here.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Sun, 08 Oct 1995 19:30:41 +0000 |
| parents | a7e0445bd152 |
| children | f86e18ff3736 |
| files | lisp/startup.el |
| diffstat | 1 files changed, 6 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/startup.el Sun Oct 08 19:29:57 1995 +0000 +++ b/lisp/startup.el Sun Oct 08 19:30:41 1995 +0000 @@ -275,9 +275,6 @@ (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 @@ (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.