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

[Richard M. Stallman]

Index: emacs/lisp/startup.el
diff -c emacs/lisp/startup.el:1.307 emacs/lisp/startup.el:1.308
*** emacs/lisp/startup.el:1.307 Mon Sep  9 15:34:13 2002
--- emacs/lisp/startup.el       Sun Sep 29 13:53:58 2002
***************
*** 326,332 ****
    :type '(choice (const nil) string)
    :group 'mail)
  
! (defcustom user-mail-address nil
    "*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'."
--- 326,337 ----
    :type '(choice (const nil) string)
    :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'."
***************
*** 1007,1013 ****
        (set-language-environment current-language-environment)))
      
      ;; Do this here in case the init file sets mail-host-address.
!     (or user-mail-address
        (setq user-mail-address (concat (user-login-name) "@"
                                        (or mail-host-address
                                            (system-name)))))
--- 1012,1018 ----
        (set-language-environment current-language-environment)))
      
      ;; Do this here in case the init file sets mail-host-address.
!     (or (equal user-mail-address "")
        (setq user-mail-address (concat (user-login-name) "@"
                                        (or mail-host-address
                                            (system-name)))))