Index: lisp/ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.9820
diff -c -0 -r1.9820 ChangeLog
*** lisp/ChangeLog	17 Jul 2006 04:07:48 -0000	1.9820
--- lisp/ChangeLog	19 Jul 2006 11:21:17 -0000
***************
*** 0 ****
--- 1,6 ----
+ 2006-07-19  Michaël Cadilhac  <address@hidden>
+ 
+ 	* startup.el (user-mail-address): Initialize with `EMAIL'
+ 	environment variable first. Document it.
+ 	(command-line): Ditto.
+ 
Index: lisp/startup.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/startup.el,v
retrieving revision 1.409
diff -c -r1.409 startup.el
*** lisp/startup.el	24 May 2006 13:22:12 -0000	1.409
--- lisp/startup.el	19 Jul 2006 11:44:05 -0000
***************
*** 247,260 ****
    :group 'mail)
  
  (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'."
    :type 'string
    :group 'mail)
  
--- 247,262 ----
    :group 'mail)
  
  (defcustom user-mail-address (if command-line-processed
! 				 (or (getenv "EMAIL")
! 				     (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 with environment variable `EMAIL' or, as a
! fallback, using `mail-host-address'. This is done after your
! init file is read, in case it sets `mail-host-address'."
    :type 'string
    :group 'mail)
  
***************
*** 977,985 ****
  
      ;; Do this here in case the init file sets mail-host-address.
      (if (equal user-mail-address "")
! 	(setq user-mail-address (concat (user-login-name) "@"
! 					(or mail-host-address
! 					    (system-name)))))
  
      ;; Originally face attributes were specified via
      ;; `font-lock-face-attributes'.  Users then changed the default
--- 979,988 ----
  
      ;; Do this here in case the init file sets mail-host-address.
      (if (equal user-mail-address "")
! 	(setq user-mail-address (or (getenv "EMAIL")
! 				    (concat (user-login-name) "@"
! 					    (or mail-host-address
! 						(system-name))))))
  
      ;; Originally face attributes were specified via
      ;; `font-lock-face-attributes'.  Users then changed the default