X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=etc%2FNEWS;h=39d5e6d47d219e906ee2b340de37ee4861915682;hb=a18427281c3f6c1131478a7b1bad03da49e009a0;hp=0f586dd48f841437d1de8350b9150fdf947d0ce8;hpb=f52a96980ed9280f8f906a20d4b899dc0b027644;p=chise%2Fxemacs-chise.git

diff --git a/etc/NEWS b/etc/NEWS
index 0f586dd..39d5e6d 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -205,23 +205,43 @@ environment's mail spool locking conventions.  When you're using a
 binary kit, set the `mail-lock-method' variable at startup, or the
 EMACSLOCKMETHOD environment variable.
 
-** New command-line switches -user-init-file and -user-init-directory.
-These can be used to specify alternate locations for what is normally
-~/.emacs and ~/.xemacs.
+** Init file will move to ~/.xemacs/init.el.
 
-Moreover, -user <user> (which used to only work in unpredictable ways)
-is now equivalent to
--user-init-file ~<user>/.emacs -user-init-directory ~<user>/.xemacs.
+If `~/.xemacs/init.el' exists, XEmacs will prefer it over `~/.emacs'
+as an init file.  The file may be byte-compiled as
+`~/.xemacs/init.elc'.
+
+Future versions of XEmacs will stop supporting `~/.emacs' as an init
+file.  XEmacs offers automatic migration upon startup.
+
+** Custom file will move to ~/.xemacs/custom.el.
+
+Whereas customize settings were formerly stored in the regular init
+file, XEmacs now prefers them to be in a separate file
+`~/.xemacs/custom.el', completely under automatic control.  This
+change goes with the migration of the init file, and XEmacs offers
+automatic migration upon startup.
 
 ** Init file may be called .emacs.el.
 
-Like in GNU Emacs 20.4 and on, you can now name the XEmacs init file
-`.emacs.el'.  Formerly the name had to be `.emacs'.  If you use the
-name `.emacs.el', you can byte-compile the file in the usual way.
+For the time being, like in GNU Emacs 20.4 and on, you can now name
+the XEmacs init file `.emacs.el'.  Formerly the name had to be
+`.emacs'.  If you use the name `.emacs.el', you can byte-compile the
+file in the usual way.
 
 If both `.emacs' and `.emacs.el' exist, the latter file is the one
 that is used.
 
+** New command-line switches -user-init-file and -user-init-directory.
+These can be used to specify alternate locations for what is normally
+~/.emacs and ~/.xemacs.
+
+Moreover, -user <user> (which used to only work in unpredictable ways)
+is now equivalent to -user-init-file ~<user>/.xemacs/init.el
+-user-init-directory ~<user>/.xemacs.  or -user-init-file
+~<user>/.emacs -user-init-directory ~<user>/.xemacs, whichever init
+file comes first.
+
 ** New variable `mswindows-meta-activates-menu'.
 If you set this variable to nil then pressing and releasing the Alt
 key under MS-Windows will no longer activate the menubar.  The default