From: Chong Yidong <cyd@stupidchicken.com>
Date: Sun, 30 Oct 2005 03:57:39 +0000 (+0000)
Subject: * startup.el (command-line): Use ~/.emacs.d/init.el instead of
X-Git-Tag: emacs-pretest-22.0.90~6196
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c3ab3701f0b22efa0f2ff47fbc5909940ce0f9ea;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d0a3104d95e..c60cacd1e92 100644
--- 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 a9535eed881..000055f745d 100644
--- 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,