* startup.el (command-line): Use ~/.emacs.d/init.el instead of

	~/.emacs.d/.emacs.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d0a3104d95e7c419fbcbefa1346a9665cb92a690..c60cacd1e92c4d06b75df68f585f628cbb5ff758 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-29  Chong Yidong  <cyd@stupidchicken.com>
+
+       * startup.el (command-line): Use ~/.emacs.d/init.el instead of
+       ~/.emacs.d/.emacs.
+
 2005-10-29  Richard M. Stallman  <rms@gnu.org>
 
        * replace.el (occur-mode-mouse-goto): Always go to other window.

diff --git a/lisp/startup.el b/lisp/startup.el
index a9535eed881fd030f2af94ef58f33c5273ed3224..000055f745d636827241760d94fd590116a6c692 100644 (file)
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -850,14 +850,12 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'."
 
                      (when (eq user-init-file t)
                        ;; If we did not find ~/.emacs, try
-                       ;; ~/.emacs.d/.emacs.
+                       ;; ~/.emacs.d/init.el.
                        (let ((otherfile
                               (expand-file-name
-                               (file-name-nondirectory user-init-file-1)
+                               "init"
                                (file-name-as-directory
-                                (expand-file-name
-                                 ".emacs.d"
-                                 (file-name-directory user-init-file-1))))))
+                                (concat "~" init-file-user "/.emacs.d")))))
                          (load otherfile t t)
 
                          ;; If we did not find the user's init file,