Commit c13fbb62 authored by Richard M. Stallman's avatar Richard M. Stallman
Browse files

(mail-host-address): New variable.

(normal-top-level): Use mail-host-address to init user-mail-address.
parent 7bbba4f2
...@@ -149,8 +149,11 @@ this variable, if non-nil; 2. `~/.emacs'; 3. `default.el'.") ...@@ -149,8 +149,11 @@ this variable, if non-nil; 2. `~/.emacs'; 3. `default.el'.")
We do that if this regexp matches the locale name We do that if this regexp matches the locale name
specified by the LC_ALL, LC_CTYPE and LANG environment variables.") specified by the LC_ALL, LC_CTYPE and LANG environment variables.")
(defvar mail-host-address nil
"*Name of this machine, for purposes of naming users.")
(defvar user-mail-address nil (defvar user-mail-address nil
"Full mailing address of this user.") "*Full mailing address of this user.")
(defvar init-file-debug nil) (defvar init-file-debug nil)
...@@ -176,7 +179,9 @@ specified by the LC_ALL, LC_CTYPE and LANG environment variables.") ...@@ -176,7 +179,9 @@ specified by the LC_ALL, LC_CTYPE and LANG environment variables.")
(delete (concat "PWD=" pwd) (delete (concat "PWD=" pwd)
process-environment))))))) process-environment)))))))
(setq default-directory (abbreviate-file-name default-directory)) (setq default-directory (abbreviate-file-name default-directory))
(setq user-mail-address (concat (user-login-name) "@" (system-name))) (setq user-mail-address (concat (user-login-name) "@"
(or mail-host-address
(system-name))))
(let ((menubar-bindings-done nil)) (let ((menubar-bindings-done nil))
(unwind-protect (unwind-protect
(command-line) (command-line)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment