X-Git-Url: http://git.chise.org/gitweb/?p=chise%2Fxemacs-chise.git.1;a=blobdiff_plain;f=lisp%2Fstartup.el;h=66524d2c4655a68f5e35e2aaf6f550e8d15d51a8;hp=d885baa69a72c2536b66b7eda2d7a4fd24857a1c;hb=02f4d2761a98c5cb9d5b423d2361160a5d8c9ee4;hpb=041e98cf4c48018877365e3bfb37cfc09b54cc6d

diff --git a/lisp/startup.el b/lisp/startup.el
index d885baa..66524d2 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -794,11 +794,11 @@ directory which will load the relocated initialization code.")
   (if (not user-init-file)
       (setq user-init-file
 	    (find-user-init-file user-init-directory)))
+  (if (not custom-file)
+      (setq custom-file (make-custom-file-name user-init-file)))
   (if (and user-init-file
 	   (file-readable-p user-init-file))
       (load user-init-file t t t))
-  (if (not custom-file)
-      (setq custom-file (make-custom-file-name user-init-file)))
   (if (and custom-file
 	   (or (not user-init-file)
 	       (not (string= custom-file user-init-file)))