Mercurial > hg > xemacs-beta

diff lisp/prim/startup.el @ 114:8619ce7e4c50 r20-1b9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r20-1b9
author cvs
date Mon, 13 Aug 2007 09:21:54 +0200
parents fe104dbd9147
children 9f59509498e1
line wrap: on
line diff
--- a/lisp/prim/startup.el	Mon Aug 13 09:20:50 2007 +0200
+++ b/lisp/prim/startup.el	Mon Aug 13 09:21:54 2007 +0200
@@ -606,10 +606,12 @@
   (setq init-file-loaded t)
 
   ;; 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)))))
+  ;; Don't do this here unless noninteractive, it is frequently wrong. -sb
+  ;; (or user-mail-address
+  (when noninteractive
+    (setq user-mail-address (concat (user-login-name) "@"
+				    (or mail-host-address
+					(system-name)))))
 
   (run-hooks 'after-init-hook)
   nil)