# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1130644659 0
# Node ID 751320d2d8b677f2a7ad09db574eaa61c51d9569
# Parent  142b6109f5b75727cabb9670dd45f75035f3c326
	* startup.el (command-line): Use ~/.emacs.d/init.el instead of
	~/.emacs.d/.emacs.

diff -r 142b6109f5b7 -r 751320d2d8b6 lisp/ChangeLog
--- a/lisp/ChangeLog	Sun Oct 30 03:56:16 2005 +0000
+++ b/lisp/ChangeLog	Sun Oct 30 03:57:39 2005 +0000
@@ -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 -r 142b6109f5b7 -r 751320d2d8b6 lisp/startup.el
--- a/lisp/startup.el	Sun Oct 30 03:56:16 2005 +0000
+++ b/lisp/startup.el	Sun Oct 30 03:57:39 2005 +0000
@@ -850,14 +850,12 @@
 
 		      (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,