Merged in changes from CVS HEAD

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-1
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-2
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-3
   Update from CVS


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-17

1 files changed, 9 insertions, 1 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 1a0774e7e57..542761fda2f 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,11 @@
+2003-12-27  Paul Eggert  <eggert@twinsun.com>
+
+        * rcs2log (rlog_options): Append -rbranchtag if CVS/Tag indicates
+        a tag, and if the user has not specified an rlog option.
+        Adapted from a suggestion by Martin Stjernholm in
+        <http://mail.gnu.org/archive/html/bug-gnu-emacs/2003-07/msg00066.html>.
+        (Copyright): Update to 2003.
+
 2003-12-24  Thien-Thi Nguyen  <ttn@gnu.org>
 
         * make-docfile.c (main): For return code, no longer special-case VMS.
@@ -5461,7 +5469,7 @@ Tue Jul  1 01:09:07 1997  Geoff Voelker  <voelker@cs.washington.edu>
 ;; coding: iso-2022-7bit
 ;; End:
 
-    Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002
+    Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003
         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.