# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1033322038 0
# Node ID 8c15fbf63f9513bfdc9b062688b840871a896fe3
# Parent  054a4d4af618b22b127f4ccfb78c36346b66e1b7
(user-mail-address): Initialize to a useful value
once Emacs is started up; initialize to "" at loadup time.
(command-line): "", not nil, means user-mail-address not set yet.

diff -r 054a4d4af618 -r 8c15fbf63f95 lisp/startup.el
--- a/lisp/startup.el	Sun Sep 29 17:52:36 2002 +0000
+++ b/lisp/startup.el	Sun Sep 29 17:53:58 2002 +0000
@@ -326,7 +326,12 @@
   :type '(choice (const nil) string)
   :group 'mail)
 
-(defcustom user-mail-address nil
+(defcustom user-mail-address (if command-line-processed
+				 (concat (user-login-name) "@"
+					 (or mail-host-address
+					     (system-name)))
+			       ;; Empty string means "not set yet".
+			       "")
   "*Full mailing address of this user.
 This is initialized based on `mail-host-address',
 after your init file is read, in case it sets `mail-host-address'."
@@ -1007,7 +1012,7 @@
 	(set-language-environment current-language-environment)))
     
     ;; Do this here in case the init file sets mail-host-address.
-    (or user-mail-address
+    (or (equal user-mail-address "")
 	(setq user-mail-address (concat (user-login-name) "@"
 					(or mail-host-address
 					    (system-name)))))