Show
Ignore:
Timestamp:
07/29/06 07:48:34 (2 years ago)
Author:
miyoshi
Message:

Sync up with Emacs CVS HEAD.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/lisp/startup.el

    r4091 r4131  
    248248 
    249249(defcustom user-mail-address (if command-line-processed 
    250                                  (concat (user-login-name) "@" 
    251                                          (or mail-host-address 
    252                                              (system-name))) 
     250                                 (or (getenv "EMAIL") 
     251                                     (concat (user-login-name) "@" 
     252                                             (or mail-host-address 
     253                                                 (system-name)))) 
    253254                               ;; Empty string means "not set yet". 
    254255                               "") 
    255256  "*Full mailing address of this user. 
    256 This is initialized based on `mail-host-address', 
    257 after your init file is read, in case it sets `mail-host-address'." 
     257This is initialized with environment variable `EMAIL' or, as a 
     258fallback, using `mail-host-address'. This is done after your 
     259init file is read, in case it sets `mail-host-address'." 
    258260  :type 'string 
    259261  :group 'mail) 
    …… 
    978980    ;; Do this here in case the init file sets mail-host-address. 
    979981    (if (equal user-mail-address "") 
    980         (setq user-mail-address (concat (user-login-name) "@" 
    981                                         (or mail-host-address 
    982                                             (system-name))))) 
     982        (setq user-mail-address (or (getenv "EMAIL") 
     983                                    (concat (user-login-name) "@" 
     984                                            (or mail-host-address 
     985                                                (system-name)))))) 
    983986 
    984987    ;; Originally face attributes were specified via