# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1035672093 0
# Node ID 68b29ca63a542bf21461b8cc77643d1fdafdc704
# Parent  fc643b6ab4f49b8e3eb6ab205bfd4ee9c28fd6ef
(command-line): Look for .emacs under ~/.emacs.d after looking in ~.

diff -r fc643b6ab4f4 -r 68b29ca63a54 lisp/startup.el
--- a/lisp/startup.el	Sat Oct 26 22:40:40 2002 +0000
+++ b/lisp/startup.el	Sat Oct 26 22:41:33 2002 +0000
@@ -916,11 +916,23 @@
 		      (setq user-init-file t)
 		      (load user-init-file-1 t t)
 		      
-		      ;; If we did not find the user's init file,
-		      ;; set user-init-file conclusively to nil;
-		      ;; don't let it be set from default.el.
-		      (if (eq user-init-file t)
-			  (setq user-init-file user-init-file-1))
+		      (when (eq user-init-file t)
+			;; If we did not find ~/.emacs, try
+			;; ~/.emacs.d/.emacs.
+			(let ((otherfile
+			       (expand-file-name
+				(file-name-nondirectory user-init-file-1)
+				(file-name-as-directory
+				 (expand-file-name
+				  ".emacs.d"
+				  (file-name-directory user-init-file-1))))))
+			  (load otherfile t t)
+
+			  ;; If we did not find the user's init file,
+			  ;; set user-init-file conclusively.
+			  ;; Don't let it be set from default.el.
+			  (when (eq user-init-file t)
+			    (setq user-init-file user-init-file-1))))
 		      
 		      ;; If we loaded a compiled file, set
 		      ;; `user-init-file' to the source version if that