Mercurial > emacs

changeset 59334:5068fdb7f223

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(command-line): No longer load `custom-file'.
author Luc Teirlinck <teirllm@auburn.edu>
date Mon, 03 Jan 2005 23:43:34 +0000
parents f23a47fb1568
children 45239c528a49
files lisp/startup.el
diffstat 1 files changed, 0 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- 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.