Update copyright for years from Emacs 21 to present (mainly adding

2001).

202 files changed, 406 insertions, 389 deletions

diff --git a/src/ChangeLog.1 b/src/ChangeLog.1
index 94f1039f71e..4aaa3202dd6 100644
--- a/src/ChangeLog.1
+++ b/src/ChangeLog.1
@@ -3522,7 +3522,8 @@
         * minibuf.c: Don't allow entry to minibuffer
         while minibuffer is selected.
 
-    Copyright (C) 1985, 1986 Free Software Foundation, Inc.
+    Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+        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.
 
diff --git a/src/ChangeLog.2 b/src/ChangeLog.2
index 430cbc0f9da..75dd37940d0 100644
--- a/src/ChangeLog.2
+++ b/src/ChangeLog.2
@@ -4771,7 +4771,8 @@
 
 See ChangeLog.1 for earlier changes.
 
-    Copyright (C) 1986, 1987, 1988 Free Software Foundation, Inc.
+    Copyright (C) 1986, 1987, 1988, 2001, 2002, 2003, 2004, 2005, 2006,
+        2007  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.
 
diff --git a/src/ChangeLog.3 b/src/ChangeLog.3
index 73f87793541..bde54ff99f9 100644
--- a/src/ChangeLog.3
+++ b/src/ChangeLog.3
@@ -16531,7 +16531,8 @@
 
 See ChangeLog.2 for earlier changes.
 
-    Copyright (C) 1993 Free Software Foundation, Inc.
+    Copyright (C) 1993, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+        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.
 
diff --git a/src/ChangeLog.4 b/src/ChangeLog.4
index b3d40b96b6c..04310b34cad 100644
--- a/src/ChangeLog.4
+++ b/src/ChangeLog.4
@@ -6903,7 +6903,8 @@
 
 See ChangeLog.3 for earlier changes.
 
-    Copyright (C) 1993, 1994 Free Software Foundation, Inc.
+    Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+        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.
 
diff --git a/src/ChangeLog.5 b/src/ChangeLog.5
index 5e50066bc78..893a6497996 100644
--- a/src/ChangeLog.5
+++ b/src/ChangeLog.5
@@ -7144,7 +7144,8 @@
 
 See ChangeLog.4 for earlier changes.
 
-    Copyright (C) 1994, 1995 Free Software Foundation, Inc.
+    Copyright (C) 1994, 1995, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+        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.
 
diff --git a/src/ChangeLog.6 b/src/ChangeLog.6
index 2da83619eb4..fb29238601a 100644
--- a/src/ChangeLog.6
+++ b/src/ChangeLog.6
@@ -5362,7 +5362,8 @@
 
 See ChangeLog.5 for earlier changes.
 
-    Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+    Copyright (C) 1995, 1996, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+        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.
 
diff --git a/src/ChangeLog.7 b/src/ChangeLog.7
index f1a29903715..c38cb1fc9ca 100644
--- a/src/ChangeLog.7
+++ b/src/ChangeLog.7
@@ -11098,7 +11098,8 @@ Fri Sep 20 02:37:37 1996  Marcus Daniels  <marcus@sayre.sysc.pdx.edu>
 
 See ChangeLog.6 for earlier changes.
 
-    Copyright (C) 1997, 1998 Free Software Foundation, Inc.
+    Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+        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.
 
diff --git a/src/ChangeLog.8 b/src/ChangeLog.8
index a9465058194..ff6b3b25461 100644
--- a/src/ChangeLog.8
+++ b/src/ChangeLog.8
@@ -13991,7 +13991,8 @@ Wed Jun 25 15:22:58 1997  Gerd Moellmann  <gerd@acm.org>
 
 See ChangeLog.7 for earlier changes.
 
-    Copyright (C) 1999 Free Software Foundation, Inc.
+    Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+        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.
 
diff --git a/src/ChangeLog.9 b/src/ChangeLog.9
index 9ce75696f5a..2a644e13585 100644
--- a/src/ChangeLog.9
+++ b/src/ChangeLog.9
@@ -13294,7 +13294,8 @@ See ChangeLog.8 for earlier changes.
 ;; coding: iso-2022-7bit
 ;; End:
 
-    Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+    Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+        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.
 
