Merge from emacs-23

13 files changed, 21 insertions, 29 deletions

diff --git a/src/m/alpha.h b/src/m/alpha.h
index 0e7d182fee7..d6d4202cb3b 100644
--- a/src/m/alpha.h
+++ b/src/m/alpha.h
@@ -1,7 +1,7 @@
 /* Machine description file for the alpha chip.
 
 Copyright (C) 1994, 1997, 1999, 2001, 2002, 2003, 2004, 2005, 2006,
-  2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+                 2007, 2008, 2009, 2010, 2011  Free Software Foundation, Inc.
 
 Author: Rainer Schoepf
 (according to authors.el)
diff --git a/src/m/amdx86-64.h b/src/m/amdx86-64.h
index 867d65f6606..0441d4e22d5 100644
--- a/src/m/amdx86-64.h
+++ b/src/m/amdx86-64.h
@@ -1,7 +1,6 @@
 /* machine description file for AMD x86-64.
-
-Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-  Free Software Foundation, Inc.
+   Copyright (C) 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/m/ia64.h b/src/m/ia64.h
index e9cf07b6789..4a0d242b444 100644
--- a/src/m/ia64.h
+++ b/src/m/ia64.h
@@ -1,9 +1,7 @@
 /* machine description file for the IA-64 architecture.
-
-Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-  2009, 2010  Free Software Foundation, Inc.
-
-Contributed by David Mosberger <davidm@hpl.hp.com>
+   Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+                 2008, 2009, 2010, 2011  Free Software Foundation, Inc.
+     Contributed by David Mosberger <davidm@hpl.hp.com>
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/ibmrs6000.h b/src/m/ibmrs6000.h
index 785719e908b..12030d5dff6 100644
--- a/src/m/ibmrs6000.h
+++ b/src/m/ibmrs6000.h
@@ -1,7 +1,6 @@
 /* R2 AIX machine/system dependent defines
-
-Copyright (C) 1988, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-  2009, 2010  Free Software Foundation, Inc.
+   Copyright (C) 1988, 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/m/ibms390.h b/src/m/ibms390.h
index 1a19f7233a0..eef6c75b150 100644
--- a/src/m/ibms390.h
+++ b/src/m/ibms390.h
@@ -1,7 +1,7 @@
 /* Machine description file for IBM S390 in 32-bit mode
 
 Copyright (C) 1985, 1986, 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/m/ibms390x.h b/src/m/ibms390x.h
index 2ef14a22945..467526fe0c6 100644
--- a/src/m/ibms390x.h
+++ b/src/m/ibms390x.h
@@ -1,6 +1,6 @@
 /* Machine description file for IBM S390 in 64-bit mode
 
-Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+Copyright (C) 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/m/intel386.h b/src/m/intel386.h
index 15601fae76e..a05c38c05d9 100644
--- a/src/m/intel386.h
+++ b/src/m/intel386.h
@@ -1,7 +1,6 @@
 /* Machine description file for intel 386.
-
-Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-  2009, 2010  Free Software Foundation, Inc.
+   Copyright (C) 1987, 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/m/iris4d.h b/src/m/iris4d.h
index 9e80324ee92..e598e6fbcba 100644
--- a/src/m/iris4d.h
+++ b/src/m/iris4d.h
@@ -1,7 +1,6 @@
 /* machine description file for Iris-4D machines.  Use with s/irix*.h.
-
-Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-  2009, 2010  Free Software Foundation, Inc.
+   Copyright (C) 1987, 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/m/m68k.h b/src/m/m68k.h
index df930d511f7..6a516ca3a50 100644
--- a/src/m/m68k.h
+++ b/src/m/m68k.h
@@ -1,7 +1,7 @@
 /* Machine description file for generic Motorola 68k.
 
 Copyright (C) 1985, 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/src/m/macppc.h b/src/m/macppc.h
index 01735790b20..ce708bb079f 100644
--- a/src/m/macppc.h
+++ b/src/m/macppc.h
@@ -1,7 +1,6 @@
 /* machine description file For the powerpc Macintosh.
-
-Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-  2009, 2010  Free Software Foundation, Inc.
+   Copyright (C) 1994, 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/m/sparc.h b/src/m/sparc.h
index fc5ea95c0eb..c3f3ba528ec 100644
--- a/src/m/sparc.h
+++ b/src/m/sparc.h
@@ -1,7 +1,6 @@
 /* machine description file for Sun 4 SPARC.
-
-Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-  2009, 2010  Free Software Foundation, Inc.
+   Copyright (C) 1987, 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/m/template.h b/src/m/template.h
index 0d8e78622a6..cae95a802b3 100644
--- a/src/m/template.h
+++ b/src/m/template.h
@@ -1,7 +1,7 @@
 /* machine description file template.
 
 Copyright (C) 1985, 1986, 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/m/vax.h b/src/m/vax.h
index 16e790a2769..39550a42fe4 100644
--- a/src/m/vax.h
+++ b/src/m/vax.h
@@ -1,7 +1,7 @@
 /* machine description file for vax.
 
 Copyright (C) 1985, 1986, 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.