Merge from emacs-23

14 files changed, 21 insertions, 25 deletions

diff --git a/src/s/aix4-2.h b/src/s/aix4-2.h
index 29702028649..7ddf219931f 100644
--- a/src/s/aix4-2.h
+++ b/src/s/aix4-2.h
@@ -1,6 +1,6 @@
 /*
-Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-  2010  Free Software Foundation, Inc.
+Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/bsd-common.h b/src/s/bsd-common.h
index b17ca7a012f..247e1f573dc 100644
--- a/src/s/bsd-common.h
+++ b/src/s/bsd-common.h
@@ -1,7 +1,6 @@
 /* Definitions file for GNU Emacs running on bsd 4.3
-
-Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-  2008, 2009, 2010  Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004, 2005, 2006,
+                 2007, 2008, 2009, 2010, 2011  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/cygwin.h b/src/s/cygwin.h
index 157ef72f550..774ef3a9ab5 100644
--- a/src/s/cygwin.h
+++ b/src/s/cygwin.h
@@ -1,7 +1,7 @@
 /* System description header file for Cygwin.
 
 Copyright (C) 1985, 1986, 1992, 1999, 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/src/s/darwin.h b/src/s/darwin.h
index 73e19602275..089d569460f 100644
--- a/src/s/darwin.h
+++ b/src/s/darwin.h
@@ -1,7 +1,6 @@
 /* System description header file for Darwin (Mac OS X).
-
-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.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/freebsd.h b/src/s/freebsd.h
index cfed343d6c5..99dc050bfae 100644
--- a/src/s/freebsd.h
+++ b/src/s/freebsd.h
@@ -1,8 +1,8 @@
 /* System description header for FreeBSD systems.
 
 Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-  2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-  Free Software Foundation, Inc.
+                 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+                 Free Software Foundation, Inc.
 
 Author: Shawn M. Carey
 (according to authors.el)
diff --git a/src/s/gnu-linux.h b/src/s/gnu-linux.h
index 9327423b42f..9c37b8eec03 100644
--- a/src/s/gnu-linux.h
+++ b/src/s/gnu-linux.h
@@ -1,7 +1,7 @@
 /* This file is the configuration file for Linux-based GNU systems
 
 Copyright (C) 1985, 1986, 1992, 1994, 1996, 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 was put together by Michael K. Johnson and Rik Faith.
 
diff --git a/src/s/gnu.h b/src/s/gnu.h
index 95b8017ddc1..df35adc8704 100644
--- a/src/s/gnu.h
+++ b/src/s/gnu.h
@@ -1,7 +1,6 @@
 /* Definitions file for GNU Emacs running on the GNU Hurd.
-
-Copyright (C) 1994, 1995, 1996, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-  2008, 2009, 2010  Free Software Foundation, Inc.
+   Copyright (C) 1994, 1995, 1996, 2001, 2002, 2003, 2004, 2005, 2006,
+                 2007, 2008, 2009, 2010, 2011  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/hpux10-20.h b/src/s/hpux10-20.h
index 0932e6f7112..3e88b57bc91 100644
--- a/src/s/hpux10-20.h
+++ b/src/s/hpux10-20.h
@@ -1,7 +1,6 @@
 /* System description file for hpux version 10.20.
-
-Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-  2009, 2010  Free Software Foundation, Inc.
+   Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+     2008, 2009, 2010, 2011  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/irix6-5.h b/src/s/irix6-5.h
index 10481f609c3..6ddae984a66 100644
--- a/src/s/irix6-5.h
+++ b/src/s/irix6-5.h
@@ -1,7 +1,7 @@
 /* Definitions file for GNU Emacs running on Silicon Graphics Irix system 6.5.
 
 Copyright (C) 1999, 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/src/s/ms-w32.h b/src/s/ms-w32.h
index 826a02bc60f..6900cbcc45b 100644
--- a/src/s/ms-w32.h
+++ b/src/s/ms-w32.h
@@ -1,7 +1,7 @@
 /* System description file for Windows NT.
 
 Copyright (C) 1993, 1994, 1995, 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/src/s/msdos.h b/src/s/msdos.h
index 8dd8e3cf490..3bb1dfe03e7 100644
--- a/src/s/msdos.h
+++ b/src/s/msdos.h
@@ -1,7 +1,7 @@
 /* System description file for MS-DOS
 
 Copyright (C) 1993, 1996, 1997, 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/src/s/netbsd.h b/src/s/netbsd.h
index 6f5b24bcfa6..115779a7cbc 100644
--- a/src/s/netbsd.h
+++ b/src/s/netbsd.h
@@ -1,7 +1,7 @@
 /* s/ file for netbsd system.
 
-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.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/template.h b/src/s/template.h
index eb7ca85c5e5..d6aad17d396 100644
--- a/src/s/template.h
+++ b/src/s/template.h
@@ -3,7 +3,7 @@
    should define or not.
 
 Copyright (C) 1985, 1986, 1992, 1999, 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/src/s/usg5-4-common.h b/src/s/usg5-4-common.h
index 4dcb8e50200..366d92b95a0 100644
--- a/src/s/usg5-4-common.h
+++ b/src/s/usg5-4-common.h
@@ -1,7 +1,7 @@
 /* Definitions file for GNU Emacs running on AT&T's System V Release 4
 
 Copyright (C) 1987, 1990, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-  2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+                 2006, 2007, 2008, 2009, 2010, 2011  Free Software Foundation, Inc.
 
 Written by James Van Artsdalen of Dell Computer Corp. james@bigtex.cactus.org.
 Subsequently improved for Dell 2.2 by Eric S. Raymond <esr@snark.thyrsus.com>.