76 files changed, 138 insertions, 91 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.
 #
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 1174519af9a..a7ef180b18e 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -1,5 +1,5 @@
 # Maintenance productions for the Lisp directory
-# Copyright (C) 2000, 2001, 2003, 2004, 2005 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/lisp/makefile.w32-in b/lisp/makefile.w32-in
index 8c6007af558..6d3cacecc6a 100644
--- a/lisp/makefile.w32-in
+++ b/lisp/makefile.w32-in
@@ -1,5 +1,6 @@
 #  -*- Makefile -*- for GNU Emacs on the Microsoft W32 API.
-#  Copyright (c) 2000, 2001, 2004, 2005 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/lwlib/lwlib-Xlw.c b/lwlib/lwlib-Xlw.c
index e5d9ebbd0f3..40091e7b69b 100644
--- a/lwlib/lwlib-Xlw.c
+++ b/lwlib/lwlib-Xlw.c
@@ -1,6 +1,7 @@
 /* The lwlib interface to "xlwmenu" menus.
    Copyright (C) 1992 Lucid, Inc.
-   Copyright (C) 1994, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1994, 2000, 2001, 2002, 2003, 2004,
+                 2005 Free Software Foundation, Inc.
 
 This file is part of the Lucid Widget Library.
 
diff --git a/lwlib/lwlib-Xm.c b/lwlib/lwlib-Xm.c
index 27118d8ab92..32abbca7601 100644
--- a/lwlib/lwlib-Xm.c
+++ b/lwlib/lwlib-Xm.c
@@ -1,6 +1,6 @@
 /* The lwlib interface to Motif widgets.
-   Copyright (C) 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2003, 2004, 2005
-             Free Software Foundation, Inc.
+   Copyright (C) 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2002, 2003,
+                 2004, 2005 Free Software Foundation, Inc.
    Copyright (C) 1992 Lucid, Inc.
 
 This file is part of the Lucid Widget Library.
diff --git a/lwlib/lwlib-Xm.h b/lwlib/lwlib-Xm.h
index c5a1fbe9155..d6069fad2d8 100644
--- a/lwlib/lwlib-Xm.h
+++ b/lwlib/lwlib-Xm.h
@@ -1,5 +1,6 @@
 /* The lwlib interface to Motif widgets.
-   Copyright (C) 1994, 2000  Free Software Foundation, Inc.
+   Copyright (C) 1994, 2000, 2002, 2003, 2004,
+                 2005 Free Software Foundation, Inc.
    Copyright (C) 1992 Lucid, Inc.
 
 This file is part of the Lucid Widget Library.
diff --git a/lwlib/xlwmenu.c b/lwlib/xlwmenu.c
index 09d11c8b683..f1ee1b68e9b 100644
--- a/lwlib/xlwmenu.c
+++ b/lwlib/xlwmenu.c
@@ -1,6 +1,6 @@
 /* Implements a lightweight menubar widget.
    Copyright (C) 1992 Lucid, Inc.
-   Copyright (C) 2002, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 This file is part of the Lucid Widget Library.
 
diff --git a/lwlib/xlwmenu.h b/lwlib/xlwmenu.h
index e896617a69e..93703358ccb 100644
--- a/lwlib/xlwmenu.h
+++ b/lwlib/xlwmenu.h
@@ -1,5 +1,5 @@
 /* Interface of a lightweight menubar widget.
-   Copyright (C) 2000, 2002, 2004  Free Software Foundation, Inc.
+   Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 This file is part of the Lucid Widget Library.
 
diff --git a/lwlib/xlwmenuP.h b/lwlib/xlwmenuP.h
index a25307b6ff3..ca2b7dc6a1a 100644
--- a/lwlib/xlwmenuP.h
+++ b/lwlib/xlwmenuP.h
@@ -1,5 +1,6 @@
 /* Internals of a lightweight menubar widget.
-   Copyright (C) 1999, 2000, 2002, 2004, 2005  Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2002, 2003, 2004, 
+                 2005 Free Software Foundation, Inc.
 
 This file is part of the Lucid Widget Library.
 
diff --git a/src/s/aix3-1.h b/src/s/aix3-1.h
index 8fe7bd8fa24..eedfe3d15be 100644
--- a/src/s/aix3-1.h
+++ b/src/s/aix3-1.h
@@ -1,5 +1,6 @@
 /* Definitions file for GNU Emacs running on IBM AIX version 3.1
-   Copyright (C) 1985, 1986, 1990, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1990, 1999, 2002, 2003, 2004,
+                 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/bsd4-1.h b/src/s/bsd4-1.h
index 7316841e212..f36bc016ca8 100644
--- a/src/s/bsd4-1.h
+++ b/src/s/bsd4-1.h
@@ -1,5 +1,6 @@
 /* Definitions file for GNU Emacs running on bsd 4.1.
-   Copyright (C) 1985, 1986, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1999, 2002, 2003, 2004,
+                 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/bsd4-2.h b/src/s/bsd4-2.h
index 386ab1bbbe5..f4e60b0fdbd 100644
--- a/src/s/bsd4-2.h
+++ b/src/s/bsd4-2.h
@@ -1,5 +1,6 @@
 /* Definitions file for GNU Emacs running on bsd 4.2
-   Copyright (C) 1985, 1986, 1994 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1994, 2002, 2003, 2004,
+                 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/bsd4-3.h b/src/s/bsd4-3.h
index bbb2715bdf7..37d6a63e984 100644
--- a/src/s/bsd4-3.h
+++ b/src/s/bsd4-3.h
@@ -1,5 +1,6 @@
 /* Definitions file for GNU Emacs running on bsd 4.3
-   Copyright (C) 1985, 1986 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 2002, 2003, 2004,
+                 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/cxux.h b/src/s/cxux.h
index 2af6d006095..118d93d579c 100644
--- a/src/s/cxux.h
+++ b/src/s/cxux.h
@@ -1,5 +1,5 @@
 /* Header file for Harris CXUX.
-   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/src/s/cygwin.h b/src/s/cygwin.h
index ac977b8cb52..921cff35bc7 100644
--- a/src/s/cygwin.h
+++ b/src/s/cygwin.h
@@ -1,7 +1,8 @@
 /* Template for system description header files.
    This file describes the parameters that system description files
    should define or not.
-   Copyright (C) 1985, 1986, 1992, 1999, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1992, 1999, 2002, 2003, 2004,
+                 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/darwin.h b/src/s/darwin.h
index fea5b4c282d..fad445d7557 100644
--- a/src/s/darwin.h
+++ b/src/s/darwin.h
@@ -1,5 +1,5 @@
 /* System description header file for Darwin (Mac OS X).
-   Copyright (C) 2001, 02, 2004  Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/dgux.h b/src/s/dgux.h
index fb01b539f27..82956a900d9 100644
--- a/src/s/dgux.h
+++ b/src/s/dgux.h
@@ -1,6 +1,7 @@
 /* Definitions file for GNU Emacs running on Data General's DG/UX
    version 4.32 upto and including 5.4.1.
-   Copyright (C) 1994, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1994, 1999, 2002, 2003, 2004,
+                 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/dgux4.h b/src/s/dgux4.h
index d866d63e6ce..35834ad4da2 100644
--- a/src/s/dgux4.h
+++ b/src/s/dgux4.h
@@ -1,6 +1,6 @@
 /* Definitions file for GNU Emacs running on Data General's DG/UX
    Release 4.10 and above.
-   Copyright (C) 1996 Free Software Foundation, Inc.
+   Copyright (C) 1996, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/dgux5-4-3.h b/src/s/dgux5-4-3.h
index a95420595a1..7ec88a435eb 100644
--- a/src/s/dgux5-4-3.h
+++ b/src/s/dgux5-4-3.h
@@ -1,6 +1,6 @@
 /* Definitions file for GNU Emacs running on Data General's DG/UX
    version 5.4 Release 3.00 and above.
-   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/src/s/dgux5-4r2.h b/src/s/dgux5-4r2.h
index c2c7461a204..3f059c32c24 100644
--- a/src/s/dgux5-4r2.h
+++ b/src/s/dgux5-4r2.h
@@ -1,6 +1,6 @@
 /* Definitions file for GNU Emacs running on Data General's DG/UX
    5.4 Release 2.xx systems.
-   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/src/s/freebsd.h b/src/s/freebsd.h
index dc26eb9f399..83949fd2819 100644
--- a/src/s/freebsd.h
+++ b/src/s/freebsd.h
@@ -1,8 +1,8 @@
 /* System description header for FreeBSD systems.
    This file describes the parameters that system description files
    should define or not.
-   Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-   Free Software Foundation, Inc.
+   Copyright (C) 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/src/s/gnu-linux.h b/src/s/gnu-linux.h
index 2563496af5c..f87dcaded1b 100644
--- a/src/s/gnu-linux.h
+++ b/src/s/gnu-linux.h
@@ -1,5 +1,6 @@
 /* This file is the configuration file for Linux-based GNU systems
-   Copyright (C) 1985, 86, 92, 94, 96, 1999, 2002, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1992, 1994, 1996, 1999, 2002, 2003, 2004,
+                 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/gnu.h b/src/s/gnu.h
index 79e5a88a7b9..0da816c32d3 100644
--- a/src/s/gnu.h
+++ b/src/s/gnu.h
@@ -1,5 +1,6 @@
 /* Definitions file for GNU Emacs running on the GNU Hurd.
-   Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc.
+   Copyright (C) 1994, 1995, 1996, 2002, 2003, 2004,
+                 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/hpux.h b/src/s/hpux.h
index 665b1f3063d..30ade71bf20 100644
--- a/src/s/hpux.h
+++ b/src/s/hpux.h
@@ -1,6 +1,7 @@
 /* Definitions file for GNU Emacs running on HPUX release 7.0.
    Based on AT&T System V.2.
-   Copyright (C) 1985, 1986, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1999, 2002, 2003, 2004,
+                 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/iris3-5.h b/src/s/iris3-5.h
index 8815bb56f39..a3b6c8ad0ad 100644
--- a/src/s/iris3-5.h
+++ b/src/s/iris3-5.h
@@ -1,5 +1,6 @@
 /* Definitions file for GNU Emacs running on Silicon Graphics 3.5
-   Copyright (C) 1987, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1987, 1999, 2002, 2003, 2004,
+                 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/iris3-6.h b/src/s/iris3-6.h
index 64187428c29..1d8b96cc23f 100644
--- a/src/s/iris3-6.h
+++ b/src/s/iris3-6.h
@@ -1,5 +1,6 @@
 /* Definitions file for GNU Emacs running on Silicon Graphics system 3.6.
-   Copyright (C) 1987, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1987, 1999, 2002, 2003, 2004,
+                 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/irix3-3.h b/src/s/irix3-3.h
index 60dd6d49c79..a613779913a 100644
--- a/src/s/irix3-3.h
+++ b/src/s/irix3-3.h
@@ -1,5 +1,6 @@
 /* Definitions file for GNU Emacs running on Silicon Graphics Irix system 3.3.
-   Copyright (C) 1987, 1990, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1987, 1990, 1999, 2002, 2003, 2004,
+                 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/lynxos.h b/src/s/lynxos.h
index 55de8cba6f9..614735d290d 100644
--- a/src/s/lynxos.h
+++ b/src/s/lynxos.h
@@ -1,5 +1,6 @@
 /* Definitions file for GNU Emacs running on LynxOS-3.0.1
-   Copyright (C) 2000, 2001 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/src/s/ms-w32.h b/src/s/ms-w32.h
index c4697db34db..b1989318fba 100644
--- a/src/s/ms-w32.h
+++ b/src/s/ms-w32.h
@@ -1,5 +1,6 @@
 /* System description file for Windows NT.
-   Copyright (C) 1993, 1994, 1995 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1994, 1995, 2002, 2003, 2004,
+                 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/msdos.h b/src/s/msdos.h
index 5a0cbba5959..9469b33227f 100644
--- a/src/s/msdos.h
+++ b/src/s/msdos.h
@@ -1,6 +1,7 @@
 /* System description file for MS-DOS
 
-   Copyright (C) 1993, 1996, 1997, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1996, 1997, 2001, 2002, 2003, 2004,
+                 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/newsos5.h b/src/s/newsos5.h
index c674bfc559d..d2bed2189be 100644
--- a/src/s/newsos5.h
+++ b/src/s/newsos5.h
@@ -1,5 +1,6 @@
 /* Definitions file for GNU Emacs running on Sony's NEWS-OS 5.0.2
-   Copyright (C) 1992, 1994 Free Software Foundation, Inc.
+   Copyright (C) 1992, 1994, 2002, 2003, 2004,
+                 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/nextstep.h b/src/s/nextstep.h
index 9253e6acffc..0c0b01c10bd 100644
--- a/src/s/nextstep.h
+++ b/src/s/nextstep.h
@@ -1,5 +1,6 @@
 /* Configuration file for the NeXTstep system.
-   Copyright (C) 1990, 1995 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1995, 2002, 2003, 2004,
+                 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/ptx.h b/src/s/ptx.h
index e490ba659a2..1411dee70d8 100644
--- a/src/s/ptx.h
+++ b/src/s/ptx.h
@@ -1,5 +1,6 @@
 /* Definitions file for GNU Emacs running on Sequent DYNIX/ptx 1.x/2.x
-   Copyright (C) 1987, 1990, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1987, 1990, 1999, 2002, 2003, 2004,
+                 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/riscix1-1.h b/src/s/riscix1-1.h
index ccfa5704b85..aee5d6ddc58 100644
--- a/src/s/riscix1-1.h
+++ b/src/s/riscix1-1.h
@@ -1,5 +1,5 @@
 /* Definitions file for GNU Emacs running on RISCiX 1.1 (bsd 4.3)
-   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/src/s/riscix12.h b/src/s/riscix12.h
index b0e00e780cc..625b667d7b5 100644
--- a/src/s/riscix12.h
+++ b/src/s/riscix12.h
@@ -1,5 +1,5 @@
 /* Definitions file for GNU Emacs running on RISCiX 1.2 (bsd 4.3)
-   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/src/s/rtu.h b/src/s/rtu.h
index 92afbaf6328..b2d0c16e59a 100644
--- a/src/s/rtu.h
+++ b/src/s/rtu.h
@@ -1,5 +1,6 @@
 /* Definitions file for GNU Emacs running on RTU 3.0, ucb universe.
-   Copyright (C) 1986, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1986, 1999, 2002, 2003, 2004,
+                 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/sco4.h b/src/s/sco4.h
index 757eb0b57b0..627007e9a52 100644
--- a/src/s/sco4.h
+++ b/src/s/sco4.h
@@ -1,5 +1,6 @@
 /* System description file for SCO 3.2v4.
-   Copyright (C) 1993, 1994 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1994, 2002, 2003, 2004,
+                 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/sco5.h b/src/s/sco5.h
index e490a91b608..9fbbf072a12 100644
--- a/src/s/sco5.h
+++ b/src/s/sco5.h
@@ -1,5 +1,5 @@
 /* System description file for SCO 3.2v5.
-   Copyright (C) 1996, 2002  Free Software Foundation, Inc.
+   Copyright (C) 1996, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/template.h b/src/s/template.h
index 5ef1049164d..0610e16473a 100644
--- a/src/s/template.h
+++ b/src/s/template.h
@@ -1,7 +1,8 @@
 /* Template for system description header files.
    This file describes the parameters that system description files
    should define or not.
-   Copyright (C) 1985, 1986, 1992, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1992, 1999, 2002, 2003, 2004,
+                 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/umax.h b/src/s/umax.h
index 1741b1d04e3..f4923f33053 100644
--- a/src/s/umax.h
+++ b/src/s/umax.h
@@ -1,5 +1,6 @@
 /* Definitions file for GNU Emacs running on UMAX 4.2
-   Copyright (C) 1985, 1986 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 2002, 2003, 2004,
+                 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/unipl5-2.h b/src/s/unipl5-2.h
index 05d162239a8..cca703adb82 100644
--- a/src/s/unipl5-2.h
+++ b/src/s/unipl5-2.h
@@ -1,5 +1,6 @@
 /* Definitions file for GNU Emacs running on UniSoft's UniPlus 5.2
-   Copyright (C) 1985, 1986, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1999, 2002, 2003, 2004,
+                 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/usg5-0.h b/src/s/usg5-0.h
index 21b469dcd55..5f9943f8477 100644
--- a/src/s/usg5-0.h
+++ b/src/s/usg5-0.h
@@ -1,5 +1,6 @@
 /* Definitions file for GNU Emacs running on AT&T's System V.0
-   Copyright (C) 1985, 1986, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1999, 2002, 2003, 2004,
+                 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/usg5-2-2.h b/src/s/usg5-2-2.h
index dff90efb225..b090f3c32b6 100644
--- a/src/s/usg5-2-2.h
+++ b/src/s/usg5-2-2.h
@@ -1,5 +1,6 @@
 /* Definitions file for GNU Emacs running on AT&T's System V Release 2.2
-   Copyright (C) 1985, 1986, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1999, 2002, 2003, 2004,
+                 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/usg5-2.h b/src/s/usg5-2.h
index 0da477276fd..e63bddfc060 100644
--- a/src/s/usg5-2.h
+++ b/src/s/usg5-2.h
@@ -1,5 +1,6 @@
 /* Definitions file for GNU Emacs running on AT&T's System V Release 2.0
-   Copyright (C) 1985, 1986, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1999, 2002, 2003, 2004,
+                 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/usg5-3.h b/src/s/usg5-3.h
index 285bae670df..12259936928 100644
--- a/src/s/usg5-3.h
+++ b/src/s/usg5-3.h
@@ -1,5 +1,6 @@
 /* Definitions file for GNU Emacs running on AT&T's System V Release 3
-   Copyright (C) 1987, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1987, 1999, 2002, 2003, 2004,
+                 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/usg5-4.h b/src/s/usg5-4.h
index 4edda95b39c..b8c2f8d9fa2 100644
--- a/src/s/usg5-4.h
+++ b/src/s/usg5-4.h
@@ -1,5 +1,6 @@
 /* Definitions file for GNU Emacs running on AT&T's System V Release 4
-   Copyright (C) 1987, 1990, 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1987, 1990, 1999, 2000, 2002, 2003, 2004,
+                 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/vms.h b/src/s/vms.h
index 9afd69b8539..e3c9dc725c0 100644
--- a/src/s/vms.h
+++ b/src/s/vms.h
@@ -1,5 +1,5 @@
 /* system description header for VMS
-   Copyright (C) 1986 Free Software Foundation, Inc.
+   Copyright (C) 1986, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/xenix.h b/src/s/xenix.h
index 763a10956ff..e67b897faff 100644
--- a/src/s/xenix.h
+++ b/src/s/xenix.h
@@ -1,5 +1,6 @@
 /* Definitions file for GNU Emacs running SCO Xenix 386 Release 2.2
-   Copyright (C) 1988, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1988, 1999, 2002, 2003, 2004,
+                 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.