X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fcus-file.el;h=dcd116506453d9ac72547a8bac58edba767856e0;hb=2df059c60e547b9e6c827eea2682bd1511983dc0;hp=c01635e779758be1fa5b920fcb4ce39a5bbe2f8e;hpb=712b16d5aa8e3de94aad5345065de5385cc54a30;p=chise%2Fxemacs-chise.git.1

diff --git a/lisp/cus-file.el b/lisp/cus-file.el
index c01635e..dcd1165 100644
--- a/lisp/cus-file.el
+++ b/lisp/cus-file.el
@@ -47,10 +47,10 @@ explicitly load that file for the settings to take effect.")
 (defun make-custom-file-name (init-file &optional force-new)
   "Construct the default custom file name from the init file name.
 If FORCE-NEW is non-nil, force post-migration location."
-  (let* ((init-file (or init-file user-init-file))
-	 (init-file-directory (file-name-directory init-file)))
+  (let ((init-file (or init-file user-init-file)))
     (if (or force-new
-	    (string= init-file-directory
+	    (not init-file)
+	    (string= (file-name-directory init-file)
 		     (expand-file-name
 		      (file-name-as-directory user-init-directory))))
 	(expand-file-name custom-file-base user-init-directory)