[Emacs-diffs] Changes to emacs/lisp/startup.el,v

[Eli Zaretskii]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Eli Zaretskii <eliz>    06/07/22 10:37:12

Index: startup.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/startup.el,v
retrieving revision 1.409
retrieving revision 1.410
diff -u -b -r1.409 -r1.410
--- startup.el  24 May 2006 13:22:12 -0000      1.409
+++ startup.el  22 Jul 2006 10:37:12 -0000      1.410
@@ -247,14 +247,16 @@
   :group 'mail)
 
 (defcustom user-mail-address (if command-line-processed
+                                (or (getenv "EMAIL")
                                 (concat (user-login-name) "@"
                                         (or mail-host-address
-                                            (system-name)))
+                                                (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'."
+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,9 +979,10 @@
 
     ;; 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) "@"
+       (setq user-mail-address (or (getenv "EMAIL")
+                                   (concat (user-login-name) "@"
                                        (or mail-host-address
-                                           (system-name)))))
+                                               (system-name))))))
 
     ;; Originally face attributes were specified via
     ;; `font-lock-face-attributes'.  Users then changed the default