Mercurial > emacs

comparison lisp/startup.el @ 8989:54b7aaded223

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(mail-host-address): New variable. (normal-top-level): Use mail-host-address to init user-mail-address.
author Richard M. Stallman <rms@gnu.org>
date Thu, 22 Sep 1994 04:56:49 +0000
parents 19d9177069c4
children 6ee3eeec722b
comparison
equal deleted inserted replaced
8988:851171bb62d6 8989:54b7aaded223
147 (defconst iso-8859-1-locale-regexp "8859[-_]?1" 147 (defconst iso-8859-1-locale-regexp "8859[-_]?1"
148 "Regexp that specifies when to enable the ISO 8859-1 character set. 148 "Regexp that specifies when to enable the ISO 8859-1 character set.
149 We do that if this regexp matches the locale name 149 We do that if this regexp matches the locale name
150 specified by the LC_ALL, LC_CTYPE and LANG environment variables.") 150 specified by the LC_ALL, LC_CTYPE and LANG environment variables.")
151 151
152 (defvar mail-host-address nil
153 "*Name of this machine, for purposes of naming users.")
154
152 (defvar user-mail-address nil 155 (defvar user-mail-address nil
153 "Full mailing address of this user.") 156 "*Full mailing address of this user.")
154 157
155 (defvar init-file-debug nil) 158 (defvar init-file-debug nil)
156 159
157 (defvar init-file-had-error nil) 160 (defvar init-file-had-error nil)
158 161
174 "."))) 177 ".")))
175 (setq process-environment 178 (setq process-environment
176 (delete (concat "PWD=" pwd) 179 (delete (concat "PWD=" pwd)
177 process-environment))))))) 180 process-environment)))))))
178 (setq default-directory (abbreviate-file-name default-directory)) 181 (setq default-directory (abbreviate-file-name default-directory))
179 (setq user-mail-address (concat (user-login-name) "@" (system-name))) 182 (setq user-mail-address (concat (user-login-name) "@"
183 (or mail-host-address
184 (system-name))))
180 (let ((menubar-bindings-done nil)) 185 (let ((menubar-bindings-done nil))
181 (unwind-protect 186 (unwind-protect
182 (command-line) 187 (command-line)
183 ;; Do this again, in case .emacs defined more abbreviations. 188 ;; Do this again, in case .emacs defined more abbreviations.
184 (setq default-directory (abbreviate-file-name default-directory)) 189 (setq default-directory (abbreviate-file-name default-directory))