# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1035672762 0
# Node ID 1c7fc6ad11786706472e91469812b9e2b879fd0c
# Parent  7ac7ca5ac550947cfe3d00d5e54626a06f28f769
*** empty log message ***

diff -r 7ac7ca5ac550 -r 1c7fc6ad1178 etc/NEWS
--- a/etc/NEWS	Sat Oct 26 22:52:36 2002 +0000
+++ b/etc/NEWS	Sat Oct 26 22:52:42 2002 +0000
@@ -59,6 +59,11 @@
 
 * Changes in Emacs 21.4
 
+** 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.
+
 ** MH-E changes.
 
 Upgraded to mh-e version 6.1.1. There have been major changes since
diff -r 7ac7ca5ac550 -r 1c7fc6ad1178 lisp/ChangeLog
--- a/lisp/ChangeLog	Sat Oct 26 22:52:36 2002 +0000
+++ b/lisp/ChangeLog	Sat Oct 26 22:52:42 2002 +0000
@@ -1,3 +1,41 @@
+2002-10-26  Richard M. Stallman  <rms@gnu.org>
+
+	* progmodes/make-mode.el (makefile-cleanup-continuations):
+	Default for variable is nil.
+	(makefile-warn-continuations): New function.
+	(makefile-mode): Put it on write-file-functions.
+
+	* international/mule-cmds.el (select-safe-coding-system):
+	Delete debugging setq.
+
+	* shell.el (shell): Look for .emacs_SHELL under ~/.emacs.d
+	after looking in ~. 
+
+	* startup.el (command-line): Look for .emacs under ~/.emacs.d
+	after looking in ~.
+
+	* simple.el (toggle-truncate-lines): When turning off truncation,
+	clear out the hscroll value in this buffer's windows.
+
+	* simple.el (display-message-or-buffer): Don't display empty
+	output in the echo area.
+
+	* man.el (Man-default-man-entry): Don't look for all word chars,
+	look only for characters that are normally part of a shell command.
+
+	* gud.el (gdb): Pass default-directory to GDB via -cd option.
+
+	* font-lock.el (c++-font-lock-keywords...): Add `restrict' keyword.
+
+	* find-file.el (ff-find-related-file): Fix autoload cookie.
+
+	* emacs-lisp/unsafep.el (unsafep-variable): Pass second arg to
+	risky-local-variable-p.
+
+	* files.el (risky-local-variable-p): VAL=nil has special meaning.
+
+	* Makefile.in (compile-always): Avoid error in old Bash versions.
+
 2002-10-27  Kim F. Storm  <storm@cua.dk>
 
 	* pcvs.el (cvs-checkout): Use read-directory-name.
@@ -19,6 +57,12 @@
 	* textmodes/outline.el (outline-minor-mode): Add customization group.
 	Patch from Matthew Swift <swift@alum.mit.edu>.
 
+2002-10-23  Richard M. Stallman  <rms@gnu.org>
+
+	* files.el (risky-local-variable-p): New arg VAL.
+	(compile-command): Use `stringp' for `safe-local-variable' prop.
+	(hack-one-local-variable): Pass VAL to `risky-local-variable-p'.
+
 2002-10-23  Francis J. Wright  <F.J.Wright@qmul.ac.uk>
 
 	* woman.el: Updated user interface generally, especially Cygwin
diff -r 7ac7ca5ac550 -r 1c7fc6ad1178 src/ChangeLog
--- a/src/ChangeLog	Sat Oct 26 22:52:36 2002 +0000
+++ b/src/ChangeLog	Sat Oct 26 22:52:42 2002 +0000
@@ -1,3 +1,7 @@
+2002-10-26  Richard M. Stallman  <rms@gnu.org>
+
+	* editfns.c (Fformat): Detect invalid format letters for floats.
+
 2002-10-25  Kenichi Handa  <handa@m17n.org>
 
 	* xfns.c (x_set_name): Encode by Qcompound_text unconditionally.