Merge from emacs--devo--0

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

25 files changed, 49 insertions, 35 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 36929ebc24a..8cdce18bd87 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,11 @@
+2008-01-04  Glenn Morris  <rgm@gnu.org>
+
+        * ebrowse.c (version) <emacs_copyright>: New variable.
+        Just use current year for copyright.
+
+        * etags.c (print_version):
+        * rcs2log (Copyright): Update to 2008.
+
 2007-11-28  Jason Rumney  <jasonr@gnu.org>
 
         * makefile.w32-in (VMS_SUPPORT): No longer byte-compiled.
@@ -972,7 +980,7 @@
 
 2003-09-10  Richard M. Stallman  <rms@gnu.org>
 
-        * emacsclient.c (main): Use socket_name.
+        * emacsclient.c (main): Use socket_name.
 
 2003-09-10  Andreas B,A|(Bsching  <crunchy@tzi.de>  (tiny change)
 
@@ -1540,7 +1548,7 @@
         (main): Use username field.
         (read_score): Read it.
         (push_score): Handle it.
-        (write_scores) Write it.
+        (write_scores): Write it.
         (read_score): Handle arbitrary length data.
 
 2002-03-30  Eli Zaretskii  <eliz@is.elta.co.il>
@@ -1840,9 +1848,9 @@
 
 2001-10-10  Jason Rumney  <jasonr@gnu.org>
 
-        * makefile.w32-in (ALL) Do not include fakemail.
+        * makefile.w32-in (ALL): Do not include fakemail.
 
-        * makefile.nt (install) Ditto.
+        * makefile.nt (install): Ditto.
 
 2001-10-09  Gerd Moellmann  <gerd@gnu.org>
 
@@ -2069,7 +2077,7 @@
         (consider_token): Automatic set C++ mode.
         (C_entries): New security check for yacc.
         (print_language_names, print_help): Mention the autodetect
-        feature, do not show help for the -C option, now mostly useless.
+        feature, do not show help for the -C option, now mostly useless.
         (C_entries): Tag C++ forward declarations if --declarations.
         (C_entries): Don't be fooled by things like XDEFUN.
         (consider_token): Discard asm pseudo function.
@@ -4096,7 +4104,7 @@
         * rcs2log: Add -u "login<tab>fullname<tab>mailaddr" option, which
         replaces the (now obsolescent) -n login fullname mailaddr option.
         Add -R option for recursive rlog.
-        (AWK): New environment variable (default `awk') for awk program name.
+        (AWK): New environment variable (default `awk') for awk program name.
         (output_authors, tab, loginFullnameMailaddrs, recursive): New vars.
         Quote authors and fullnames correctly.
         Don't omit path from repository root when logging CVS files.
@@ -6350,7 +6358,7 @@
 1988-06-23  Richard Stallman  (rms@sugar-bombs.ai.mit.edu)
 
         * etags.c: Handle `typedef struct foo {' (price@mcc.com).
-        (istoken) New string-comparison macro.
+        (istoken): New string-comparison macro.
         (consider_token): New arg `level'.  New state `tag_ok' in `tydef'.
 
 1988-06-14  Richard Stallman  (rms@sugar-bombs.ai.mit.edu)
@@ -6422,7 +6430,7 @@
 
     Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995,
         1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005,
-        2006, 2007 Free Software Foundation, Inc.
+        2006, 2007, 2008 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index 91074d3ccb1..f30e2e8c3ff 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -1,6 +1,6 @@
 # Makefile for lib-src subdirectory in GNU Emacs.
 # Copyright (C) 1985, 1987, 1988, 1993, 1994, 2001, 2002, 2003, 2004,
-#               2005, 2006, 2007  Free Software Foundation, Inc.
+#               2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
diff --git a/lib-src/b2m.pl b/lib-src/b2m.pl
index 96f1643891f..d0c34b69a7c 100644
--- a/lib-src/b2m.pl
+++ b/lib-src/b2m.pl
@@ -2,7 +2,7 @@
 
 # b2m.pl - Script to convert a Babyl file to an mbox file
 
-# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007
+# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008
 #   Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
diff --git a/lib-src/cvtmail.c b/lib-src/cvtmail.c
index d892d77dc5a..52ead298958 100644
--- a/lib-src/cvtmail.c
+++ b/lib-src/cvtmail.c
@@ -1,5 +1,5 @@
 /* Copyright (C) 1985, 1994, 2001, 2002, 2003, 2004,
-                 2005, 2006, 2007  Free Software Foundation, Inc.
+                 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/lib-src/digest-doc.c b/lib-src/digest-doc.c
index 08e5d813361..ec6e4372ed0 100644
--- a/lib-src/digest-doc.c
+++ b/lib-src/digest-doc.c
@@ -2,7 +2,7 @@
    standard output a file of nroff output containing the doc strings.
 
    Copyright (C) 1987, 1994, 2001, 2002, 2003, 2004,
-                 2005, 2006, 2007 Free Software Foundation, Inc.
+                 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
    This file is part of GNU Emacs.
 
diff --git a/lib-src/ebrowse.c b/lib-src/ebrowse.c
index ea230a9c3cd..2946dd3feba 100644
--- a/lib-src/ebrowse.c
+++ b/lib-src/ebrowse.c
@@ -1,7 +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 Free Software Foundation, Inc.
+                 2002, 2003, 2004, 2005, 2006, 2007, 2008
+                 Free Software Foundation, Inc.
 
    This file is part of GNU Emacs.
 
@@ -3690,8 +3691,11 @@ usage (error)
 void
 version ()
 {
+  /* Makes it easier to update automatically. */
+  char emacs_copyright[] = "Copyright (C) 2008 Free Software Foundation, Inc.";
+
   printf ("ebrowse %s\n", VERSION);
-  puts ("Copyright (C) 1992-2007 Free Software Foundation, Inc.");
+  puts (emacs_copyright);
   puts ("This program is distributed under the same terms as Emacs.");
   exit (EXIT_SUCCESS);
 }
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index acc322d638a..9de812d1c73 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -1,6 +1,6 @@
 /* Client process that communicates with GNU Emacs acting as server.
    Copyright (C) 1986, 1987, 1994, 1999, 2000, 2001, 2002, 2003, 2004,
-                 2005, 2006, 2007 Free Software Foundation, Inc.
+                 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/lib-src/etags.c b/lib-src/etags.c
index 23527171e48..40b7242e2e3 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -29,7 +29,7 @@ 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
+  2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
   Free Software Foundation, Inc.
 
 This file is not considered part of GNU Emacs.
@@ -905,7 +905,7 @@ static void
 print_version ()
 {
   /* Makes it easier to update automatically. */
-  char emacs_copyright[] = "Copyright (C) 2007 Free Software Foundation, Inc.";
+  char emacs_copyright[] = "Copyright (C) 2008 Free Software Foundation, Inc.";
 
   printf ("%s (%s %s)\n", (CTAGS) ? "ctags" : "etags", EMACS_NAME, VERSION);
   puts (emacs_copyright);
diff --git a/lib-src/fakemail.c b/lib-src/fakemail.c
index 003f2da886c..10a9cdb20ea 100644
--- a/lib-src/fakemail.c
+++ b/lib-src/fakemail.c
@@ -1,6 +1,6 @@
 /* sendmail-like interface to /bin/mail for system V,
    Copyright (C) 1985, 1994, 1999, 2001, 2002, 2003, 2004,
-                 2005, 2006, 2007  Free Software Foundation, Inc.
+                 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/lib-src/grep-changelog b/lib-src/grep-changelog
index 1dff1e3e6b7..c4de805db05 100755
--- a/lib-src/grep-changelog
+++ b/lib-src/grep-changelog
@@ -1,7 +1,7 @@
 #! /usr/bin/perl
 
 # Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-#               2005, 2006, 2007 Free Software Foundation, Inc.
+#               2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
diff --git a/lib-src/hexl.c b/lib-src/hexl.c
index 98561cf604d..95a7f82e1c4 100644
--- a/lib-src/hexl.c
+++ b/lib-src/hexl.c
@@ -1,6 +1,6 @@
 /* Convert files for Emacs Hexl mode.
    Copyright (C) 1989, 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007  Free Software Foundation, Inc.
+                 2006, 2007, 2008  Free Software Foundation, Inc.
 
 This file is not considered part of GNU Emacs.
 
diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c
index 3f3da3e7007..1564aca5bbe 100644
--- a/lib-src/make-docfile.c
+++ b/lib-src/make-docfile.c
@@ -1,6 +1,7 @@
 /* Generate doc-string file for GNU Emacs from source files.
    Copyright (C) 1985, 1986, 1992, 1993, 1994, 1997, 1999, 2000, 2001,
-                 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+                 2002, 2003, 2004, 2005, 2006, 2007, 2008
+                 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index 8b327bfabf8..057d5ab4fd5 100644
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -1,6 +1,6 @@
 #  -*- Makefile -*- for GNU Emacs on the Microsoft W32 API.
 #  Copyright (C) 2000, 2001, 2002, 2003, 2004,
-#                2005, 2006, 2007 Free Software Foundation, Inc.
+#                2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 #
 #  This file is part of GNU Emacs.
 #
diff --git a/lib-src/movemail.c b/lib-src/movemail.c
index aaaf91b1b1f..7c647676ff5 100644
--- a/lib-src/movemail.c
+++ b/lib-src/movemail.c
@@ -1,7 +1,7 @@
 /* movemail foo bar -- move file foo to file bar,
    locking file foo the way /bin/mail respects.
    Copyright (C) 1986, 1992, 1993, 1994, 1996, 1999, 2001, 2002, 2003, 2004,
-                 2005, 2006, 2007  Free Software Foundation, Inc.
+                 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/lib-src/ntlib.c b/lib-src/ntlib.c
index e11733f9605..67533894ace 100644
--- a/lib-src/ntlib.c
+++ b/lib-src/ntlib.c
@@ -1,6 +1,6 @@
 /* Utility and Unix shadow routines for GNU Emacs support programs on NT.
    Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007  Free Software Foundation, Inc.
+                 2006, 2007, 2008  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/lib-src/ntlib.h b/lib-src/ntlib.h
index 267e8ba5a04..8266b6f3a62 100644
--- a/lib-src/ntlib.h
+++ b/lib-src/ntlib.h
@@ -1,6 +1,6 @@
 /* Utility and Unix shadow routines for GNU Emacs support programs on NT.
    Copyright (C) 1994, 2002, 2003, 2004, 2005,
-                 2006, 2007 Free Software Foundation, Inc.
+                 2006, 2007, 2008 Free Software Foundation, Inc.
 
    This file is part of GNU Emacs.
 
diff --git a/lib-src/pop.c b/lib-src/pop.c
index 5e6623aaf8d..61c90abe2bf 100644
--- a/lib-src/pop.c
+++ b/lib-src/pop.c
@@ -1,6 +1,6 @@
 /* pop.c: client routines for talking to a POP3-protocol post-office server
    Copyright (C) 1991, 1993, 1996, 1997, 1999, 2001, 2002, 2003, 2004,
-                 2005, 2006, 2007  Free Software Foundation, Inc.
+                 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
    Written by Jonathan Kamens, jik@security.ov.com.
 
 This file is part of GNU Emacs.
diff --git a/lib-src/pop.h b/lib-src/pop.h
index 85b666c652f..24f9159261d 100644
--- a/lib-src/pop.h
+++ b/lib-src/pop.h
@@ -1,6 +1,6 @@
 /* pop.h: Header file for the "pop.c" client POP3 protocol.
    Copyright (C) 1991, 1993, 2001, 2002, 2003, 2004,
-                 2005, 2006, 2007  Free Software Foundation, Inc.
+                 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
    Written by Jonathan Kamens, jik@security.ov.com.
 
 This file is part of GNU Emacs.
diff --git a/lib-src/profile.c b/lib-src/profile.c
index 628b72ddcfe..ffcf9e2cff3 100644
--- a/lib-src/profile.c
+++ b/lib-src/profile.c
@@ -1,6 +1,6 @@
 /* profile.c --- generate periodic events for profiling of Emacs Lisp code.
    Copyright (C) 1992, 1994, 1999, 2001, 2002, 2003, 2004,
-                 2005, 2006, 2007  Free Software Foundation, Inc.
+                 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 
  Author: Boaz Ben-Zvi <boaz@lcs.mit.edu>
 
diff --git a/lib-src/rcs-checkin b/lib-src/rcs-checkin
index 94396709e65..958b371b24c 100755
--- a/lib-src/rcs-checkin
+++ b/lib-src/rcs-checkin
@@ -3,7 +3,7 @@
 # This script accepts any number of file arguments and checks them into RCS.
 
 # Copyright (C) 1993, 1994, 1995, 2001, 2002, 2003, 2004,
-#               2005, 2006, 2007 Free Software Foundation, Inc.
+#               2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
diff --git a/lib-src/rcs2log b/lib-src/rcs2log
index c81f51d4d60..43fa9d555c3 100755
--- a/lib-src/rcs2log
+++ b/lib-src/rcs2log
@@ -55,7 +55,7 @@ Report bugs to <bug-gnu-emacs@gnu.org>.'
 Id='$Id$'
 
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2001, 2002, 2003,
-#               2004, 2005, 2006, 2007  Free Software Foundation, Inc.
+#               2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -72,7 +72,7 @@ Id='$Id$'
 # Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 # Boston, MA 02110-1301, USA.
 
-Copyright='Copyright (C) 2007 Free Software Foundation, Inc.
+Copyright='Copyright (C) 2008 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.
diff --git a/lib-src/sorted-doc.c b/lib-src/sorted-doc.c
index e239eaab428..33959aefefe 100644
--- a/lib-src/sorted-doc.c
+++ b/lib-src/sorted-doc.c
@@ -2,7 +2,7 @@
    standard output a file of texinfo input containing the doc strings.
 
    Copyright (C) 1989, 1992, 1994, 1996, 1999, 2000, 2001, 2002, 2003,
-                 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+                 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
    This file is part of GNU Emacs.
 
diff --git a/lib-src/test-distrib.c b/lib-src/test-distrib.c
index 4913f094614..0c1a3fd8d0e 100644
--- a/lib-src/test-distrib.c
+++ b/lib-src/test-distrib.c
@@ -1,7 +1,7 @@
 /* test-distrib.c --- testing distribution of nonprinting chars
 
    Copyright (C) 1987, 1993, 1994, 1995, 1999, 2001, 2002, 2003,
-                 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+                 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
    This file is part of GNU Emacs.
 
diff --git a/lib-src/update-game-score.c b/lib-src/update-game-score.c
index 3ccfecdb7d7..188fa896bbd 100644
--- a/lib-src/update-game-score.c
+++ b/lib-src/update-game-score.c
@@ -1,5 +1,6 @@
 /* update-game-score.c --- Update a score file
-   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008
+     Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/lib-src/vcdiff b/lib-src/vcdiff
index 4fd6fb47226..86b80bcdacd 100755
--- a/lib-src/vcdiff
+++ b/lib-src/vcdiff
@@ -4,7 +4,7 @@
 # This version is more compatible with rcsdiff(1).
 #
 # Copyright (C) 1992, 1993, 1995, 1997, 2001, 2002, 2003, 2004,
-#               2005, 2006, 2007 Free Software Foundation, Inc.
+#               2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #