Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 382-398)

   - Update from CVS
   - Update from erc--emacs--22
   - Fix ERC bug introduced in last patch
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 123-125)

   - Update from CVS

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

1 files changed, 15 insertions, 0 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index f61188fb8d5..3328f010846 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,18 @@
+2006-08-09  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * etags.c (readline): expect sscanf returns >= 1.
+        (readline): Change position on %n and \" in sscanf.
+
+2006-08-07  Masatake YAMATO  <jet@gyve.org>
+
+        * etags.c (readline): expect sscanf returns 2, 
+        not 1.
+        
+2006-08-07  Masatake YAMATO  <jet@gyve.org>
+
+        * etags.c (TEX_mode): Check getc retruns EOF.
+        File ended without newline causes infinite loop.
+
 2002-07-30  Adrian Aichner  <adrian@xemacs.org>  (tiny change)
 
         * etags.c: It's XEmacs, not Xemacs: change all the occurences.