[Emacs-diffs] Changes to emacs/lisp/startup.el

[Luc Teirlinck]

Index: emacs/lisp/startup.el
diff -c emacs/lisp/startup.el:1.336 emacs/lisp/startup.el:1.337
*** emacs/lisp/startup.el:1.336 Tue Dec 28 15:30:39 2004
--- emacs/lisp/startup.el       Mon Jan  3 23:43:34 2005
***************
*** 871,882 ****
                              (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.
--- 871,876 ----