Merge from emacs-23

25 files changed, 33 insertions, 39 deletions

diff --git a/nt/ChangeLog b/nt/ChangeLog
index d1c0cf504ba..2fee776a265 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1921,7 +1921,7 @@
 ;; End:
 
     Copyright (C) 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004,
-       2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+       2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
diff --git a/nt/INSTALL b/nt/INSTALL
index ada4b6a8bbe..c051e5ca72b 100644
--- a/nt/INSTALL
+++ b/nt/INSTALL
@@ -1,7 +1,7 @@
 		    Building and Installing Emacs on Windows
                           (from 95 to 7 and beyond)
 
-  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
     Free Software Foundation, Inc.
   See the end of the file for license conditions.
 
diff --git a/nt/README b/nt/README
index d8a12293f58..ef84912bf8c 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, 2008, 2009,
-    2010  Free Software Foundation, Inc.
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006,
+     2007, 2008, 2009, 2010, 2011 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/README.W32 b/nt/README.W32
index ffe9b9ea9f0..e9e9d00aea3 100644
--- a/nt/README.W32
+++ b/nt/README.W32
@@ -1,5 +1,5 @@
-Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-  2010  Free Software Foundation, Inc.
+Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+  Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 			   Emacs for Windows
diff --git a/nt/addpm.c b/nt/addpm.c
index 719573de373..8a5e1a435c9 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,
-     2008, 2009, 2010  Free Software Foundation, Inc.
+     2008, 2009, 2010, 2011  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/nt/addsection.c b/nt/addsection.c
index 94087044bc2..df9d320bbfd 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,
-     2008, 2009, 2010  Free Software Foundation, Inc.
+     2008, 2009, 2010, 2011  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/nt/cmdproxy.c b/nt/cmdproxy.c
index 7c68f868658..a73368b6a2d 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,
-     2008, 2009, 2010  Free Software Foundation, Inc.
+     2008, 2009, 2010, 2011  Free Software Foundation, Inc.
 
    Accepts subset of Unix sh(1) command-line options, for compatibility
    with elisp code written for Unix.  When possible, executes external
diff --git a/nt/config.nt b/nt/config.nt
index 92e466d185a..8a203372936 100644
--- a/nt/config.nt
+++ b/nt/config.nt
@@ -1,7 +1,7 @@
 /* GNU Emacs site configuration template file.  -*- C -*-
 
 Copyright (C) 1988, 1993, 1994, 2001, 2002, 2003, 2004, 2005, 2006,
-  2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+     2007, 2008, 2009, 2010, 2011  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/nt/configure.bat b/nt/configure.bat
index 410087687bd..9dc0e6da5b6 100755
--- a/nt/configure.bat
+++ b/nt/configure.bat
@@ -2,7 +2,7 @@
 rem   ----------------------------------------------------------------------

 rem   Configuration script for MS Windows operating systems

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

-rem      2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.

+rem      2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.

 

 rem   This file is part of GNU Emacs.

 

diff --git a/nt/ddeclient.c b/nt/ddeclient.c
index ef287f017ba..abde2aa86ae 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, 2008, 2009, 2010  Free Software Foundation, Inc.
+      2006, 2007, 2008, 2009, 2010, 2011  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/nt/emacs.rc b/nt/emacs.rc
index 253065b47c4..9a71935f251 100644
--- a/nt/emacs.rc
+++ b/nt/emacs.rc
@@ -27,7 +27,7 @@ BEGIN
 	    VALUE "FileDescription", "GNU Emacs: The extensible self-documenting text editor\0"
 	    VALUE "FileVersion", "24, 0, 50, 0\0"
 	    VALUE "InternalName", "Emacs\0"
-	    VALUE "LegalCopyright", "Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010\0"
+	    VALUE "LegalCopyright", "Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011\0"
 	    VALUE "OriginalFilename", "emacs.exe"
 	    VALUE "ProductName", "Emacs\0"
 	    VALUE "ProductVersion", "24, 0, 50, 0\0"
diff --git a/nt/emacsclient.rc b/nt/emacsclient.rc
index 98f0bcd4f84..27ee1437989 100644
--- a/nt/emacsclient.rc
+++ b/nt/emacsclient.rc
@@ -25,7 +25,7 @@ BEGIN
 	    VALUE "FileDescription", "GNU EmacsClient: Client for the extensible self-documenting text editor\0"
 	    VALUE "FileVersion", "24, 0, 50, 0\0"
 	    VALUE "InternalName", "EmacsClient\0"
-	    VALUE "LegalCopyright", "Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010\0"
+	    VALUE "LegalCopyright", "Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011\0"
 	    VALUE "OriginalFilename", "emacsclientw.exe"
 	    VALUE "ProductName", "EmacsClient\0"
 	    VALUE "ProductVersion", "24, 0, 50, 0\0"
diff --git a/nt/envadd.bat b/nt/envadd.bat
index 11a4e40b934..3bfad8eb23b 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  Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010

+rem  Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011

 rem    Free Software Foundation, Inc.

 

 rem  This file is part of GNU Emacs.

diff --git a/nt/gmake.defs b/nt/gmake.defs
index 2265841efa3..6c9d62223c6 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,
-#    2008, 2009, 2010 Free Software Foundation, Inc.
+#    2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
diff --git a/nt/inc/grp.h b/nt/inc/grp.h
index d4988f62a7a..ea9aa9286d7 100644
--- a/nt/inc/grp.h
+++ b/nt/inc/grp.h
@@ -1,6 +1,7 @@
 /* Replacement grp.h file for building GNU Emacs on Windows.
-   Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009
-     Free Software Foundation, Inc.
+
+Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -32,5 +33,3 @@ struct group *getgrgid(gid_t);
 
 #endif /* _GRP_H */
 
-/* arch-tag: 82840357-7946-4a87-9c97-c0281b49aca3
-   (do not change this comment) */
diff --git a/nt/inc/langinfo.h b/nt/inc/langinfo.h
index edf9c29f320..d78576cec77 100644
--- a/nt/inc/langinfo.h
+++ b/nt/inc/langinfo.h
@@ -1,5 +1,7 @@
 /* Replacement langinfo.h file for building GNU Emacs on Windows.
-   Copyright (C) 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+
+Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011
+  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -58,5 +60,3 @@ extern char *nl_langinfo (nl_item);
 
 #endif /* _LANGINFO_H */
 
-/* arch-tag: a8917b7c-fb2c-4685-902b-742d0f67661b
-   (do not change this comment) */
diff --git a/nt/inc/nl_types.h b/nt/inc/nl_types.h
index a663db95e63..f06aa801f6e 100644
--- a/nt/inc/nl_types.h
+++ b/nt/inc/nl_types.h
@@ -1,5 +1,7 @@
 /* Replacement nl_types.h file for building GNU Emacs on Windows.
-   Copyright (C) 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+
+Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011
+  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -23,5 +25,3 @@ typedef int nl_item;
 
 #endif	/* _NL_TYPES_H */
 
-/* arch-tag: 518aa765-b846-4a7a-a862-95fd022928a1
-   (do not change this comment) */
diff --git a/nt/inc/sys/socket.h b/nt/inc/sys/socket.h
index 153ad17450a..b8842fdd93b 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,
-     2008, 2009  Free Software Foundation, Inc.
+     2008, 2009, 2010, 2011  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -168,6 +168,3 @@ extern int h_errno;
 #endif /* _SOCKET_H_ */
 
 /* end of socket.h */
-
-/* arch-tag: e3b8b91c-aaa0-4bc4-be57-a85a1dd247b4
-   (do not change this comment) */
diff --git a/nt/inc/sys/stat.h b/nt/inc/sys/stat.h
index 4d93430803c..6fe5647640c 100644
--- a/nt/inc/sys/stat.h
+++ b/nt/inc/sys/stat.h
@@ -1,7 +1,7 @@
 /* sys/stat.h supplied with MSVCRT uses too narrow data types for
    inode and user/group id, so we replace them with our own.
 
-   Copyright (C) 2008, 2009  Free Software Foundation, Inc.
+Copyright (C) 2008, 2009, 2010, 2011  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -78,5 +78,3 @@ _CRTIMP int __cdecl __MINGW_NOTHROW	stat (const char*, struct stat*);
 
 #endif	/* INC_SYS_STAT_H_ */
 
-/* arch-tag: 17d8fc06-f2e5-4d10-a01e-af819918fe42
-   (do not change this comment) */
diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in
index f328cd6a9f9..73920e152ce 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,

-#    2008, 2009, 2010 Free Software Foundation, Inc.

+#    2008, 2009, 2010, 2011 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 01ceea954e6..9473f068043 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  Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010

+rem  Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011

 rem    Free Software Foundation, Inc.

 

 rem  This file is part of GNU Emacs.

diff --git a/nt/nmake.defs b/nt/nmake.defs
index 412b0148bb5..a771f1df5d3 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,

-#    2008, 2009, 2010 Free Software Foundation, Inc.

+#    2008, 2009, 2010, 2011 Free Software Foundation, Inc.

 

 # This file is part of GNU Emacs.

 

diff --git a/nt/paths.h b/nt/paths.h
index 3ff8ec8ddab..8766eadb5fd 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, 2008, 2009, 2010 Free Software Foundation, Inc.
+      2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/nt/preprep.c b/nt/preprep.c
index 220b0e40ce6..285ff69b6db 100644
--- a/nt/preprep.c
+++ b/nt/preprep.c
@@ -1,6 +1,6 @@
 /* Pre-process emacs.exe for profiling by MSVC.
    Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-     2008, 2009, 2010  Free Software Foundation, Inc.
+     2008, 2009, 2010, 2011  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/nt/runemacs.c b/nt/runemacs.c
index f4d72062620..dc8503b7a36 100644
--- a/nt/runemacs.c
+++ b/nt/runemacs.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+/* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
      Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.