Merge from emacs--rel--22

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

23 files changed, 25 insertions, 24 deletions

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 944a6d4b855..752a4f7dc7e 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1457,7 +1457,7 @@
 ;; End:
 
     Copyright (C) 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004,
-       2005, 2006, 2007 Free Software Foundation, Inc.
+       2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
diff --git a/nt/INSTALL b/nt/INSTALL
index a6fe79d826f..7ce4ef1b95b 100644
--- a/nt/INSTALL
+++ b/nt/INSTALL
@@ -1,7 +1,7 @@
                       Building and Installing Emacs
                 on Windows NT/2K/XP and Windows 95/98/ME
 
-  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/nt/README b/nt/README
index b452fedd1f5..a556732256f 100644
--- a/nt/README
+++ b/nt/README
@@ -1,7 +1,7 @@
              Emacs for Windows NT/2000 and Windows 95/98/ME
 
   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006,
-     2007 Free Software Foundation, Inc.
+     2007, 2008 Free Software Foundation, Inc.
   See the end of the file for license conditions.
 
   This directory contains support for compiling and running GNU Emacs on
diff --git a/nt/addpm.c b/nt/addpm.c
index a2ad06149b2..270ef6d15a7 100644
--- a/nt/addpm.c
+++ b/nt/addpm.c
@@ -1,6 +1,6 @@
 /* Add entries to the GNU Emacs Program Manager folder.
    Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005,
-      2006, 2007  Free Software Foundation, Inc.
+      2006, 2007, 2008  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/nt/addsection.c b/nt/addsection.c
index c79bbbbadfd..6eb2ee37038 100644
--- a/nt/addsection.c
+++ b/nt/addsection.c
@@ -1,6 +1,6 @@
 /* Add an uninitialized data section to an executable.
    Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005,
-      2006, 2007  Free Software Foundation, Inc.
+      2006, 2007, 2008  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/nt/cmdproxy.c b/nt/cmdproxy.c
index 3f3e639d8f7..631570b9d5d 100644
--- a/nt/cmdproxy.c
+++ b/nt/cmdproxy.c
@@ -1,6 +1,6 @@
 /* Proxy shell designed for use with Emacs on Windows 95 and NT.
    Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005,
-      2006, 2007  Free Software Foundation, Inc.
+      2006, 2007, 2008  Free Software Foundation, Inc.
 
    Accepts subset of Unix sh(1) command-line options, for compatability
    with elisp code written for Unix.  When possible, executes external
diff --git a/nt/config.nt b/nt/config.nt
index 10dbb3b06de..ff80ef6830b 100644
--- a/nt/config.nt
+++ b/nt/config.nt
@@ -1,6 +1,6 @@
 /* GNU Emacs site configuration template file.  -*- C -*-
    Copyright (C) 1988, 1993, 1994, 2001, 2002, 2003, 2004,
-      2005, 2006, 2007  Free Software Foundation, Inc.
+      2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/nt/configure.bat b/nt/configure.bat
index ef0a746949b..a88cd5df413 100755
--- a/nt/configure.bat
+++ b/nt/configure.bat
@@ -2,7 +2,7 @@
 rem   ----------------------------------------------------------------------

 rem   Configuration script for MS Windows 95/98/Me and NT/2000/XP

 rem   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005,

-rem      2006, 2007 Free Software Foundation, Inc.

+rem      2006, 2007, 2008 Free Software Foundation, Inc.

 

 rem   This file is part of GNU Emacs.

 

diff --git a/nt/ddeclient.c b/nt/ddeclient.c
index 01f00c83316..1f3eac077cb 100644
--- a/nt/ddeclient.c
+++ b/nt/ddeclient.c
@@ -1,6 +1,6 @@
 /* Simple client interface to DDE servers.
    Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005,
-      2006, 2007  Free Software Foundation, Inc.
+      2006, 2007, 2008  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/nt/emacs.rc b/nt/emacs.rc
index 3565493d003..7d84a6cd0f1 100644
--- a/nt/emacs.rc
+++ b/nt/emacs.rc
@@ -27,7 +27,7 @@ BEGIN
             VALUE "FileDescription", "GNU Emacs for Windows NT/95/98/2000/ME/XP\0"
             VALUE "FileVersion", "23, 0, 50, 0\0"
             VALUE "InternalName", "Emacs\0"
-            VALUE "LegalCopyright", "Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007\0"
+            VALUE "LegalCopyright", "Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008\0"
             VALUE "OriginalFilename", "emacs.exe"
             VALUE "ProductName", "Emacs: The extensible self-documenting text editor\0"
             VALUE "ProductVersion", "23, 0, 50, 0\0"
diff --git a/nt/envadd.bat b/nt/envadd.bat
index a2b7194c716..029d090ab65 100644
--- a/nt/envadd.bat
+++ b/nt/envadd.bat
@@ -1,7 +1,7 @@
 rem  Hack to change/add environment variables in the makefiles for the

 rem  Windows platform.

 rem

-rem  Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.

+rem  Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.

 rem

 rem  This file is part of GNU Emacs.

 rem

diff --git a/nt/gmake.defs b/nt/gmake.defs
index 28023e99924..e782c203e76 100644
--- a/nt/gmake.defs
+++ b/nt/gmake.defs
@@ -1,6 +1,6 @@
 #  -*- Makefile -*- definition file for building GNU Emacs on Windows NT.
 #  Copyright (C) 2000, 2001, 2002, 2003, 2004,
-#    2005, 2006, 2007 Free Software Foundation, Inc.
+#    2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 #
 #  GNU Emacs 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/nt/icons/README b/nt/icons/README
index 4cb7d87f470..a29a588bd05 100644
--- a/nt/icons/README
+++ b/nt/icons/README
@@ -2,7 +2,7 @@ COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES
 
 File: emacs.ico
 Author: Andrew Zhilin
-Copyright (C) 2005, 2006, 2007  Free Software Foundation, Inc.
+Copyright (C) 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 License: GNU General Public License version 3 or later (see COPYING)
 
 
@@ -11,7 +11,7 @@ Files: gnu2a32.ico gnu2a32t.ico gnu2b48.ico gnu2b48t.ico
        gnu5w32.ico gnu5w32t.ico gnu6w48.ico gnu6w48t.ico
        gnu7.ico    gnu8.ico     gnu9.ico
 Author: Rob Davenport <rgd at bigfoot.com>
-Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
   Free Software Foundation, Inc.
 License: GNU General Public License version 3 or later (see COPYING)
 
diff --git a/nt/inc/grp.h b/nt/inc/grp.h
index 6cadc106d11..8cc4a2be911 100755
--- a/nt/inc/grp.h
+++ b/nt/inc/grp.h
@@ -1,5 +1,6 @@
 /* Replacement grp.h file for building GNU Emacs on Windows.
-   Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008
+     Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/nt/inc/langinfo.h b/nt/inc/langinfo.h
index 4961fba431d..9685e4e8f07 100644
--- a/nt/inc/langinfo.h
+++ b/nt/inc/langinfo.h
@@ -1,5 +1,5 @@
 /* Replacement langinfo.h file for building GNU Emacs on Windows.
-   Copyright (C) 2006, 2007 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2007, 2008 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/nt/inc/nl_types.h b/nt/inc/nl_types.h
index 0b37e8584e7..7a43523cb9b 100644
--- a/nt/inc/nl_types.h
+++ b/nt/inc/nl_types.h
@@ -1,5 +1,5 @@
 /* Replacement nl_types.h file for building GNU Emacs on Windows.
-   Copyright (C) 2006, 2007 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2007, 2008 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/nt/inc/sys/socket.h b/nt/inc/sys/socket.h
index f848231299d..741926fd87f 100644
--- a/nt/inc/sys/socket.h
+++ b/nt/inc/sys/socket.h
@@ -1,5 +1,5 @@
 /* Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005,
-      2006, 2007  Free Software Foundation, Inc.
+      2006, 2007, 2008  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in
index a792889af24..1d9ada44b4a 100644
--- a/nt/makefile.w32-in
+++ b/nt/makefile.w32-in
@@ -1,6 +1,6 @@
 #  -*- Makefile -*- for GNU Emacs on the Microsoft W32 API.

 #  Copyright (C) 2000, 2001, 2002, 2003, 2004,

-#    2005, 2006, 2007 Free Software Foundation, Inc.

+#    2005, 2006, 2007, 2008 Free Software Foundation, Inc.

 #

 #  Top level makefile for building GNU Emacs on Windows NT

 #

diff --git a/nt/multi-install-info.bat b/nt/multi-install-info.bat
index 8266c903aaa..9632eee553c 100644
--- a/nt/multi-install-info.bat
+++ b/nt/multi-install-info.bat
@@ -3,7 +3,7 @@
 rem  Hack to run install-info with multiple info files on the command

 rem  line on the Windows platform.

 rem

-rem  Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.

+rem  Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.

 rem

 rem  This file is part of GNU Emacs.

 rem

diff --git a/nt/nmake.defs b/nt/nmake.defs
index 7d19c74dcbd..503d8ec140f 100644
--- a/nt/nmake.defs
+++ b/nt/nmake.defs
@@ -1,6 +1,6 @@
 #  -*- Makefile -*- definition file for building GNU Emacs on Windows NT.

 #  Copyright (C) 2000, 2001, 2002, 2003, 2004,

-#    2005, 2006, 2007 Free Software Foundation, Inc.

+#    2005, 2006, 2007, 2008 Free Software Foundation, Inc.

 #

 #  GNU Emacs 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/nt/paths.h b/nt/paths.h
index 9fb76cc78c4..714471541da 100644
--- a/nt/paths.h
+++ b/nt/paths.h
@@ -1,5 +1,5 @@
 /* Copyright (C) 1993, 1995, 1997, 1999, 2001, 2002, 2003, 2004,
-      2005, 2006, 2007 Free Software Foundation, Inc.
+      2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/nt/preprep.c b/nt/preprep.c
index 4978c314861..f53cea7a9cb 100644
--- a/nt/preprep.c
+++ b/nt/preprep.c
@@ -1,6 +1,6 @@
 /* Pro-process emacs.exe for profiling by MSVC.
    Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005,
-      2006, 2007  Free Software Foundation, Inc.
+      2006, 2007, 2008  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/nt/runemacs.c b/nt/runemacs.c
index 643b8036827..f36ffeed031 100644
--- a/nt/runemacs.c
+++ b/nt/runemacs.c
@@ -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.
 
 This file is part of GNU Emacs.