# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1029361581 0
# Node ID 13ce201c962080b9eab218001742efca84a71834
# Parent  ba6de43c41d76121eae4e5a83525c2e8a592ed2c
(command-line): Load custom-file if not done yet.

diff -r ba6de43c41d7 -r 13ce201c9620 lisp/startup.el
--- a/lisp/startup.el	Wed Aug 14 20:25:10 2002 +0000
+++ b/lisp/startup.el	Wed Aug 14 21:46:21 2002 +0000
@@ -932,6 +932,12 @@
 			      (sit-for 1))
 			    (setq user-init-file source))))
 		      
+		      (when (and (stringp custom-file)
+				 (not (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))
+		      
 		      (or inhibit-default-init
 			  (let ((inhibit-startup-message nil))
 			    ;; Users are supposed to be told their rights.
@@ -1018,8 +1024,7 @@
 
   ;; If *scratch* exists and init file didn't change its mode, initialize it.
   (if (get-buffer "*scratch*")
-      (save-excursion
-	(set-buffer "*scratch*")
+      (with-current-buffer "*scratch*"
 	(if (eq major-mode 'fundamental-mode)
 	    (funcall initial-major-mode))))