# HG changeset patch
# User Luc Teirlinck <teirllm@auburn.edu>
# Date 1104795814 0
# Node ID 5068fdb7f2233148be749533d82b4a69861ec59b
# Parent  f23a47fb156807878e9573a47c2d962dd9d1978f
(command-line): No longer load `custom-file'.

diff -r f23a47fb1568 -r 5068fdb7f223 lisp/startup.el
--- a/lisp/startup.el	Mon Jan 03 22:53:30 2005 +0000
+++ b/lisp/startup.el	Mon Jan 03 23:43:34 2005 +0000
@@ -871,12 +871,6 @@
 			      (sit-for 1))
 			    (setq user-init-file source))))
 
-		      (when (stringp custom-file)
-                        (unless (assoc custom-file load-history)
-                          ;; If the .emacs file has set `custom-file' but hasn't
-                          ;; loaded the file yet, let's load it.
-                          (load custom-file t t)))
-
 		      (unless inhibit-default-init
                         (let ((inhibit-startup-message nil))
                           ;; Users are supposed to be told their rights.