Merge changes from emacs-23 branch

4 files changed, 15 insertions, 16 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 160a19099a3..c9031421cea 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,9 @@
+2011-01-02  Glenn Morris  <rgm@gnu.org>
+
+        * ebrowse.c (version) <emacs_copyright>:
+        * etags.c (print_version) <emacs_copyright>:
+        * rcs2log (Copyright): Set short copyright year to 2011.
+
 2010-11-27  Joe Matarazzo  <joe.matarazzo@gmail.com>  (tiny change)
 
         * ebrowse.c (yylex): If end of input buffer encountered while
diff --git a/lib-src/ebrowse.c b/lib-src/ebrowse.c
index 81067a90819..72709503070 100644
--- a/lib-src/ebrowse.c
+++ b/lib-src/ebrowse.c
@@ -1,8 +1,8 @@
 /* ebrowse.c --- parsing files for the ebrowse C++ browser
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-              2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-              Free Software Foundation, Inc.
+  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -3577,7 +3577,7 @@ void
 version (void)
 {
   /* Makes it easier to update automatically. */
-  char emacs_copyright[] = "Copyright (C) 2010 Free Software Foundation, Inc.";
+  char emacs_copyright[] = "Copyright (C) 2011 Free Software Foundation, Inc.";
 
   printf ("ebrowse %s\n", VERSION);
   puts (emacs_copyright);
@@ -3877,7 +3877,4 @@ main (int argc, char **argv)
   return EXIT_SUCCESS;
 }
 
-/* arch-tag: fc03b4bc-91a9-4c3d-b3b9-12a77fa86dd8
-   (do not change this comment) */
-
 /* ebrowse.c ends here */
diff --git a/lib-src/etags.c b/lib-src/etags.c
index abc8b06dd8e..f06e714c041 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -29,8 +29,8 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
 Copyright (C) 1984, 1987, 1988, 1989, 1993, 1994, 1995, 1998, 1999,
-  2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-  Free Software Foundation, Inc.
+  2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+  2011  Free Software Foundation, Inc.
 
 This file is not considered part of GNU Emacs.
 
@@ -891,7 +891,7 @@ static void
 print_version (void)
 {
   /* Makes it easier to update automatically. */
-  char emacs_copyright[] = "Copyright (C) 2010 Free Software Foundation, Inc.";
+  char emacs_copyright[] = "Copyright (C) 2011 Free Software Foundation, Inc.";
 
   printf ("%s (%s %s)\n", (CTAGS) ? "ctags" : "etags", EMACS_NAME, VERSION);
   puts (emacs_copyright);
@@ -6725,7 +6725,4 @@ xrealloc (char *ptr, unsigned int size)
  * End:
  */
 
-/* arch-tag: 8a9b748d-390c-4922-99db-2eeefa921051
-   (do not change this comment) */
-
 /* etags.c ends here */
diff --git a/lib-src/rcs2log b/lib-src/rcs2log
index 2a2eab83fcb..5808068f646 100755
--- a/lib-src/rcs2log
+++ b/lib-src/rcs2log
@@ -3,8 +3,8 @@
 # RCS to ChangeLog generator
 
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2001, 2002, 2003,
-#               2004, 2005, 2006, 2007, 2008, 2009, 2010
-#               Free Software Foundation, Inc.
+#   2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+#   Free Software Foundation, Inc.
 
 # Author: Paul Eggert <eggert@twinsun.com>
 
@@ -22,7 +22,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-Copyright='Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright='Copyright (C) 2011 Free Software Foundation, Inc.
 This program comes with NO WARRANTY, to the extent permitted by law.
 You may redistribute copies of this program
 under the terms of the GNU General Public License.
@@ -777,4 +777,3 @@ exec rm -fr $logdir
 # tab-width:4
 # End:
 
-# arch-tag: cea067bd-a552-4254-ba17-078208933073