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

Import from CVS: tag r20-1b9
author cvs
date Mon, 13 Aug 2007 09:21:54 +0200
parents fe104dbd9147
children 9f59509498e1
comparison
equal deleted inserted replaced
113:2ec2fe4a4c89 114:8619ce7e4c50
604 (setq debug-on-error debug-on-error-from-init-file))) 604 (setq debug-on-error debug-on-error-from-init-file)))
605 605
606 (setq init-file-loaded t) 606 (setq init-file-loaded t)
607 607
608 ;; Do this here in case the init file sets mail-host-address. 608 ;; Do this here in case the init file sets mail-host-address.
609 (or user-mail-address 609 ;; Don't do this here unless noninteractive, it is frequently wrong. -sb
610 (setq user-mail-address (concat (user-login-name) "@" 610 ;; (or user-mail-address
611 (or mail-host-address 611 (when noninteractive
612 (system-name))))) 612 (setq user-mail-address (concat (user-login-name) "@"
613 (or mail-host-address
614 (system-name)))))
613 615
614 (run-hooks 'after-init-hook) 616 (run-hooks 'after-init-hook)
615 nil) 617 nil)
616 618
617 (defun load-options-file (filename) 619 (defun load-options-file (filename)