diff --git a/src/atimer.c b/src/atimer.c
index 8b092270d7b..41dd9e53a02 100644
--- a/src/atimer.c
+++ b/src/atimer.c
@@ -1,6 +1,6 @@
 /* Asynchronous timers.
-   Copyright (C) 2000, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/atimer.h b/src/atimer.h
index 84b1383ffdf..8c3b388d012 100644
--- a/src/atimer.h
+++ b/src/atimer.h
@@ -1,6 +1,6 @@
 /* Asynchronous timers.
-   Copyright (C) 2000, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/blockinput.h b/src/blockinput.h
index 78dce69fe1f..fcaa64723bc 100644
--- a/src/blockinput.h
+++ b/src/blockinput.h
@@ -1,6 +1,6 @@
 /* blockinput.h - interface to blocking complicated interrupt-driven input.
-   Copyright (C) 1989, 1993, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1989, 1993, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/callint.c b/src/callint.c
index 68cfdfc7aa6..39b2046e8fc 100644
--- a/src/callint.c
+++ b/src/callint.c
@@ -1,6 +1,6 @@
 /* Call a Lisp function interactively.
-   Copyright (C) 1985, 1986, 1993, 1994, 1995, 1997, 2000, 2002, 2003,
-                 2004, 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1993, 1994, 1995, 1997, 2000, 2001, 2002,
+                 2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/casetab.c b/src/casetab.c
index 8c46ab11c60..42c268dd7c6 100644
--- a/src/casetab.c
+++ b/src/casetab.c
@@ -1,6 +1,6 @@
 /* GNU Emacs routines to deal with case tables.
-   Copyright (C) 1993, 1994, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/category.c b/src/category.c
index ce238f4d399..809e326cbe9 100644
--- a/src/category.c
+++ b/src/category.c
@@ -1,7 +1,8 @@
 /* GNU Emacs routines to deal with category tables.
-   Copyright (C) 1998, 2001, 2004, 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+     Free Software Foundation, Inc.
    Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-     2005, 2006
+     2005, 2006, 2007
      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H14PRO021
 
diff --git a/src/cm.c b/src/cm.c
index dd25c112630..da984f0b82d 100644
--- a/src/cm.c
+++ b/src/cm.c
@@ -1,6 +1,6 @@
 /* Cursor motion subroutines for GNU Emacs.
-   Copyright (C) 1985, 1995, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1995, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
     based primarily on public domain code written by Chris Torek
 
 This file is part of GNU Emacs.
diff --git a/src/cm.h b/src/cm.h
index c94c0d43597..d77ba582f74 100644
--- a/src/cm.h
+++ b/src/cm.h
@@ -1,6 +1,6 @@
 /* Cursor motion calculation definitions for GNU Emacs
-   Copyright (C) 1985, 1989, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1989, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/coding.h b/src/coding.h
index ca7af1c8354..a5923cbf6ea 100644
--- a/src/coding.h
+++ b/src/coding.h
@@ -1,6 +1,6 @@
 /* Header for coding system handler.
-   Copyright (C) 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
    Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
      2005, 2006
      National Institute of Advanced Industrial Science and Technology (AIST)
diff --git a/src/commands.h b/src/commands.h
index 5c7cad37407..2d0db0ec13c 100644
--- a/src/commands.h
+++ b/src/commands.h
@@ -1,6 +1,6 @@
 /* Definitions needed by most editing commands.
-   Copyright (C) 1985, 1994, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1994, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/disptab.h b/src/disptab.h
index 80936fb1830..e20f3e27631 100644
--- a/src/disptab.h
+++ b/src/disptab.h
@@ -1,6 +1,6 @@
 /* Things for GLYPHS and glyph tables.
-   Copyright (C) 1993, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1993, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/doprnt.c b/src/doprnt.c
index 63c0261e6ae..326fb5743e2 100644
--- a/src/doprnt.c
+++ b/src/doprnt.c
@@ -1,8 +1,8 @@
 /* Output like sprintf to a buffer of specified size.
    Also takes args differently: pass one pointer to an array of strings
    in addition to the format string which is separate.
-   Copyright (C) 1985, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/dosfns.h b/src/dosfns.h
index 4f1cfd83d22..622e7cb5335 100644
--- a/src/dosfns.h
+++ b/src/dosfns.h
@@ -2,8 +2,8 @@
    Coded by Manabu Higashida, 1991.
    Modified by Morten Welinder, 1993-1994.
 
-   Copyright (C) 1991, 1994, 1995, 1997, 1999, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1991, 1994, 1995, 1997, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/ecrt0.c b/src/ecrt0.c
index a9b993d360e..fe3fd82f5a2 100644
--- a/src/ecrt0.c
+++ b/src/ecrt0.c
@@ -1,5 +1,5 @@
 /* C code startup routine.
-   Copyright (C) 1985, 1986, 1992, 2002, 2003, 2004,
+   Copyright (C) 1985, 1986, 1992, 2001, 2002, 2003, 2004,
                  2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
diff --git a/src/filemode.c b/src/filemode.c
index 835a8a3778e..b15f65c1647 100644
--- a/src/filemode.c
+++ b/src/filemode.c
@@ -1,6 +1,6 @@
 /* filemode.c -- make a string describing file modes
-   Copyright (C) 1985, 1990, 1993, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1990, 1993, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  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/src/firstfile.c b/src/firstfile.c
index 06e7022d89a..8093f03efc3 100644
--- a/src/firstfile.c
+++ b/src/firstfile.c
@@ -1,6 +1,6 @@
 /* Mark beginning of data space to dump as pure, for GNU Emacs.
-   Copyright (C) 1997, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/floatfns.c b/src/floatfns.c
index dd879de7eb8..e0ed9b625cd 100644
--- a/src/floatfns.c
+++ b/src/floatfns.c
@@ -1,6 +1,6 @@
 /* Primitive operations on floating point for GNU Emacs Lisp interpreter.
-   Copyright (C) 1988, 1993, 1994, 1999, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1988, 1993, 1994, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/fontset.c b/src/fontset.c
index 838d9526944..a7b586ce3db 100644
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -1,5 +1,6 @@
 /* Fontset handler.
-   Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+     Free Software Foundation, Inc.
    Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
      2005, 2006
      National Institute of Advanced Industrial Science and Technology (AIST)
diff --git a/src/fontset.h b/src/fontset.h
index a08f7b74bd0..b580455879b 100644
--- a/src/fontset.h
+++ b/src/fontset.h
@@ -1,6 +1,6 @@
 /* Header for fontset handler.
-   Copyright (C) 1998, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
    Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
      2005, 2006
      National Institute of Advanced Industrial Science and Technology (AIST)
diff --git a/src/fringe.c b/src/fringe.c
index 033832f7bb6..a3a28ba987e 100644
--- a/src/fringe.c
+++ b/src/fringe.c
@@ -1,7 +1,7 @@
 /* Fringe handling (split from xdisp.c).
    Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1997,
-                 1998, 1999, 2000, 2000, 2001, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+                 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/getloadavg.c b/src/getloadavg.c
index 3f616b47116..f40149a8c47 100644
--- a/src/getloadavg.c
+++ b/src/getloadavg.c
@@ -1,6 +1,7 @@
 /* Get the system load averages.
    Copyright (C) 1985, 1986, 1987, 1988, 1989, 1991, 1992, 1993, 1994, 1995,
-                 1997, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+                 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+                 Free Software Foundation, Inc.
 
    NOTE: The canonical source of this file is maintained with gnulib.
    Bugs can be reported to bug-gnulib@gnu.org.
diff --git a/src/indent.h b/src/indent.h
index ddfd16a16de..b9c39869e60 100644
--- a/src/indent.h
+++ b/src/indent.h
@@ -1,6 +1,6 @@
 /* Definitions for interface to indent.c
-   Copyright (C) 1985, 1986, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/intervals.c b/src/intervals.c
index 20c4c191a93..861cb24c598 100644
--- a/src/intervals.c
+++ b/src/intervals.c
@@ -1,6 +1,6 @@
 /* Code for doing intervals.
-   Copyright (C) 1993, 1994, 1995, 1997, 1998, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1994, 1995, 1997, 1998, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/intervals.h b/src/intervals.h
index 89b26446190..7e07a6b4f31 100644
--- a/src/intervals.h
+++ b/src/intervals.h
@@ -1,6 +1,6 @@
 /* Definitions and global variables for intervals.
-   Copyright (C) 1993, 1994, 2000, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1994, 2000, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/keyboard.h b/src/keyboard.h
index 984ecccc0a4..6fe76363064 100644
--- a/src/keyboard.h
+++ b/src/keyboard.h
@@ -1,6 +1,6 @@
 /* Declarations useful when processing input.
-   Copyright (C) 1985, 1986, 1987, 1993, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1987, 1993, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/lastfile.c b/src/lastfile.c
index 7c5e067dd02..7a7888f4683 100644
--- a/src/lastfile.c
+++ b/src/lastfile.c
@@ -1,6 +1,6 @@
 /* Mark end of data space to dump as pure, for GNU Emacs.
-   Copyright (C) 1985, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/7300.h b/src/m/7300.h
index a8751efa52a..1022e077046 100644
--- a/src/m/7300.h
+++ b/src/m/7300.h
@@ -1,6 +1,6 @@
 /* machine description file for AT&T UNIX PC model 7300
-   Copyright (C) 1986, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1986, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
    Modified for this machine by mtxinu!rtech!gonzo!daveb
 
 This file is part of GNU Emacs.
diff --git a/src/m/acorn.h b/src/m/acorn.h
index 326fb7760ae..dee60071e12 100644
--- a/src/m/acorn.h
+++ b/src/m/acorn.h
@@ -1,6 +1,6 @@
 /* Machine description file for Acorn RISCiX machines.
-   Copyright (C) 1994, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/alliant-2800.h b/src/m/alliant-2800.h
index d56624a1eac..e81fe48b9e7 100644
--- a/src/m/alliant-2800.h
+++ b/src/m/alliant-2800.h
@@ -1,6 +1,6 @@
 /* alliant-2800.h - Alliant FX/2800 machine running Concentrix 2800.
-   Copyright (C) 1990, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1990, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/alliant.h b/src/m/alliant.h
index 49459c0b7f7..5ddab96012f 100644
--- a/src/m/alliant.h
+++ b/src/m/alliant.h
@@ -1,6 +1,6 @@
 /* alliant.h  Alliant machine running system version 2 or 3.
-   Copyright (C) 1985, 1986, 1987, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1987, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
    Note that for version 1 of the Alliant system
    you should use alliant1.h instead of this file.
    Use alliant4.h for version 4.
diff --git a/src/m/alpha.h b/src/m/alpha.h
index 47003400846..cf629c20291 100644
--- a/src/m/alpha.h
+++ b/src/m/alpha.h
@@ -1,6 +1,6 @@
 /* machine description file For the alpha chip.
-   Copyright (C) 1994, 1997, 1999, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1994, 1997, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/altos.h b/src/m/altos.h
index 16e7fb7ce06..1a7c6d4f95a 100644
--- a/src/m/altos.h
+++ b/src/m/altos.h
@@ -1,6 +1,6 @@
 /* altos machine description file       Altos 3068 Unix System V Release 2
-   Copyright (C) 1985, 1986, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/amdahl.h b/src/m/amdahl.h
index e418e3a43bf..c5cae1fc560 100644
--- a/src/m/amdahl.h
+++ b/src/m/amdahl.h
@@ -1,6 +1,6 @@
 /* amdahl machine description file
-   Copyright (C) 1987, 1999, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1987, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/apollo.h b/src/m/apollo.h
index d9b3cffdb6d..0e6e53327bc 100644
--- a/src/m/apollo.h
+++ b/src/m/apollo.h
@@ -1,6 +1,6 @@
 /* machine description file for Apollo machine.
-   Copyright (C) 1985, 1986, 1994, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1994, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/arm.h b/src/m/arm.h
index 0a49f0cbd4b..18675f2805c 100644
--- a/src/m/arm.h
+++ b/src/m/arm.h
@@ -1,6 +1,6 @@
 /* Machine description file for ARM-based non-RISCiX machines.
-   Copyright (C) 1994, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/att3b.h b/src/m/att3b.h
index 049593ebcf4..33411ff005c 100644
--- a/src/m/att3b.h
+++ b/src/m/att3b.h
@@ -1,6 +1,6 @@
 /* Machine-dependent configuration for GNU Emacs for AT&T 3b machines.
-   Copyright (C) 1986, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1986, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
    Modified by David Robinson (daver@csvax.caltech.edu) 6/6/86
 
diff --git a/src/m/aviion.h b/src/m/aviion.h
index 50355b25bd6..87b7d963f5a 100644
--- a/src/m/aviion.h
+++ b/src/m/aviion.h
@@ -1,6 +1,6 @@
 /* machine description file for Data General AViiON.
-   Copyright (C) 1985, 1986, 1991, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1991, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/celerity.h b/src/m/celerity.h
index 10d38e14c6c..0eba349b7db 100644
--- a/src/m/celerity.h
+++ b/src/m/celerity.h
@@ -1,6 +1,6 @@
 /* machine description file for Celerity.
-   Copyright (C) 1985, 1986, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/clipper.h b/src/m/clipper.h
index 0dfa13382b3..6851761d53e 100644
--- a/src/m/clipper.h
+++ b/src/m/clipper.h
@@ -1,6 +1,6 @@
 /* machine description file for clipper
-   Copyright (C) 1985, 1986, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/cnvrgnt.h b/src/m/cnvrgnt.h
index f8df583657a..09e3365bee9 100644
--- a/src/m/cnvrgnt.h
+++ b/src/m/cnvrgnt.h
@@ -1,6 +1,6 @@
 /* machine description file for convergent S series.
-   Copyright (C) 1989, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1989, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/convex.h b/src/m/convex.h
index fa87d89e3d3..2904b5942f4 100644
--- a/src/m/convex.h
+++ b/src/m/convex.h
@@ -1,6 +1,6 @@
 /* machine description file for Convex (all models).
-   Copyright (C) 1987, 1994, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1987, 1994, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/cydra5.h b/src/m/cydra5.h
index a64f4761c25..75aca4b0e64 100644
--- a/src/m/cydra5.h
+++ b/src/m/cydra5.h
@@ -1,6 +1,6 @@
 /* machine description file for Cydrome's CYDRA 5 mini super computer
-   Copyright (C) 1988, 1999, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1988, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/delta88k.h b/src/m/delta88k.h
index 86e416e887d..7017e38284e 100644
--- a/src/m/delta88k.h
+++ b/src/m/delta88k.h
@@ -1,6 +1,6 @@
 /* Machine description file for Motorola System V/88 machines
-   Copyright (C) 1985, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/dpx2.h b/src/m/dpx2.h
index 2a90ff46284..de0b93b21ac 100644
--- a/src/m/dpx2.h
+++ b/src/m/dpx2.h
@@ -1,6 +1,6 @@
 /* machine description for Bull DPX/2 range
-   Copyright (C) 1985, 1986, 1999, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/dual.h b/src/m/dual.h
index d02ac5bc38e..63829b75d2e 100644
--- a/src/m/dual.h
+++ b/src/m/dual.h
@@ -1,6 +1,6 @@
 /* machine description file for Dual machines using unisoft port.
-   Copyright (C) 1985, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/elxsi.h b/src/m/elxsi.h
index 0cb0c5513bf..c264d57338b 100644
--- a/src/m/elxsi.h
+++ b/src/m/elxsi.h
@@ -1,6 +1,6 @@
 /* machine description file for Elxsi machine (running enix).
-   Copyright (C) 1986, 1992, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1986, 1992, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
    Adapted by John Salmon
 
 This file is part of GNU Emacs.
diff --git a/src/m/gould-np1.h b/src/m/gould-np1.h
index 272a06cf305..a750c9f8f39 100644
--- a/src/m/gould-np1.h
+++ b/src/m/gould-np1.h
@@ -1,6 +1,6 @@
 /* machine description file for Gould NP1 with UTX/32 3.0 (first release for NP1)
-   Copyright (C) 1986, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1986, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/hp800.h b/src/m/hp800.h
index 1630a0bc883..f48f4c8152e 100644
--- a/src/m/hp800.h
+++ b/src/m/hp800.h
@@ -1,6 +1,6 @@
 /* machine description file for hp9000 series 800 machines.
-   Copyright (C) 1987, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/hp9000s300.h b/src/m/hp9000s300.h
index 9760b9bd2ed..c02a68d31cc 100644
--- a/src/m/hp9000s300.h
+++ b/src/m/hp9000s300.h
@@ -1,6 +1,6 @@
 /* machine description file for hp9000 series 200 or 300 on either HPUX or BSD.
-   Copyright (C) 1985, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/i860.h b/src/m/i860.h
index d74a01a889c..6af68cc2ae7 100644
--- a/src/m/i860.h
+++ b/src/m/i860.h
@@ -1,6 +1,6 @@
 /* machine description file for i860.
-   Copyright (C) 1985, 1986, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/ia64.h b/src/m/ia64.h
index 560cd30f599..7e88aeaedc8 100644
--- a/src/m/ia64.h
+++ b/src/m/ia64.h
@@ -1,6 +1,6 @@
 /* machine description file for the IA-64 architecture.
-   Copyright (C) 2000, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
      Contributed by David Mosberger <davidm@hpl.hp.com>
 
 This file is part of GNU Emacs.
diff --git a/src/m/ibmps2-aix.h b/src/m/ibmps2-aix.h
index ea895cd4fd8..c8449baef41 100644
--- a/src/m/ibmps2-aix.h
+++ b/src/m/ibmps2-aix.h
@@ -1,6 +1,6 @@
 /* machine description file for ibm ps/2 aix386.
-   Copyright (C) 1989, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1989, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/ibmrs6000.h b/src/m/ibmrs6000.h
index 10b43bf8246..6729282953e 100644
--- a/src/m/ibmrs6000.h
+++ b/src/m/ibmrs6000.h
@@ -1,6 +1,6 @@
 /* R2 AIX machine/system dependent defines
-   Copyright (C) 1988, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1988, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/ibmrt-aix.h b/src/m/ibmrt-aix.h
index 43e11b36428..ccee40a46a9 100644
--- a/src/m/ibmrt-aix.h
+++ b/src/m/ibmrt-aix.h
@@ -1,6 +1,6 @@
 /* RTPC AIX machine/system dependent defines
-   Copyright (C) 1988, 1999, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1988, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/ibmrt.h b/src/m/ibmrt.h
index e78d182940c..2cf372a278d 100644
--- a/src/m/ibmrt.h
+++ b/src/m/ibmrt.h
@@ -1,6 +1,6 @@
 /* RTPC machine dependent defines
-   Copyright (C) 1986, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1986, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/intel386.h b/src/m/intel386.h
index 0d2aacf8d19..44ba3245b2e 100644
--- a/src/m/intel386.h
+++ b/src/m/intel386.h
@@ -1,6 +1,6 @@
 /* Machine description file for intel 386.
-   Copyright (C) 1987, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/iris4d.h b/src/m/iris4d.h
index bc8d1242710..4304871ca23 100644
--- a/src/m/iris4d.h
+++ b/src/m/iris4d.h
@@ -1,6 +1,6 @@
 /* machine description file for Iris-4D machines.  Use with s/irix*.h.
-   Copyright (C) 1987, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/irist.h b/src/m/irist.h
index a366b521a9a..4ae3681bd92 100644
--- a/src/m/irist.h
+++ b/src/m/irist.h
@@ -1,7 +1,7 @@
 /* machine description file for Silicon Graphics Iris 2500 Turbos;
    also possibly for non-turbo Irises with system release 2.5.
-   Copyright (C) 1985, 1986, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/isi-ov.h b/src/m/isi-ov.h
index 5b6c3cd0214..ed96605b5a1 100644
--- a/src/m/isi-ov.h
+++ b/src/m/isi-ov.h
@@ -1,6 +1,6 @@
 /* machine description file for ISI 68000's
-   Copyright (C) 1985, 1986, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/m68k.h b/src/m/m68k.h
index 31307ffa499..1071847eda9 100644
--- a/src/m/m68k.h
+++ b/src/m/m68k.h
@@ -1,6 +1,6 @@
 /* Machine description file for generic Motorola 68k.
-   Copyright (C) 1985, 1995, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1995, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/masscomp.h b/src/m/masscomp.h
index df0d9a1aa1a..777ff797727 100644
--- a/src/m/masscomp.h
+++ b/src/m/masscomp.h
@@ -1,6 +1,6 @@
 /* machine description file for Masscomp 5000 series running RTU, ucb universe.
-   Copyright (C) 1986, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1986, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/mega68.h b/src/m/mega68.h
index 7db67fa0cca..54340bdb0be 100644
--- a/src/m/mega68.h
+++ b/src/m/mega68.h
@@ -1,6 +1,6 @@
 /* machine description file for Megatest 68000's.
-   Copyright (C) 1985, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/mg1.h b/src/m/mg1.h
index 92e358837c4..b0d6faca500 100644
--- a/src/m/mg1.h
+++ b/src/m/mg1.h
@@ -1,6 +1,6 @@
 /* machine description file for Whitechapel Computer Works MG1 (ns16000 based).
-   Copyright (C) 1985, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
    MG-1 version by L.M.McLoughlin
 
 This file is part of GNU Emacs.
diff --git a/src/m/mips-siemens.h b/src/m/mips-siemens.h
index 27274c8b527..376f8805788 100644
--- a/src/m/mips-siemens.h
+++ b/src/m/mips-siemens.h
@@ -1,6 +1,6 @@
 /* m- file for Mips machines.
-   Copyright (C) 1987, 1992, 1993, 1995, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1987, 1992, 1993, 1995, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
    This file contains some changes for our SVR4 based SINIX-Mips 5.4.
    I hope this is helpful to port the emacs to our RM?00 series and
diff --git a/src/m/mips.h b/src/m/mips.h
index 9ae74178143..ee8e63030c7 100644
--- a/src/m/mips.h
+++ b/src/m/mips.h
@@ -1,6 +1,6 @@
 /* m- file for Mips machines.
-   Copyright (C) 1987, 1992, 1999, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1987, 1992, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/news.h b/src/m/news.h
index 5ac2cd6b6dc..13a718a8612 100644
--- a/src/m/news.h
+++ b/src/m/news.h
@@ -1,6 +1,6 @@
 /* machine description file for Sony's NEWS workstations, NEWS-OS 3.0.
-   Copyright (C) 1985, 1986, 1989, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1989, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/next.h b/src/m/next.h
index b519e41920d..2a0f7243772 100644
--- a/src/m/next.h
+++ b/src/m/next.h
@@ -1,6 +1,6 @@
 /* Configuration file for the NeXT machine.
-   Copyright (C) 1990, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1990, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/nh3000.h b/src/m/nh3000.h
index ad2d8dd1340..e5cf1a61b58 100644
--- a/src/m/nh3000.h
+++ b/src/m/nh3000.h
@@ -1,8 +1,8 @@
 /* machine description for Harris Night Hawk Series 1200 and Series 3000
    MC68030-based systems (FPP on these is custom).  These systems are
    also known as "ecx" and "gcx".
-   Copyright (C) 1994, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/nh4000.h b/src/m/nh4000.h
index 1c0bc51c896..ba695700d77 100644
--- a/src/m/nh4000.h
+++ b/src/m/nh4000.h
@@ -1,7 +1,7 @@
 /* machine description for Harris NightHawk 88k based machines
    (includes nh4000 and nh5000 machines).
-   Copyright (C) 1994, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/ns16000.h b/src/m/ns16000.h
index 5e9793a44b8..707cb21abb7 100644
--- a/src/m/ns16000.h
+++ b/src/m/ns16000.h
@@ -1,6 +1,6 @@
 /* machine description file for ns16000.
-   Copyright (C) 1985, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/ns32000.h b/src/m/ns32000.h
index 33e48d297bc..fe1fd153b70 100644
--- a/src/m/ns32000.h
+++ b/src/m/ns32000.h
@@ -1,6 +1,6 @@
 /* machine description file for National Semiconductor 32000, running Genix.
-   Copyright (C) 1985, 1986, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/nu.h b/src/m/nu.h
index ec051150bdf..01fadeba18a 100644
--- a/src/m/nu.h
+++ b/src/m/nu.h
@@ -1,6 +1,6 @@
 /* machine description file for TI Nu machines using system V.
-   Copyright (C) 1986, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1986, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/orion.h b/src/m/orion.h
index 3db485dd3f1..472b7b4c8eb 100644
--- a/src/m/orion.h
+++ b/src/m/orion.h
@@ -1,6 +1,6 @@
 /* machine description file for HLH Orion.
-   Copyright (C) 1985, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/orion105.h b/src/m/orion105.h
index 66f87748099..586ddf2ea35 100644
--- a/src/m/orion105.h
+++ b/src/m/orion105.h
@@ -1,6 +1,6 @@
 /* machine description file for HLH Orion 1/05 (Clipper).
-   Copyright (C) 1985, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
    Lee McLoughlin <lmjm%doc.imperial.ac.uk@nss.cs.ucl.ac.uk>
 
 This file is part of GNU Emacs.
diff --git a/src/m/pfa50.h b/src/m/pfa50.h
index 0b1511fd8e7..3c13aa77872 100644
--- a/src/m/pfa50.h
+++ b/src/m/pfa50.h
@@ -1,6 +1,6 @@
 /* Machine description file for PFU A-series.
-   Copyright (C) 1988, 1999, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1988, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/plexus.h b/src/m/plexus.h
index 8b3e9be7849..606caeb20f4 100644
--- a/src/m/plexus.h
+++ b/src/m/plexus.h
@@ -1,6 +1,6 @@
 /* machine description file for the Plexus running System V.2.
-   Copyright (C) 1986, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1986, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/powerpcle.h b/src/m/powerpcle.h
index b4681db06bd..fb70cbfcb4f 100644
--- a/src/m/powerpcle.h
+++ b/src/m/powerpcle.h
@@ -1,6 +1,6 @@
 /* machine description file for PowerPC.
-   Copyright (C) 1987, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/pyramid.h b/src/m/pyramid.h
index 2dbd713f881..9a07ff09f1d 100644
--- a/src/m/pyramid.h
+++ b/src/m/pyramid.h
@@ -1,6 +1,6 @@
 /* machine description file for pyramid.
-   Copyright (C) 1985, 1986, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/sequent-ptx.h b/src/m/sequent-ptx.h
index dbb0944a330..03a0bff3e12 100644
--- a/src/m/sequent-ptx.h
+++ b/src/m/sequent-ptx.h
@@ -1,6 +1,6 @@
 /* machine description file for SEQUENT machines running DYNIX/ptx
-   Copyright (C) 1985, 1986, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/sequent.h b/src/m/sequent.h
index e970275901c..d0051642826 100644
--- a/src/m/sequent.h
+++ b/src/m/sequent.h
@@ -1,6 +1,6 @@
 /* machine description file for SEQUENT BALANCE machines
-   Copyright (C) 1985, 1986, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/sh3el.h b/src/m/sh3el.h
index 0854ecd1b25..9c510979bdc 100644
--- a/src/m/sh3el.h
+++ b/src/m/sh3el.h
@@ -1,5 +1,5 @@
 /* machine description file for sh3el
-   Copyright (C) 1985, 1986 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/sparc.h b/src/m/sparc.h
index c9ef035653b..3efb4c05553 100644
--- a/src/m/sparc.h
+++ b/src/m/sparc.h
@@ -1,6 +1,6 @@
 /* machine description file for Sun 4 SPARC.
-   Copyright (C) 1987, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/sps7.h b/src/m/sps7.h
index 52edc570f92..db6c9d3a91e 100644
--- a/src/m/sps7.h
+++ b/src/m/sps7.h
@@ -1,6 +1,6 @@
 /* machine description file for Bull SPS-7.
-   Copyright (C) 1986, 1999, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1986, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/sr2k.h b/src/m/sr2k.h
index 14a90c666f4..2342bf8ef20 100644
--- a/src/m/sr2k.h
+++ b/src/m/sr2k.h
@@ -1,6 +1,6 @@
 /* machine description file for Hitachi SR2001/SR2201 machines.
-   Copyright (C) 1996, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1996, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/stride.h b/src/m/stride.h
index 6f05b17d96e..8acc84e3cbe 100644
--- a/src/m/stride.h
+++ b/src/m/stride.h
@@ -1,6 +1,6 @@
 /* Definitions file for GNU Emacs running on Stride Micro System-V.2.2
-   Copyright (C) 1985, 1986, 1999, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/sun1.h b/src/m/sun1.h
index 5ded70a9e47..526056dd80f 100644
--- a/src/m/sun1.h
+++ b/src/m/sun1.h
@@ -1,6 +1,6 @@
 /* machine description file for Sun 68000's
-   Copyright (C) 1985, 1986, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/sun2.h b/src/m/sun2.h
index 1afa4a2fa63..cee54da79b7 100644
--- a/src/m/sun2.h
+++ b/src/m/sun2.h
@@ -1,8 +1,8 @@
 /* machine description file for Sun 68000's OPERATING SYSTEM version 2.
   Note that "sun2.h" refers to the operating system version, not the
   CPU model number.  See the MACHINES file for details.
-   Copyright (C) 1985, 1986, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/sun386.h b/src/m/sun386.h
index 435c1ded6d2..21a07a69423 100644
--- a/src/m/sun386.h
+++ b/src/m/sun386.h
@@ -2,8 +2,8 @@
    "sun2.h", but since that file is heavily cpu-specific, it was easier
    not to include it.
 
-   Copyright (C) 1988, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1988, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/symmetry.h b/src/m/symmetry.h
index 91209d0eb67..39dde99f13c 100644
--- a/src/m/symmetry.h
+++ b/src/m/symmetry.h
@@ -1,6 +1,6 @@
 /* machine description file for SEQUENT SYMMETRY machines
-   Copyright (C) 1985, 1986, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/tad68k.h b/src/m/tad68k.h
index fce223da826..357bbe80982 100644
--- a/src/m/tad68k.h
+++ b/src/m/tad68k.h
@@ -1,6 +1,6 @@
 /* Machine-dependent configuration for GNU Emacs for Tadpole 68k machines
-   Copyright (C) 1986, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1986, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/tahoe.h b/src/m/tahoe.h
index 07ec23c7bb6..c28018a149d 100644
--- a/src/m/tahoe.h
+++ b/src/m/tahoe.h
@@ -1,6 +1,6 @@
 /* machine description file for tahoe.
-   Copyright (C) 1985, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/targon31.h b/src/m/targon31.h
index 7100e0e8705..34e3ae40c9e 100644
--- a/src/m/targon31.h
+++ b/src/m/targon31.h
@@ -1,6 +1,6 @@
 /* targon31 machine description file
-   Copyright (C) 1985, 1986, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/tek4300.h b/src/m/tek4300.h
index 3ff3ca4a6a0..30e40a0e09f 100644
--- a/src/m/tek4300.h
+++ b/src/m/tek4300.h
@@ -1,6 +1,6 @@
 /* machine description file for tek4300.
-   Copyright (C) 1988, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1988, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/tekxd88.h b/src/m/tekxd88.h
index 24c10330363..3b858310af3 100644
--- a/src/m/tekxd88.h
+++ b/src/m/tekxd88.h
@@ -1,8 +1,8 @@
 /* Configuration file for the Tektronix XD88 running UTekV 3.2e,
    contributed by Kaveh Ghazi  (ghazi@caip.rutgers.edu)  1/15/93.
    You probably need to use gnu make (version 3.63 or higher.)
-   Copyright (C) 1993, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1993, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/template.h b/src/m/template.h
index 2b39964018a..79d2d40ab70 100644
--- a/src/m/template.h
+++ b/src/m/template.h
@@ -1,6 +1,6 @@
 /* machine description file template.
-   Copyright (C) 1985, 1986, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/tower32.h b/src/m/tower32.h
index 06ed7efe5d7..cdb6884d5fc 100644
--- a/src/m/tower32.h
+++ b/src/m/tower32.h
@@ -1,6 +1,6 @@
 /* machine description file for the NCR Tower 32 running System V.2.
-   Copyright (C) 1986, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1986, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/tower32v3.h b/src/m/tower32v3.h
index 8f5c60cd7c8..19e7d3ba7ea 100644
--- a/src/m/tower32v3.h
+++ b/src/m/tower32v3.h
@@ -1,6 +1,6 @@
 /* machine description file for the NCR Tower 32 running System V.3.
-   Copyright (C) 1986, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1986, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/ustation.h b/src/m/ustation.h
index 0a70df92233..b662cca208e 100644
--- a/src/m/ustation.h
+++ b/src/m/ustation.h
@@ -1,6 +1,6 @@
 /* machine description file for U-station (Nihon Unisys, SS5E; Sumitomo Denkoh, U-Station E30).
-   Copyright (C) 1986, 1999, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1986, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/vax.h b/src/m/vax.h
index 9332b8f494d..fae30d37f73 100644
--- a/src/m/vax.h
+++ b/src/m/vax.h
@@ -1,6 +1,6 @@
 /* machine description file for vax.
-   Copyright (C) 1985, 1986, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/wicat.h b/src/m/wicat.h
index 24bb2acd210..6ab0a498104 100644
--- a/src/m/wicat.h
+++ b/src/m/wicat.h
@@ -1,6 +1,6 @@
 /* machine description file for WICAT machines.
-   Copyright (C) 1986, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1986, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/windowsnt.h b/src/m/windowsnt.h
index 4351f14144f..223958375ca 100644
--- a/src/m/windowsnt.h
+++ b/src/m/windowsnt.h
@@ -1,7 +1,7 @@
 /* Machine description file for Windows NT.
 
-   Copyright (C) 1993, 1994, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/xps100.h b/src/m/xps100.h
index a9ac9bc5e36..89300211eec 100644
--- a/src/m/xps100.h
+++ b/src/m/xps100.h
@@ -1,8 +1,8 @@
 /* xps100.h for the Honeywell XPS100 running UNIX System V.2
    Mark J. Hewitt (mjh@uk.co.kernel)
 
-   Copyright (C) 1985, 1986, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/macros.h b/src/macros.h
index bdd510456b0..2fb01667918 100644
--- a/src/macros.h
+++ b/src/macros.h
@@ -1,6 +1,6 @@
 /* Definitions for keyboard macro interpretation in GNU Emacs.
-   Copyright (C) 1985, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/marker.c b/src/marker.c
index 727e97900c2..31849782f6c 100644
--- a/src/marker.c
+++ b/src/marker.c
@@ -1,6 +1,6 @@
 /* Markers: examining, setting and deleting.
-   Copyright (C) 1985, 1997, 1998, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1997, 1998, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/md5.c b/src/md5.c
index 0daf2c3ef7c..4d8c6d890fe 100644
--- a/src/md5.c
+++ b/src/md5.c
@@ -1,7 +1,7 @@
 /* Functions to compute MD5 message digest of files or memory blocks.
    according to the definition of MD5 in RFC 1321 from April 1992.
-   Copyright (C) 1995, 1996, 1997, 1999, 2000, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
    This file is part of the GNU Emacs.
 
    The GNU C Library is free software; you can redistribute it and/or
diff --git a/src/md5.h b/src/md5.h
index 202b2749504..a23dbd089ba 100644
--- a/src/md5.h
+++ b/src/md5.h
@@ -1,7 +1,7 @@
 /* Declaration of functions and data types used for MD5 sum computing
    library functions.
-   Copyright (C) 1995, 1996, 1997, 1999, 2000, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
    This file is part of GNU Emacs.
 
    The GNU C Library is free software; you can redistribute it and/or
diff --git a/src/mem-limits.h b/src/mem-limits.h
index 45dabca3ac5..30d57d8b51c 100644
--- a/src/mem-limits.h
+++ b/src/mem-limits.h
@@ -1,6 +1,6 @@
 /* Includes for memory limit warnings.
-   Copyright (C) 1990, 1993, 1994, 1995, 1996, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1993, 1994, 1995, 1996, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/mktime.c b/src/mktime.c
index a85ebeb3783..20c1092a62a 100644
--- a/src/mktime.c
+++ b/src/mktime.c
@@ -1,6 +1,6 @@
 /* Convert a `struct tm' to a time_t value.
-   Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003,
+                 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
    Contributed by Paul Eggert (eggert@twinsun.com).
 
    NOTE: The canonical source of this file is maintained with the GNU C Library.
diff --git a/src/prefix-args.c b/src/prefix-args.c
index 5580d176bcf..50ab81c10c9 100644
--- a/src/prefix-args.c
+++ b/src/prefix-args.c
@@ -1,6 +1,6 @@
 /* prefix-args.c - echo each argument, prefixed by a string.
-   Copyright (C) 1992, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1992, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/process.h b/src/process.h
index fcf8d9b6c1f..718d2a70ea8 100644
--- a/src/process.h
+++ b/src/process.h
@@ -1,6 +1,6 @@
 /* Definitions for asynchronous process control in GNU Emacs.
-   Copyright (C) 1985, 1994, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1994, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/puresize.h b/src/puresize.h
index 5dd374af207..95f6ef6b620 100644
--- a/src/puresize.h
+++ b/src/puresize.h
@@ -1,6 +1,6 @@
 /* How much read-only Lisp storage a dumped Emacs needs.
-   Copyright (C) 1993, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1993, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/ralloc.c b/src/ralloc.c
index 83a26dd35d6..7b319556117 100644
--- a/src/ralloc.c
+++ b/src/ralloc.c
@@ -1,6 +1,6 @@
 /* Block-relocating memory allocator.
-   Copyright (C) 1993, 1995, 2000, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1995, 2000, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/regex.h b/src/regex.h
index 14817c35e90..dd57ba36f57 100644
--- a/src/regex.h
+++ b/src/regex.h
@@ -1,8 +1,9 @@
 /* Definitions for data structures and routines for the regular
    expression library, version 0.12.
 
-   Copyright (C) 1985, 1989, 1990, 1991, 1992, 1993, 1995, 2000, 2002,
-                 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1989, 1990, 1991, 1992, 1993, 1995, 2000, 2001,
+                 2002, 2003, 2004, 2005, 2006, 2007
+                 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/src/region-cache.c b/src/region-cache.c
index cedb0017da0..f30e00470f7 100644
--- a/src/region-cache.c
+++ b/src/region-cache.c
@@ -1,6 +1,6 @@
 /* Caching facts about regions of the buffer, for optimization.
-   Copyright (C) 1985, 1986, 1987, 1988, 1989, 1993, 1995, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1987, 1988, 1989, 1993, 1995, 2001, 2002, 2003,
+                 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/region-cache.h b/src/region-cache.h
index 40e68084cce..27176d80dbc 100644
--- a/src/region-cache.h
+++ b/src/region-cache.h
@@ -1,6 +1,6 @@
 /* Header file: Caching facts about regions of the buffer, for optimization.
-   Copyright (C) 1985, 1986, 1993, 1995, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1993, 1995, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/aix3-1.h b/src/s/aix3-1.h
index f77a209f0d2..204baa40f07 100644
--- a/src/s/aix3-1.h
+++ b/src/s/aix3-1.h
@@ -1,6 +1,6 @@
 /* Definitions file for GNU Emacs running on IBM AIX version 3.1
-   Copyright (C) 1985, 1986, 1990, 1999, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1990, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  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 3e6a44f1fab..2b11ba2302f 100644
--- a/src/s/bsd4-1.h
+++ b/src/s/bsd4-1.h
@@ -1,6 +1,6 @@
 /* Definitions file for GNU Emacs running on bsd 4.1.
-   Copyright (C) 1985, 1986, 1999, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  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 ace519c0d74..40c655bea87 100644
--- a/src/s/bsd4-2.h
+++ b/src/s/bsd4-2.h
@@ -1,6 +1,6 @@
 /* Definitions file for GNU Emacs running on bsd 4.2
-   Copyright (C) 1985, 1986, 1994, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1994, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  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 483effe71c1..249cf34f41b 100644
--- a/src/s/bsd4-3.h
+++ b/src/s/bsd4-3.h
@@ -1,6 +1,6 @@
 /* Definitions file for GNU Emacs running on bsd 4.3
-   Copyright (C) 1985, 1986, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/cxux.h b/src/s/cxux.h
index 3c4ffcd24a2..daed2fc85d8 100644
--- a/src/s/cxux.h
+++ b/src/s/cxux.h
@@ -1,6 +1,6 @@
 /* Header file for Harris CXUX.
-   Copyright (C) 1994, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/dgux.h b/src/s/dgux.h
index d48d95709c8..62194a2fc6e 100644
--- a/src/s/dgux.h
+++ b/src/s/dgux.h
@@ -1,7 +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, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1994, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/dgux4.h b/src/s/dgux4.h
index ee24cd65b50..01d75650e6f 100644
--- a/src/s/dgux4.h
+++ b/src/s/dgux4.h
@@ -1,7 +1,7 @@
 /* Definitions file for GNU Emacs running on Data General's DG/UX
    Release 4.10 and above.
-   Copyright (C) 1996, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1996, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  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 d0f6d4f43e8..c9f471af05a 100644
--- a/src/s/dgux5-4-3.h
+++ b/src/s/dgux5-4-3.h
@@ -1,7 +1,7 @@
 /* Definitions file for GNU Emacs running on Data General's DG/UX
    version 5.4 Release 3.00 and above.
-   Copyright (C) 1994, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  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 be0ba73b4e0..fef2da7d29d 100644
--- a/src/s/dgux5-4r2.h
+++ b/src/s/dgux5-4r2.h
@@ -1,7 +1,7 @@
 /* Definitions file for GNU Emacs running on Data General's DG/UX
    5.4 Release 2.xx systems.
-   Copyright (C) 1994, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  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 7116d24c718..24a37f964db 100644
--- a/src/s/gnu-linux.h
+++ b/src/s/gnu-linux.h
@@ -1,6 +1,6 @@
 /* This file is the configuration file for Linux-based GNU systems
-   Copyright (C) 1985, 1986, 1992, 1994, 1996, 1999, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1992, 1994, 1996, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/gnu.h b/src/s/gnu.h
index 71f1dd34a5e..c4f1a798d9e 100644
--- a/src/s/gnu.h
+++ b/src/s/gnu.h
@@ -1,6 +1,6 @@
 /* Definitions file for GNU Emacs running on the GNU Hurd.
-   Copyright (C) 1994, 1995, 1996, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1994, 1995, 1996, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/hpux.h b/src/s/hpux.h
index b8f9c62a893..c0419fbad46 100644
--- a/src/s/hpux.h
+++ b/src/s/hpux.h
@@ -1,7 +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, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  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 6b0009c1c38..abbd945ab2f 100644
--- a/src/s/iris3-5.h
+++ b/src/s/iris3-5.h
@@ -1,6 +1,6 @@
 /* Definitions file for GNU Emacs running on Silicon Graphics 3.5
-   Copyright (C) 1987, 1999, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1987, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  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 d0c68bd89cb..192118eeca7 100644
--- a/src/s/iris3-6.h
+++ b/src/s/iris3-6.h
@@ -1,6 +1,6 @@
 /* Definitions file for GNU Emacs running on Silicon Graphics system 3.6.
-   Copyright (C) 1987, 1999, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1987, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  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 a65242179a9..1512077fe49 100644
--- a/src/s/irix3-3.h
+++ b/src/s/irix3-3.h
@@ -1,6 +1,6 @@
 /* Definitions file for GNU Emacs running on Silicon Graphics Irix system 3.3.
-   Copyright (C) 1987, 1990, 1999, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1987, 1990, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  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 06b1f8960f0..ad699dff035 100644
--- a/src/s/ms-w32.h
+++ b/src/s/ms-w32.h
@@ -1,6 +1,6 @@
 /* System description file for Windows NT.
-   Copyright (C) 1993, 1994, 1995, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1994, 1995, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/newsos5.h b/src/s/newsos5.h
index 0b441d74e24..b548a47ffbe 100644
--- a/src/s/newsos5.h
+++ b/src/s/newsos5.h
@@ -1,6 +1,6 @@
 /* Definitions file for GNU Emacs running on Sony's NEWS-OS 5.0.2
-   Copyright (C) 1992, 1994, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1992, 1994, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/nextstep.h b/src/s/nextstep.h
index 8ea45e16e6e..2923712d929 100644
--- a/src/s/nextstep.h
+++ b/src/s/nextstep.h
@@ -1,6 +1,6 @@
 /* Configuration file for the NeXTstep system.
-   Copyright (C) 1990, 1995, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1995, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/ptx.h b/src/s/ptx.h
index 319bbc049f2..edbbe5b2ac4 100644
--- a/src/s/ptx.h
+++ b/src/s/ptx.h
@@ -1,6 +1,6 @@
 /* Definitions file for GNU Emacs running on Sequent DYNIX/ptx 1.x/2.x
-   Copyright (C) 1987, 1990, 1999, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1987, 1990, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  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 d6281d256b6..682ba06720a 100644
--- a/src/s/riscix1-1.h
+++ b/src/s/riscix1-1.h
@@ -1,6 +1,6 @@
 /* Definitions file for GNU Emacs running on RISCiX 1.1 (bsd 4.3)
-   Copyright (C) 1994, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/riscix12.h b/src/s/riscix12.h
index a4811877070..d082e442810 100644
--- a/src/s/riscix12.h
+++ b/src/s/riscix12.h
@@ -1,6 +1,6 @@
 /* Definitions file for GNU Emacs running on RISCiX 1.2 (bsd 4.3)
-   Copyright (C) 1994, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/rtu.h b/src/s/rtu.h
index 2a9df14a14c..1517165877b 100644
--- a/src/s/rtu.h
+++ b/src/s/rtu.h
@@ -1,6 +1,6 @@
 /* Definitions file for GNU Emacs running on RTU 3.0, ucb universe.
-   Copyright (C) 1986, 1999, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1986, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/sco4.h b/src/s/sco4.h
index 0eda0a3f728..96e812ce0e4 100644
--- a/src/s/sco4.h
+++ b/src/s/sco4.h
@@ -1,6 +1,6 @@
 /* System description file for SCO 3.2v4.
-   Copyright (C) 1993, 1994, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/sco5.h b/src/s/sco5.h
index 06166f32fd9..6ab7b60e466 100644
--- a/src/s/sco5.h
+++ b/src/s/sco5.h
@@ -1,5 +1,6 @@
 /* System description file for SCO 3.2v5.
-   Copyright (C) 1996, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1996, 2001, 2002, 2003, 2004, 2005, 2006,
+                 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/template.h b/src/s/template.h
index 94b3787811f..c16b12971ad 100644
--- a/src/s/template.h
+++ b/src/s/template.h
@@ -1,8 +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, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1992, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/umax.h b/src/s/umax.h
index ae3b98cfcad..5d379ea398a 100644
--- a/src/s/umax.h
+++ b/src/s/umax.h
@@ -1,6 +1,6 @@
 /* Definitions file for GNU Emacs running on UMAX 4.2
-   Copyright (C) 1985, 1986, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  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 096096f9f7a..0d4aba8ea2b 100644
--- a/src/s/unipl5-2.h
+++ b/src/s/unipl5-2.h
@@ -1,6 +1,6 @@
 /* Definitions file for GNU Emacs running on UniSoft's UniPlus 5.2
-   Copyright (C) 1985, 1986, 1999, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  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 94389290726..101e75726ef 100644
--- a/src/s/usg5-0.h
+++ b/src/s/usg5-0.h
@@ -1,6 +1,6 @@
 /* Definitions file for GNU Emacs running on AT&T's System V.0
-   Copyright (C) 1985, 1986, 1999, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  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 a60a985856d..b2c89a1abdc 100644
--- a/src/s/usg5-2-2.h
+++ b/src/s/usg5-2-2.h
@@ -1,6 +1,6 @@
 /* Definitions file for GNU Emacs running on AT&T's System V Release 2.2
-   Copyright (C) 1985, 1986, 1999, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  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 7f1fcb92ec5..13a9885fb53 100644
--- a/src/s/usg5-2.h
+++ b/src/s/usg5-2.h
@@ -1,6 +1,6 @@
 /* Definitions file for GNU Emacs running on AT&T's System V Release 2.0
-   Copyright (C) 1985, 1986, 1999, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  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 56a448e9dba..0e0a1c84829 100644
--- a/src/s/usg5-3.h
+++ b/src/s/usg5-3.h
@@ -1,6 +1,6 @@
 /* Definitions file for GNU Emacs running on AT&T's System V Release 3
-   Copyright (C) 1987, 1999, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1987, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  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 5e202e3edad..4ca5b6fcabc 100644
--- a/src/s/usg5-4.h
+++ b/src/s/usg5-4.h
@@ -1,6 +1,6 @@
 /* Definitions file for GNU Emacs running on AT&T's System V Release 4
-   Copyright (C) 1987, 1990, 1999, 2000, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1987, 1990, 1999, 2000, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/vms.h b/src/s/vms.h
index 51f3ca1a531..4d9bbaebb07 100644
--- a/src/s/vms.h
+++ b/src/s/vms.h
@@ -1,6 +1,6 @@
 /* system description header for VMS
-   Copyright (C) 1986, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1986, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/xenix.h b/src/s/xenix.h
index 09a7b61fcd1..6d77ef50acc 100644
--- a/src/s/xenix.h
+++ b/src/s/xenix.h
@@ -1,6 +1,6 @@
 /* Definitions file for GNU Emacs running SCO Xenix 386 Release 2.2
-   Copyright (C) 1988, 1999, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1988, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/scroll.c b/src/scroll.c
index e8981fcfb5f..3afc927c77f 100644
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -1,6 +1,6 @@
 /* Calculate what line insertion or deletion to do, and do it,
-   Copyright (C) 1985, 1986, 1990, 1993, 1994, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1990, 1993, 1994, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/search.c b/src/search.c
index 3fc3faeda98..abc28619199 100644
--- a/src/search.c
+++ b/src/search.c
@@ -1,6 +1,6 @@
 /* String search routines for GNU Emacs.
-   Copyright (C) 1985, 1986, 1987, 1993, 1994, 1997, 1998, 1999, 2002, 2003,
-                 2004, 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1987, 1993, 1994, 1997, 1998, 1999, 2001, 2002,
+                 2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/strftime.c b/src/strftime.c
index 88800c0d408..7a9506e55d3 100644
--- a/src/strftime.c
+++ b/src/strftime.c
@@ -1,5 +1,6 @@
 /* Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-                 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+                 2001, 2002, 2003, 2004, 2005, 2006, 2007
+                 Free Software Foundation, Inc.
 
    NOTE: The canonical source of this file is maintained with gnulib.
    Bugs can be reported to bug-gnulib@gnu.org.
diff --git a/src/syntax.c b/src/syntax.c
index 52527a0516d..a9e6dda81fe 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -1,6 +1,7 @@
 /* GNU Emacs routines to deal with syntax tables; also word and list parsing.
-   Copyright (C) 1985, 1987, 1993, 1994, 1995, 1997, 1998, 1999, 2002,
-                 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1987, 1993, 1994, 1995, 1997, 1998, 1999, 2001,
+                 2002, 2003, 2004, 2005, 2006, 2007
+                 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/syntax.h b/src/syntax.h
index 92d55967b33..f64aa0e1327 100644
--- a/src/syntax.h
+++ b/src/syntax.h
@@ -1,6 +1,6 @@
 /* Declarations having to do with GNU Emacs syntax tables.
-   Copyright (C) 1985, 1993, 1994, 1997, 1998, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1993, 1994, 1997, 1998, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/sysselect.h b/src/sysselect.h
index ba204dafe3f..d72ff90ac0b 100644
--- a/src/sysselect.h
+++ b/src/sysselect.h
@@ -1,6 +1,6 @@
 /* sysselect.h - System-dependent definitions for the select function.
-   Copyright (C) 1995, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/syssignal.h b/src/syssignal.h
index cc2212d5e19..a4e3fcb3e1b 100644
--- a/src/syssignal.h
+++ b/src/syssignal.h
@@ -1,6 +1,6 @@
 /* syssignal.h - System-dependent definitions for signals.
-   Copyright (C) 1993, 1999, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/systty.h b/src/systty.h
index 6d6a6f01ea9..d1eb3b84597 100644
--- a/src/systty.h
+++ b/src/systty.h
@@ -1,6 +1,6 @@
 /* systty.h - System-dependent definitions for terminals.
-   Copyright (C) 1993, 1994, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/syswait.h b/src/syswait.h
index bb4937f353e..e70e992d545 100644
--- a/src/syswait.h
+++ b/src/syswait.h
@@ -1,6 +1,6 @@
 /* Define wait system call interface for Emacs.
-   Copyright (C) 1993, 1994, 1995, 2000, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1994, 1995, 2000, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/termchar.h b/src/termchar.h
index 3787e338d40..d5843bcf659 100644
--- a/src/termchar.h
+++ b/src/termchar.h
@@ -1,6 +1,6 @@
 /* Flags and parameters describing terminal's characteristics.
-   Copyright (C) 1985, 1986, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/termhooks.h b/src/termhooks.h
index 2b9e947996e..8aef23bc2a7 100644
--- a/src/termhooks.h
+++ b/src/termhooks.h
@@ -1,7 +1,7 @@
 /* Hooks by which low level terminal operations
    can be made to call other routines.
-   Copyright (C) 1985, 1986, 1993, 1994, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1993, 1994, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/terminfo.c b/src/terminfo.c
index 7fccfaf1700..99f8b9a1e4e 100644
--- a/src/terminfo.c
+++ b/src/terminfo.c
@@ -1,6 +1,6 @@
 /* Interface from Emacs to terminfo.
-   Copyright (C) 1985, 1986, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/termopts.h b/src/termopts.h
index 5d4059babb0..dff634b5192 100644
--- a/src/termopts.h
+++ b/src/termopts.h
@@ -1,6 +1,6 @@
 /* Flags and parameters describing user options for handling the terminal.
-   Copyright (C) 1985, 1986, 1990, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1990, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/tparam.c b/src/tparam.c
index ea04f7eaea1..dea57ff7461 100644
--- a/src/tparam.c
+++ b/src/tparam.c
@@ -1,6 +1,6 @@
 /* Merge parameters into a termcap entry string.
-   Copyright (C) 1985, 1987, 1993, 1995, 2000, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1987, 1993, 1995, 2000, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  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/src/uaf.h b/src/uaf.h
index 05a8651b6c2..c00fc7732fe 100644
--- a/src/uaf.h
+++ b/src/uaf.h
@@ -1,6 +1,6 @@
 /* GNU Emacs VMS UAF definition file.
-   Copyright (C) 1986, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1986, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/undo.c b/src/undo.c
index 3313c8e306c..0eca97df566 100644
--- a/src/undo.c
+++ b/src/undo.c
@@ -1,6 +1,6 @@
 /* undo handling for GNU Emacs.
-   Copyright (C) 1990, 1993, 1994, 2000, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1993, 1994, 2000, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/unexaix.c b/src/unexaix.c
index 4785aa1dcb3..41324ac0fd8 100644
--- a/src/unexaix.c
+++ b/src/unexaix.c
@@ -1,6 +1,6 @@
 /* Dump an executable image.
-   Copyright (C) 1985, 1986, 1987, 1988, 1999, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1987, 1988, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/unexalpha.c b/src/unexalpha.c
index ead259437f6..cbd44616bd4 100644
--- a/src/unexalpha.c
+++ b/src/unexalpha.c
@@ -1,7 +1,7 @@
 /* Unexec for DEC alpha.  schoepf@sc.ZIB-Berlin.DE (Rainer Schoepf).
 
-   Copyright (C) 1994, 2000, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1994, 2000, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/unexapollo.c b/src/unexapollo.c
index ace28dfa38d..27cf968c5fe 100644
--- a/src/unexapollo.c
+++ b/src/unexapollo.c
@@ -1,6 +1,6 @@
 /* unexapollo.c -- COFF File UNEXEC for GNU Emacs on Apollo SR10.x
-   Copyright (C) 1988, 1994, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1988, 1994, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/unexconvex.c b/src/unexconvex.c
index 8409463b783..598b1b3428b 100644
--- a/src/unexconvex.c
+++ b/src/unexconvex.c
@@ -7,8 +7,8 @@
    think about it, or about whether other Emacs maintenance might
    break it.
 
-   Copyright (C) 1985, 1986, 1988, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1988, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/unexec.c b/src/unexec.c
index 7fe7e26568c..16f9c96faa7 100644
--- a/src/unexec.c
+++ b/src/unexec.c
@@ -1,5 +1,5 @@
-/* Copyright (C) 1985, 1986, 1987, 1988, 1992, 1993, 1994, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+/* Copyright (C) 1985, 1986, 1987, 1988, 1992, 1993, 1994, 2001, 2002, 2003,
+                 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/unexenix.c b/src/unexenix.c
index c1ad8bbf7eb..4d4bec11eb6 100644
--- a/src/unexenix.c
+++ b/src/unexenix.c
@@ -6,8 +6,8 @@
    we don't plan to think about it, or about whether other Emacs
    maintenance might break it.
 
-   Copyright (C) 1988, 1994, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1988, 1994, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/unexmips.c b/src/unexmips.c
index 86129e052cf..d80bc62277e 100644
--- a/src/unexmips.c
+++ b/src/unexmips.c
@@ -6,8 +6,8 @@
    we don't plan to think about it, or about whether other Emacs
    maintenance might break it.
 
-   Copyright (C) 1988, 1994, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1988, 1994, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/unexnext.c b/src/unexnext.c
index b453da3b023..937e5d2b80b 100644
--- a/src/unexnext.c
+++ b/src/unexnext.c
@@ -1,6 +1,6 @@
 /* Dump Emacs in macho format.
-   Copyright (C) 1990, 1993, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1993, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
    Written by Bradley Taylor (btaylor@next.com).
 
 This file is part of GNU Emacs.
diff --git a/src/unexsni.c b/src/unexsni.c
index 8d72acf1a18..def59c6ea84 100644
--- a/src/unexsni.c
+++ b/src/unexsni.c
@@ -1,6 +1,7 @@
 /* Unexec for Siemens machines running Sinix (modified SVR4).
-   Copyright (C) 1985, 1986, 1987, 1988, 1990, 1992, 1993, 1994, 1995, 2002,
-                 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1987, 1988, 1990, 1992, 1993, 1994, 1995, 2001,
+                 2002, 2003, 2004, 2005, 2006, 2007
+                 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/unexsunos4.c b/src/unexsunos4.c
index 19d982f6140..e8051fc7e88 100644
--- a/src/unexsunos4.c
+++ b/src/unexsunos4.c
@@ -1,6 +1,6 @@
 /* Unexec for Sunos 4 using shared libraries.
-   Copyright (C) 1990, 1994, 1999, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1994, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/unexw32.c b/src/unexw32.c
index 6256062aa3f..ae2fe942c73 100644
--- a/src/unexw32.c
+++ b/src/unexw32.c
@@ -1,6 +1,6 @@
 /* unexec for GNU Emacs on Windows NT.
-   Copyright (C) 1994, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/vm-limit.c b/src/vm-limit.c
index cadfb4cc95a..192775df81c 100644
--- a/src/vm-limit.c
+++ b/src/vm-limit.c
@@ -1,6 +1,6 @@
 /* Functions for memory limit warnings.
-   Copyright (C) 1990, 1992, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1992, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/w32.h b/src/w32.h
index 6ba25a42403..b6fb23dc14d 100644
--- a/src/w32.h
+++ b/src/w32.h
@@ -2,8 +2,8 @@
 #define EMACS_W32_H
 
 /* Support routines for the NT version of Emacs.
-   Copyright (C) 1994, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/w32bdf.c b/src/w32bdf.c
index 89d88574188..64ec2f7a3b0 100644
--- a/src/w32bdf.c
+++ b/src/w32bdf.c
@@ -1,6 +1,6 @@
 /* Implementation of BDF font handling on the Microsoft W32 API.
-   Copyright (C) 1999, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/w32bdf.h b/src/w32bdf.h
index dd8cfa276bf..ba408793882 100644
--- a/src/w32bdf.h
+++ b/src/w32bdf.h
@@ -1,6 +1,6 @@
 /* Definitions and header for handling BDF fonts on the Microsoft W32 API.
-   Copyright (C) 1999, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/w32console.c b/src/w32console.c
index 0fc652bf55f..d2f0e06a64d 100644
--- a/src/w32console.c
+++ b/src/w32console.c
@@ -1,6 +1,6 @@
 /* Terminal hooks for GNU Emacs on the Microsoft W32 API.
-   Copyright (C) 1992, 1999, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1992, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/w32gui.h b/src/w32gui.h
index 2b1a11987f3..18c737a6e12 100644
--- a/src/w32gui.h
+++ b/src/w32gui.h
@@ -1,6 +1,6 @@
 /* Definitions and headers for communication on the Microsoft W32 API.
-   Copyright (C) 1995, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/w32heap.c b/src/w32heap.c
index e1bdd867721..9327e7e7e7e 100644
--- a/src/w32heap.c
+++ b/src/w32heap.c
@@ -1,6 +1,6 @@
 /* Heap management routines for GNU Emacs on the Microsoft W32 API.
-   Copyright (C) 1994, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/w32heap.h b/src/w32heap.h
index c862558b1cf..0d4ccb70b8a 100644
--- a/src/w32heap.h
+++ b/src/w32heap.h
@@ -1,6 +1,6 @@
 /* Heap management routines (including unexec) for GNU Emacs on Windows NT.
-   Copyright (C) 1994, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/w32inevt.c b/src/w32inevt.c
index 0fededa6aea..b44054afef3 100644
--- a/src/w32inevt.c
+++ b/src/w32inevt.c
@@ -1,6 +1,6 @@
 /* Input event support for Emacs on the Microsoft W32 API.
-   Copyright (C) 1992, 1993, 1995, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1992, 1993, 1995, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/w32inevt.h b/src/w32inevt.h
index 8985df1ee69..f0f7f232261 100644
--- a/src/w32inevt.h
+++ b/src/w32inevt.h
@@ -1,6 +1,6 @@
 /* Input routines for GNU Emacs on the Microsoft W32 API.
-   Copyright (C) 1995, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/w32menu.c b/src/w32menu.c
index d5c38bee336..a3bd82a0d7d 100644
--- a/src/w32menu.c
+++ b/src/w32menu.c
@@ -1,6 +1,6 @@
 /* Menu support for GNU Emacs on the Microsoft W32 API.
-   Copyright (C) 1986, 1988, 1993, 1994, 1996, 1998, 1999, 2002, 2003,
-                 2004, 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1986, 1988, 1993, 1994, 1996, 1998, 1999, 2001, 2002,
+                 2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/w32reg.c b/src/w32reg.c
index cd2a3bdf755..37659ecb9ca 100644
--- a/src/w32reg.c
+++ b/src/w32reg.c
@@ -1,6 +1,6 @@
 /* Emulate the X Resource Manager through the registry.
-   Copyright (C) 1990, 1993, 1994, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1993, 1994, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/w32select.c b/src/w32select.c
index 99825c23911..ad5d0e67f83 100644
--- a/src/w32select.c
+++ b/src/w32select.c
@@ -1,6 +1,6 @@
 /* Selection processing for Emacs on the Microsoft W32 API.
-   Copyright (C) 1993, 1994, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/w32xfns.c b/src/w32xfns.c
index 0e937e9950c..b87cc28f057 100644
--- a/src/w32xfns.c
+++ b/src/w32xfns.c
@@ -1,6 +1,6 @@
 /* Functions taken directly from X sources for use with the Microsoft W32 API.
-   Copyright (C) 1989, 1992, 1993, 1994, 1995, 1999, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1989, 1992, 1993, 1994, 1995, 1999, 2001, 2002, 2003,
+                 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/widget.c b/src/widget.c
index 35bf5631b20..c6ba3be468b 100644
--- a/src/widget.c
+++ b/src/widget.c
@@ -1,6 +1,6 @@
 /* The emacs frame widget.
-   Copyright (C) 1992, 1993, 2000, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1992, 1993, 2000, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/widget.h b/src/widget.h
index b6c5e9f0bcb..21cd4543230 100644
--- a/src/widget.h
+++ b/src/widget.h
@@ -1,6 +1,6 @@
 /* The emacs frame widget public header file.
-   Copyright (C) 1993, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1993, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/widgetprv.h b/src/widgetprv.h
index bde384d3b5f..ac845209ba6 100644
--- a/src/widgetprv.h
+++ b/src/widgetprv.h
@@ -1,6 +1,6 @@
 /* The emacs frame widget private header file.
-   Copyright (C) 1993, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1993, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.