]> git.eshelyaron.com Git - emacs.git/commitdiff
(command-line): No longer load `custom-file'.
authorLuc Teirlinck <teirllm@auburn.edu>
Mon, 3 Jan 2005 23:43:34 +0000 (23:43 +0000)
committerLuc Teirlinck <teirllm@auburn.edu>
Mon, 3 Jan 2005 23:43:34 +0000 (23:43 +0000)
lisp/startup.el

index fee3fb7bd0f2987f27421dad17f078555b08142c..672d20d54452cda346cb812dd15cd2741d0677d4 100644 (file)
@@ -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.