From: Chong Yidong <cyd@stupidchicken.com>
Date: Sun, 30 Oct 2005 14:02:50 +0000 (+0000)
Subject: .emacs.d/.emacs changed to .emacs.d/init.el
X-Git-Tag: emacs-pretest-22.0.90~6187
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e982b86f685d5f43661e55f4899a9fbcae84cee1;p=emacs.git

.emacs.d/.emacs changed to .emacs.d/init.el
---

diff --git a/etc/NEWS b/etc/NEWS
index e41e8183900..2d2623f25a1 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -192,8 +192,9 @@ displays a buffer menu.  This option turns the buffer menu off.
 
 +++
 ** Init file changes
-You can now put the init files .emacs and .emacs_SHELL under
-~/.emacs.d or directly under ~.  Emacs will find them in either place.
+If the init file ~/.emacs does not exist, Emacs will try
+~/.emacs.d/init.el or ~/.emacs.d/init.elc.  You can also put the shell
+init file .emacs_SHELL under ~/.emacs.d.
 
 +++
 ** Emacs now reads the standard abbrevs file ~/.abbrev_defs