Merge from emacs--rel--22

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-987

12 files changed, 12 insertions, 12 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 90984764650..9dff071be3d 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -484,7 +484,7 @@
 ;; End:
 
     Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006,
-      2007  Free Software Foundation, Inc.
+      2007, 2008  Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
diff --git a/admin/README b/admin/README
index 2c07f40b52f..9180a5938ac 100644
--- a/admin/README
+++ b/admin/README
@@ -1,4 +1,4 @@
-Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
   Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
diff --git a/admin/alloc-colors.c b/admin/alloc-colors.c
index 22447643e5e..b0d4893181c 100644
--- a/admin/alloc-colors.c
+++ b/admin/alloc-colors.c
@@ -1,5 +1,5 @@
 /* Allocate X colors.  Used for testing with dense colormaps.
-   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
      Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
diff --git a/admin/build-configs b/admin/build-configs
index f36a05ca701..66c4f4d71b9 100755
--- a/admin/build-configs
+++ b/admin/build-configs
@@ -1,6 +1,6 @@
 #! /usr/bin/perl
 
-# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
 #   Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
diff --git a/admin/cus-test.el b/admin/cus-test.el
index ac0c7b37909..96fae1f70e4 100644
--- a/admin/cus-test.el
+++ b/admin/cus-test.el
@@ -1,6 +1,6 @@
 ;;; cus-test.el --- tests for custom types and load problems
 
-;; Copyright (C) 1998, 2000, 2002, 2003, 2004, 2005, 2006, 2007
+;; Copyright (C) 1998, 2000, 2002, 2003, 2004, 2005, 2006, 2007, 2008
 ;;   Free Software Foundation, Inc.
 
 ;; Author: Markus Rost <markus.rost@mathematik.uni-regensburg.de>
diff --git a/admin/diff-tar-files b/admin/diff-tar-files
index 18d95451751..0d142768bfc 100755
--- a/admin/diff-tar-files
+++ b/admin/diff-tar-files
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
 #   Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
diff --git a/admin/make-announcement b/admin/make-announcement
index 1c7b4574fea..b98dce5030d 100755
--- a/admin/make-announcement
+++ b/admin/make-announcement
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-## Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007
+## Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008
 ##   Free Software Foundation, Inc.
 
 ## Author: Francesco Potorti` <pot@gnu.org>
diff --git a/admin/make-emacs b/admin/make-emacs
index 94bf2092a8b..f54bc481cfa 100755
--- a/admin/make-emacs
+++ b/admin/make-emacs
@@ -1,6 +1,6 @@
 #! /usr/bin/perl
 
-# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
 #   Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
diff --git a/admin/notes/copyright b/admin/notes/copyright
index aac2328b7f4..975caef3b30 100644
--- a/admin/notes/copyright
+++ b/admin/notes/copyright
@@ -1,4 +1,4 @@
-Copyright (C) 2007  Free Software Foundation, Inc.
+Copyright (C) 2007, 2008  Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 
diff --git a/admin/nt/makedist.bat b/admin/nt/makedist.bat
index db9446db36e..4cd1da6c316 100755
--- a/admin/nt/makedist.bat
+++ b/admin/nt/makedist.bat
@@ -1,6 +1,6 @@
 @echo off

 

-rem Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007

+rem Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008

 rem   Free Software Foundation, Inc.

 rem

 rem Cannot use brackets in andrewi's email below because

diff --git a/admin/quick-install-emacs b/admin/quick-install-emacs
index e451cfcb2aa..e4e77a14f2c 100755
--- a/admin/quick-install-emacs
+++ b/admin/quick-install-emacs
@@ -1,7 +1,7 @@
 #!/bin/sh
 ### quick-install-emacs --- do a halfway-decent job of installing emacs quickly
 
-## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
 ##   Free Software Foundation, Inc.
 
 ## Author: Miles Bader <miles@gnu.org>
diff --git a/admin/revdiff b/admin/revdiff
index d9ea41782ba..9e47a1eba2c 100755
--- a/admin/revdiff
+++ b/admin/revdiff
@@ -1,6 +1,6 @@
 #! /usr/bin/perl
 
-# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
 #   Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.