Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 460-475)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 145-152)

   - Merge from emacs--devo--0
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-118

2 files changed, 6 insertions, 2 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 45fb6d6513e..e78d3fefa48 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,7 @@
+2006-10-09  Eli Zaretskii  <eliz@gnu.org>
+
+        * makefile.w32-in (../src/config.h): Fix error message.
+
 2006-09-30  Eli Zaretskii  <eliz@gnu.org>
 
         * .cvsignore: Add blessmail.
@@ -19,7 +23,7 @@
         
 2006-08-07  Masatake YAMATO  <jet@gyve.org>
 
-        * etags.c (TEX_mode): Check getc retruns EOF.
+        * etags.c (TEX_mode): Check getc returns EOF.
         File ended without newline causes infinite loop.
 
 2002-07-30  Adrian Aichner  <adrian@xemacs.org>  (tiny change)
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index 564487a5858..5ac6555f46d 100644
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -308,7 +308,7 @@ cleanall:	clean
 # Headers we would preprocess if we could.
 #
 ../src/config.h:        ../nt/$(CONFIG_H)
-                        echo config.h has changed. Re-run configure.bat.
+                        echo $(CONFIG_H) has changed.  Re-run configure.bat.
                         exit -1
 
 getopt.h:               getopt_.h