Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 586-614)

   - Update from CVS
   - Update from erc--emacs--22
   - Merge from gnus--rel--5.10
   - Merge from erc--main--0
   - Make byte compiler correctly write circular constants

 * gnus--rel--5.10  (patch 186-196)

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

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

1 files changed, 9 insertions, 1 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 76a0dcf1b9e..0a1cdf1bb85 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,11 @@
+2007-01-02  Francesco Potort,Al(B  <pot@gnu.org>
+
+        * etags.c: (longopts): New undocumented option --no-duplicates.
+        (no_duplicates): Static variables for the above option.
+        (print_help): Do not print help for --no-warn, now undocumented.
+        (add_node): Allow duplicate tags in ctags mode unless --no-duplicates.
+        (main): Pass the -u option to sort in ctags mode.
+
 2006-12-28  Francesco Potort,Al(B  <pot@gnu.org>
 
         * etags.c (readline): When creating a relative file name from a
@@ -6190,7 +6198,7 @@
 
     Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995,
         1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005,
-        2006 Free Software Foundation, Inc.
+        2006, 2007 Free Software Foundation, Inc.
   Copying and distribution of this file, with or without modification,
   are permitted provided the copyright notice and this notice are preserved.