From: Luc Teirlinck <teirllm@auburn.edu>
Date: Mon, 3 Jan 2005 23:43:34 +0000 (+0000)
Subject: (command-line): No longer load `custom-file'.
X-Git-Tag: ttn-vms-21-2-B4~2942
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a181a27fbe0ba6dab884d31d9b8db7b31967ed62;p=emacs.git

(command-line): No longer load `custom-file'.
---

diff --git a/lisp/startup.el b/lisp/startup.el
index fee3fb7bd0f..672d20d5445 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -871,12 +871,6 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'."
 			      (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.