Update years in copyright notice; nfc.

29 files changed, 56 insertions, 42 deletions

diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index 6fa89e728c6..274bbabe29f 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, 2002, 2003, 2004, 2005
-#  Free Software Foundation, Inc.
+# Copyright (C) 1985, 1987, 1988, 1993, 1994, 2002, 2003, 2004,
+#               2005 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
diff --git a/lib-src/cvtmail.c b/lib-src/cvtmail.c
index 4dd6bb20a68..562c5522ed9 100644
--- a/lib-src/cvtmail.c
+++ b/lib-src/cvtmail.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 1985, 1994 Free Software Foundation
+/* Copyright (C) 1985, 1994, 2002, 2003, 2004,
+                 2005 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 9db4a190803..d3df334841e 100644
--- a/lib-src/digest-doc.c
+++ b/lib-src/digest-doc.c
@@ -1,7 +1,8 @@
 /* Give this program DOC-mm.nn.oo as standard input and it outputs to
    standard output a file of nroff output containing the doc strings.
 
-   Copyright (C) 1987, 1994, 2001  Free Software Foundation Inc.
+   Copyright (C) 1987, 1994, 2001, 2002, 2003, 2004,
+                 2005 Free Software Foundation, Inc.
 
    This file is part of GNU Emacs.
 
diff --git a/lib-src/ebrowse.c b/lib-src/ebrowse.c
index bc323fbbbd8..49e353cf536 100644
--- a/lib-src/ebrowse.c
+++ b/lib-src/ebrowse.c
@@ -1,7 +1,7 @@
 /* ebrowse.c --- parsing files for the ebrowse C++ browser
 
-   Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 99,
-                 2000, 2001, 2002   Free Software Foundation Inc.
+   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+                 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
    This file is part of GNU Emacs.
 
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 75fa9ebe8e7..034d5c9faa9 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, 2003, 2004
-   Free Software Foundation, Inc.
+   Copyright (C) 1986, 1987, 1994, 1999, 2000, 2001, 2002, 2003, 2004,
+                 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/lib-src/emacstool.c b/lib-src/emacstool.c
index f0e9ad8c1f6..b883b442bd9 100644
--- a/lib-src/emacstool.c
+++ b/lib-src/emacstool.c
@@ -1,5 +1,6 @@
 /*
-   Copyright (C) 1986, 1988, 1990, 1991 Free Software Foundation, Inc.
+   Copyright (C) 1986, 1988, 1990, 1991, 2002, 2003, 2004,
+                 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/lib-src/etags.c b/lib-src/etags.c
index 2f273771a96..fe4fa84f4c5 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -1,6 +1,7 @@
 /* Tags file maker to go with GNU Emacs           -*- coding: latin-1 -*-
-   Copyright (C) 1984, 1987-1989, 1993-1995, 1998-2001, 2002, 2004
-   Free Software Foundation, Inc. and Ken Arnold
+   Copyright (C) 1984, 1987, 1988, 1989, 1993, 1994, 1995,
+                 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+                 2005 Free Software Foundation, Inc. and Ken Arnold
 
  This file is not considered part of GNU Emacs.
 
diff --git a/lib-src/fakemail.c b/lib-src/fakemail.c
index cf6c1ff334d..de1e2cbf858 100644
--- a/lib-src/fakemail.c
+++ b/lib-src/fakemail.c
@@ -1,5 +1,6 @@
 /* sendmail-like interface to /bin/mail for system V,
-   Copyright (C) 1985, 1994, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1994, 1999, 2002, 2003, 2004,
+                 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/lib-src/getopt.c b/lib-src/getopt.c
index 8cbe6e1a1da..70fd4186261 100644
--- a/lib-src/getopt.c
+++ b/lib-src/getopt.c
@@ -2,8 +2,9 @@
    NOTE: getopt is now part of the C library, so if you don't know what
    "Keep this file name-space clean" means, talk to drepper@gnu.org
    before changing it!
-   Copyright (C) 1987,88,89,90,91,92,93,94,95,96,98,99,2000,2001,2002,2003,2004
-        Free Software Foundation, Inc.
+   Copyright (C) 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
+                 1995, 1996, 1998, 1999, 2000, 2001, 2002, 2003,
+                 2004, 2005 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/lib-src/getopt1.c b/lib-src/getopt1.c
index 40c1d1695d3..8aa9b183578 100644
--- a/lib-src/getopt1.c
+++ b/lib-src/getopt1.c
@@ -1,6 +1,6 @@
 /* getopt_long and getopt_long_only entry points for GNU getopt.
-   Copyright (C) 1987,88,89,90,91,92,93,94,96,97,98,2004
-     Free Software Foundation, Inc.
+   Copyright (C) 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1996, 1997,
+                 1998, 2004, 2005 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/lib-src/getopt_.h b/lib-src/getopt_.h
index 2c2c1d458ef..fbd45d42aab 100644
--- a/lib-src/getopt_.h
+++ b/lib-src/getopt_.h
@@ -1,6 +1,6 @@
 /* Declarations for getopt.
-   Copyright (C) 1989-1994,1996-1999,2001,2003,2004
-   Free Software Foundation, Inc.
+   Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 1996, 1997, 1998, 1999,
+                 2001, 2003, 2004, 2005 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/lib-src/getopt_int.h b/lib-src/getopt_int.h
index 6d47d2f0b8c..f59ab32ce28 100644
--- a/lib-src/getopt_int.h
+++ b/lib-src/getopt_int.h
@@ -1,6 +1,6 @@
 /* Internal declarations for getopt.
-   Copyright (C) 1989-1994,1996-1999,2001,2003,2004
-   Free Software Foundation, Inc.
+   Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 1996, 1997, 1998, 1999,
+                 2001, 2003, 2004, 2005 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/lib-src/gettext.h b/lib-src/gettext.h
index ba484b3d1d9..658fa17fcb8 100644
--- a/lib-src/gettext.h
+++ b/lib-src/gettext.h
@@ -1,5 +1,6 @@
 /* Convenience header for conditional use of GNU <libintl.h>.
-   Copyright (C) 1995-1998, 2000-2002, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 1997, 1998, 2000, 2001, 2002, 2004,
+                 2005 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
diff --git a/lib-src/grep-changelog b/lib-src/grep-changelog
index 04468535e02..45bf841ae59 100755
--- a/lib-src/grep-changelog
+++ b/lib-src/grep-changelog
@@ -1,6 +1,7 @@
 #! /usr/bin/perl
 
-# Copyright (C) 1999, 2000, 2001, 2004 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
+#               2005 Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
diff --git a/lib-src/hexl.c b/lib-src/hexl.c
index 05e0658e566..0dfdddf468f 100644
--- a/lib-src/hexl.c
+++ b/lib-src/hexl.c
@@ -1,5 +1,5 @@
 /* Convert files for Emacs Hexl mode.
-   Copyright (C) 1989 Free Software Foundation, Inc
+   Copyright (C) 1989, 2002, 2003, 2004, 2005 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 6c0816ed98a..537eafec7f5 100644
--- a/lib-src/make-docfile.c
+++ b/lib-src/make-docfile.c
@@ -1,6 +1,6 @@
 /* Generate doc-string file for GNU Emacs from source files.
-   Copyright (C) 1985, 86, 92, 93, 94, 97, 1999, 2000, 01, 2004
-   Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1992, 1993, 1994, 1997, 1999, 2000, 2001,
+                 2002, 2003, 2004, 2005 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 48ce5a2f80f..bfda0f25d5f 100644
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -1,5 +1,6 @@
 #  -*- Makefile -*- for GNU Emacs on the Microsoft W32 API.
-#  Copyright (c) 2000-2001, 2004 Free Software Foundation, Inc.
+#  Copyright (C) 2000, 2001, 2002, 2003, 2004,
+#                2005 Free Software Foundation, Inc.
 #
 #  This file is part of GNU Emacs.
 #
diff --git a/lib-src/movemail.c b/lib-src/movemail.c
index f82bebd4f2b..e8f1122e943 100644
--- a/lib-src/movemail.c
+++ b/lib-src/movemail.c
@@ -1,6 +1,7 @@
 /* movemail foo bar -- move file foo to file bar,
    locking file foo the way /bin/mail respects.
-   Copyright (C) 1986, 92, 93, 94, 96, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1986, 1992, 1993, 1994, 1996, 1999, 2002, 2003, 2004,
+                 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/lib-src/ntlib.c b/lib-src/ntlib.c
index c346ccd908b..caaf521206b 100644
--- a/lib-src/ntlib.c
+++ b/lib-src/ntlib.c
@@ -1,5 +1,5 @@
 /* Utility and Unix shadow routines for GNU Emacs support programs on NT.
-   Copyright (C) 1994 Free Software Foundation, Inc.
+   Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/lib-src/ntlib.h b/lib-src/ntlib.h
index b1cb97dabda..07e730567f7 100644
--- a/lib-src/ntlib.h
+++ b/lib-src/ntlib.h
@@ -1,5 +1,5 @@
 /* Utility and Unix shadow routines for GNU Emacs support programs on NT.
-   Copyright (C) 1994 Free Software Foundation, Inc.
+   Copyright (C) 1994, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
    This file is part of GNU Emacs.
 
diff --git a/lib-src/pop.c b/lib-src/pop.c
index 30a4233d417..9bc73e90a54 100644
--- a/lib-src/pop.c
+++ b/lib-src/pop.c
@@ -1,5 +1,6 @@
 /* pop.c: client routines for talking to a POP3-protocol post-office server
-   Copyright (c) 1991, 1993, 1996, 1997, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1991, 1993, 1996, 1997, 1999, 2002, 2003, 2004,
+                 2005 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 5267ec97eb4..eed24a89934 100644
--- a/lib-src/pop.h
+++ b/lib-src/pop.h
@@ -1,5 +1,6 @@
 /* pop.h: Header file for the "pop.c" client POP3 protocol.
-   Copyright (c) 1991,1993 Free Software Foundation, Inc.
+   Copyright (C) 1991, 1993, 2002, 2003, 2004,
+                 2005 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 7bc7186c259..615a43d912c 100644
--- a/lib-src/profile.c
+++ b/lib-src/profile.c
@@ -1,5 +1,6 @@
 /* profile.c --- generate periodic events for profiling of Emacs Lisp code.
- Copyright (C) 1992, 1994, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1992, 1994, 1999, 2002, 2003, 2004,
+                 2005 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 2a7de0f2f11..beee6ce29f7 100755
--- a/lib-src/rcs-checkin
+++ b/lib-src/rcs-checkin
@@ -2,7 +2,8 @@
 
 # This script accepts any number of file arguments and checks them into RCS.
 
-# Copyright (C) 1993, 1994, 1995, 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 1993, 1994, 1995, 2001, 2002, 2003, 2004,
+#               2005 Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
diff --git a/lib-src/rcs2log b/lib-src/rcs2log
index 05864c2ad26..4e7c6c1bb1b 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 Free Software Foundation, Inc.
+#               2004, 2005 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) 2004 Free Software Foundation, Inc.
+Copyright='Copyright (C) 2005 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 120a510f006..cb04be26842 100644
--- a/lib-src/sorted-doc.c
+++ b/lib-src/sorted-doc.c
@@ -1,8 +1,8 @@
 /* Give this program DOC-mm.nn.oo as standard input and it outputs to
    standard output a file of texinfo input containing the doc strings.
 
-   Copyright (C) 1989, 1992, 1994, 1996, 1999, 2000, 2001
-      Free Software Foundation Inc.
+   Copyright (C) 1989, 1992, 1994, 1996, 1999, 2000, 2001, 2002, 2003,
+                 2004, 2005 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 0bbc6806d71..0d3587af8da 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
-      Free Software Foundation Inc.
+   Copyright (C) 1987, 1993, 1994, 1995, 1999, 2001, 2002, 2003,
+                 2004, 2005 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 d9d20b8525d..46d0d8b0600 100644
--- a/lib-src/update-game-score.c
+++ b/lib-src/update-game-score.c
@@ -1,5 +1,5 @@
 /* update-game-score.c --- Update a score file
-   Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/lib-src/vcdiff b/lib-src/vcdiff
index 8e1722d43ba..a57811a7f6d 100755
--- a/lib-src/vcdiff
+++ b/lib-src/vcdiff
@@ -3,8 +3,8 @@
 # Enhanced sccs diff utility for use with vc mode.
 # This version is more compatible with rcsdiff(1).
 #
-# Copyright (C) 1992, 1993, 1995, 1997, 2001, 2004
-#   Free Software Foundation, Inc.
+# Copyright (C) 1992, 1993, 1995, 1997, 2001, 2002, 2003, 2004,
+#               2005 Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #