Update years in copyright notice; nfc.

39 files changed, 44 insertions, 7 deletions

diff --git a/lispintro/ChangeLog b/lispintro/ChangeLog
index fb0144f6119..2b9ab752ad9 100644
--- a/lispintro/ChangeLog
+++ b/lispintro/ChangeLog
@@ -53,7 +53,7 @@
 ;; coding: iso-2022-7bit
 ;; End:
 
-    Copyright (C) 2001
+    Copyright (C) 2001, 2002, 2003, 2004, 2005
 	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/lispintro/Makefile.in b/lispintro/Makefile.in
index c1ee2ab80eb..0f912d61487 100644
--- a/lispintro/Makefile.in
+++ b/lispintro/Makefile.in
@@ -1,6 +1,7 @@
 #### Makefile for the Emacs Lisp Introduction manual
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002,
+#   2003, 2004, 2005 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
diff --git a/lispintro/aclocal.m4 b/lispintro/aclocal.m4
index 58ddd1cd9ad..e446f25337a 100644
--- a/lispintro/aclocal.m4
+++ b/lispintro/aclocal.m4
@@ -1,6 +1,7 @@
 dnl aclocal.m4 generated automatically by aclocal 1.4-p4
 
-dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+dnl Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2002, 2003,
+dnl   2004, 2005 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/lispintro/emacs-lisp-intro.texi b/lispintro/emacs-lisp-intro.texi
index d2ef7d1ce2c..f133cb029f3 100644
--- a/lispintro/emacs-lisp-intro.texi
+++ b/lispintro/emacs-lisp-intro.texi
@@ -183,7 +183,7 @@ people who are not programmers.
 Edition @value{edition-number}, @value{update-date}
 @sp 1
 Copyright @copyright{} 1990, 1991, 1992, 1993, 1994, 1995, 1997, 2001,
-2002, 2003, 2004 Free Software Foundation, Inc.
+   2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 @sp 1
 
 @iftex
diff --git a/lispintro/makefile.w32-in b/lispintro/makefile.w32-in
index f7e99334188..09acbb699ab 100644
--- a/lispintro/makefile.w32-in
+++ b/lispintro/makefile.w32-in
@@ -1,6 +1,6 @@
 #### -*- Makefile -*- for the Emacs Lisp Introduction manual.
 
-# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
diff --git a/oldXMenu/Activate.c b/oldXMenu/Activate.c
index 2f81299cbb6..d03534e144a 100644
--- a/oldXMenu/Activate.c
+++ b/oldXMenu/Activate.c
@@ -1,4 +1,5 @@
 /* Copyright    Massachusetts Institute of Technology    1985	*/
+/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.  */
 
 #include "copyright.h"
 
diff --git a/oldXMenu/AddPane.c b/oldXMenu/AddPane.c
index b7b52c0f642..4bb16c8d573 100644
--- a/oldXMenu/AddPane.c
+++ b/oldXMenu/AddPane.c
@@ -1,6 +1,7 @@
 #include "copyright.h"
 
 /* Copyright    Massachusetts Institute of Technology    1985	*/
+/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.  */
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/AddSel.c b/oldXMenu/AddSel.c
index 40bbbde704c..a063b63f557 100644
--- a/oldXMenu/AddSel.c
+++ b/oldXMenu/AddSel.c
@@ -1,6 +1,7 @@
 #include "copyright.h"
 
 /* Copyright    Massachusetts Institute of Technology    1985	*/
+/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.  */
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/ChangeLog b/oldXMenu/ChangeLog
index 31a786cc23a..afe7607115a 100644
--- a/oldXMenu/ChangeLog
+++ b/oldXMenu/ChangeLog
@@ -443,8 +443,8 @@
 ;; coding: iso-2022-7bit-unix
 ;; End:
 
-    Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001
-	Free Software Foundation, Inc.
+    Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001,
+	2002, 2003, 2004, 2005 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/oldXMenu/ChgPane.c b/oldXMenu/ChgPane.c
index 123f18dec5a..7c8ff91f88c 100644
--- a/oldXMenu/ChgPane.c
+++ b/oldXMenu/ChgPane.c
@@ -1,6 +1,7 @@
 #include "copyright.h"
 
 /* Copyright    Massachusetts Institute of Technology    1985	*/
+/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.  */
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/ChgSel.c b/oldXMenu/ChgSel.c
index 7dce694c410..e0fcb224f3e 100644
--- a/oldXMenu/ChgSel.c
+++ b/oldXMenu/ChgSel.c
@@ -1,6 +1,7 @@
 #include "copyright.h"
 
 /* Copyright    Massachusetts Institute of Technology    1985	*/
+/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.  */
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/Create.c b/oldXMenu/Create.c
index bac3f079f60..d4b32f2e937 100644
--- a/oldXMenu/Create.c
+++ b/oldXMenu/Create.c
@@ -1,4 +1,5 @@
 /* Copyright    Massachusetts Institute of Technology    1985	*/
+/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.  */
 
 #include "copyright.h"
 
diff --git a/oldXMenu/DelPane.c b/oldXMenu/DelPane.c
index bdb084b36f3..6d042e757f8 100644
--- a/oldXMenu/DelPane.c
+++ b/oldXMenu/DelPane.c
@@ -1,6 +1,7 @@
 #include "copyright.h"
 
 /* Copyright    Massachusetts Institute of Technology    1985	*/
+/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.  */
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/DelSel.c b/oldXMenu/DelSel.c
index 78b73113162..7f14aa74fa6 100644
--- a/oldXMenu/DelSel.c
+++ b/oldXMenu/DelSel.c
@@ -1,6 +1,7 @@
 #include "copyright.h"
 
 /* Copyright    Massachusetts Institute of Technology    1985	*/
+/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.  */
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/Destroy.c b/oldXMenu/Destroy.c
index 8d904a53872..b0b9ed77569 100644
--- a/oldXMenu/Destroy.c
+++ b/oldXMenu/Destroy.c
@@ -1,6 +1,7 @@
 #include "copyright.h"
 
 /* Copyright    Massachusetts Institute of Technology    1985	*/
+/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.  */
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/Error.c b/oldXMenu/Error.c
index 1eb521b1642..0bd4fcc8782 100644
--- a/oldXMenu/Error.c
+++ b/oldXMenu/Error.c
@@ -1,6 +1,7 @@
 #include "copyright.h"
 
 /* Copyright    Massachusetts Institute of Technology    1985	*/
+/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.  */
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/EvHand.c b/oldXMenu/EvHand.c
index 073d0ab90b4..c9e8b36c873 100644
--- a/oldXMenu/EvHand.c
+++ b/oldXMenu/EvHand.c
@@ -1,6 +1,7 @@
 #include "copyright.h"
 
 /* Copyright    Massachusetts Institute of Technology    1985	*/
+/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.  */
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/FindPane.c b/oldXMenu/FindPane.c
index 945d4595cab..c886d6f7b7a 100644
--- a/oldXMenu/FindPane.c
+++ b/oldXMenu/FindPane.c
@@ -1,6 +1,7 @@
 #include "copyright.h"
 
 /* Copyright    Massachusetts Institute of Technology    1985	*/
+/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.  */
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/FindSel.c b/oldXMenu/FindSel.c
index 1fed1114732..5a91faf0f8f 100644
--- a/oldXMenu/FindSel.c
+++ b/oldXMenu/FindSel.c
@@ -1,6 +1,7 @@
 #include "copyright.h"
 
 /* Copyright    Massachusetts Institute of Technology    1985	*/
+/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.  */
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/InsPane.c b/oldXMenu/InsPane.c
index 682423a4a05..805a978bb74 100644
--- a/oldXMenu/InsPane.c
+++ b/oldXMenu/InsPane.c
@@ -1,6 +1,7 @@
 #include "copyright.h"
 
 /* Copyright    Massachusetts Institute of Technology    1985	*/
+/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.  */
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/InsSel.c b/oldXMenu/InsSel.c
index f3e2c4d7fb0..103081ac446 100644
--- a/oldXMenu/InsSel.c
+++ b/oldXMenu/InsSel.c
@@ -1,6 +1,7 @@
 #include "copyright.h"
 
 /* Copyright    Massachusetts Institute of Technology    1985	*/
+/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.  */
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/Internal.c b/oldXMenu/Internal.c
index f1367a07351..0fea995a899 100644
--- a/oldXMenu/Internal.c
+++ b/oldXMenu/Internal.c
@@ -1,6 +1,7 @@
 #include "copyright.h"
 
 /* Copyright    Massachusetts Institute of Technology    1985	*/
+/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.  */
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/Locate.c b/oldXMenu/Locate.c
index 47db7fa1103..90fad2c7b2a 100644
--- a/oldXMenu/Locate.c
+++ b/oldXMenu/Locate.c
@@ -1,6 +1,7 @@
 #include "copyright.h"
 
 /* Copyright    Massachusetts Institute of Technology    1985	*/
+/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.  */
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/Post.c b/oldXMenu/Post.c
index 3b39d796823..2be31aebe39 100644
--- a/oldXMenu/Post.c
+++ b/oldXMenu/Post.c
@@ -1,6 +1,7 @@
 #include "copyright.h"
 
 /* Copyright    Massachusetts Institute of Technology    1985	*/
+/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.  */
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/Recomp.c b/oldXMenu/Recomp.c
index b4bc4da3f72..a10c380427e 100644
--- a/oldXMenu/Recomp.c
+++ b/oldXMenu/Recomp.c
@@ -1,6 +1,7 @@
 #include "copyright.h"
 
 /* Copyright    Massachusetts Institute of Technology    1985	*/
+/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.  */
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/SetAEQ.c b/oldXMenu/SetAEQ.c
index daddc1aa946..9124561dcbe 100644
--- a/oldXMenu/SetAEQ.c
+++ b/oldXMenu/SetAEQ.c
@@ -1,6 +1,7 @@
 #include "copyright.h"
 
 /* Copyright    Massachusetts Institute of Technology    1985	*/
+/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.  */
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/SetFrz.c b/oldXMenu/SetFrz.c
index 243cc64e0ed..8e778a66760 100644
--- a/oldXMenu/SetFrz.c
+++ b/oldXMenu/SetFrz.c
@@ -1,6 +1,7 @@
 #include "copyright.h"
 
 /* Copyright    Massachusetts Institute of Technology    1985	*/
+/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.  */
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/SetPane.c b/oldXMenu/SetPane.c
index 39a87ac5ce3..907dba3b233 100644
--- a/oldXMenu/SetPane.c
+++ b/oldXMenu/SetPane.c
@@ -1,6 +1,7 @@
 #include "copyright.h"
 
 /* Copyright    Massachusetts Institute of Technology    1985	*/
+/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.  */
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/SetSel.c b/oldXMenu/SetSel.c
index 4fe0c82a131..06e2c76069f 100644
--- a/oldXMenu/SetSel.c
+++ b/oldXMenu/SetSel.c
@@ -1,6 +1,7 @@
 #include "copyright.h"
 
 /* Copyright    Massachusetts Institute of Technology    1985	*/
+/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.  */
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/X10.h b/oldXMenu/X10.h
index e1abcbbe6c5..63bf90f38d2 100644
--- a/oldXMenu/X10.h
+++ b/oldXMenu/X10.h
@@ -15,6 +15,7 @@
  *
  */
 
+/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.  */
 
 /*
  *	X10.h - Header definition and support file for the C subroutine
diff --git a/oldXMenu/XCrAssoc.c b/oldXMenu/XCrAssoc.c
index 67239a26d31..0c8203579e8 100644
--- a/oldXMenu/XCrAssoc.c
+++ b/oldXMenu/XCrAssoc.c
@@ -1,4 +1,5 @@
 /* Copyright    Massachusetts Institute of Technology    1985	*/
+/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.  */
 
 /*
 Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/oldXMenu/XDelAssoc.c b/oldXMenu/XDelAssoc.c
index 1c72447f931..286353f46cf 100644
--- a/oldXMenu/XDelAssoc.c
+++ b/oldXMenu/XDelAssoc.c
@@ -1,4 +1,5 @@
 /* Copyright    Massachusetts Institute of Technology    1985	*/
+/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.  */
 
 /*
 Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/oldXMenu/XDestAssoc.c b/oldXMenu/XDestAssoc.c
index 137c49f613d..eab0511bb66 100644
--- a/oldXMenu/XDestAssoc.c
+++ b/oldXMenu/XDestAssoc.c
@@ -1,4 +1,5 @@
 /* Copyright    Massachusetts Institute of Technology    1985	*/
+/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.  */
 
 /*
 Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/oldXMenu/XLookAssoc.c b/oldXMenu/XLookAssoc.c
index ea7303bad61..b1b53d9dd6a 100644
--- a/oldXMenu/XLookAssoc.c
+++ b/oldXMenu/XLookAssoc.c
@@ -1,4 +1,5 @@
 /* Copyright    Massachusetts Institute of Technology    1985	*/
+/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.  */
 
 /*
 Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/oldXMenu/XMakeAssoc.c b/oldXMenu/XMakeAssoc.c
index ffe19adc410..d749ec8d04c 100644
--- a/oldXMenu/XMakeAssoc.c
+++ b/oldXMenu/XMakeAssoc.c
@@ -1,4 +1,5 @@
 /* Copyright    Massachusetts Institute of Technology    1985	*/
+/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.  */
 
 /*
 Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/oldXMenu/XMenu.h b/oldXMenu/XMenu.h
index 46e390d3b0a..84bf72a5df9 100644
--- a/oldXMenu/XMenu.h
+++ b/oldXMenu/XMenu.h
@@ -1,6 +1,7 @@
 #include "copyright.h"
 
 /* Copyright    Massachusetts Institute of Technology    1985	*/
+/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.  */
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/XMenuInt.h b/oldXMenu/XMenuInt.h
index e96dfb1e910..fd272300c60 100644
--- a/oldXMenu/XMenuInt.h
+++ b/oldXMenu/XMenuInt.h
@@ -1,5 +1,6 @@
 
 /* Copyright    Massachusetts Institute of Technology    1985	*/
+/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.  */
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/copyright.h b/oldXMenu/copyright.h
index c5a4316043d..dffc63ac63e 100644
--- a/oldXMenu/copyright.h
+++ b/oldXMenu/copyright.h
@@ -16,5 +16,7 @@ without express or implied warranty.
 
 */
 
+/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.  */
+
 /* arch-tag: c689b1bc-a3ba-41a1-baa0-a3622b5445b2
    (do not change this comment) */
diff --git a/oldXMenu/insque.c b/oldXMenu/insque.c
index 2b1f52bb02a..2395e4ea2d3 100644
--- a/oldXMenu/insque.c
+++ b/oldXMenu/insque.c
@@ -1,3 +1,5 @@
+/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.  */
+
 /* This file implements the emacs_insque and emacs_remque functions,
    copies of the insque and remque functions of BSD.  They and all
    their callers have been renamed to emacs_mumble to allow us to