Merge from mainline.

20 files changed, 20 insertions, 57 deletions

diff --git a/src/s/aix4-2.h b/src/s/aix4-2.h
index 7ddf219931f..2c2a4be2d58 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, 2011
-  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.
 
@@ -88,5 +88,3 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    to avoid a crash just use the Emacs implementation for that function.  */
 #define BROKEN_GET_CURRENT_DIR_NAME 1
 
-/* arch-tag: 38fe75ea-6aef-42bd-8449-bc34d921a562
-   (do not change this comment) */
diff --git a/src/s/bsd-common.h b/src/s/bsd-common.h
index 247e1f573dc..d0bdb566dd9 100644
--- a/src/s/bsd-common.h
+++ b/src/s/bsd-common.h
@@ -1,6 +1,7 @@
 /* Definitions file for GNU Emacs running on bsd 4.3
-   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004, 2005, 2006,
-                 2007, 2008, 2009, 2010, 2011  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.
 
@@ -81,5 +82,3 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Send signals to subprocesses by "typing" special chars at them.  */
 #define SIGNALS_VIA_CHARACTERS
 
-/* arch-tag: 0c367245-bde3-492e-9029-3ff6898beb95
-   (do not change this comment) */
diff --git a/src/s/cygwin.h b/src/s/cygwin.h
index 774ef3a9ab5..1a224f1d72a 100644
--- a/src/s/cygwin.h
+++ b/src/s/cygwin.h
@@ -104,5 +104,3 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Send signals to subprocesses by "typing" special chars at them.  */
 #define SIGNALS_VIA_CHARACTERS
 
-/* arch-tag: 5ae7ba00-83b0-4ab3-806a-3e845779191b
-   (do not change this comment) */
diff --git a/src/s/darwin.h b/src/s/darwin.h
index 089d569460f..74ac808acdb 100644
--- a/src/s/darwin.h
+++ b/src/s/darwin.h
@@ -1,6 +1,7 @@
 /* System description header file for Darwin (Mac OS X).
-   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-                 2008, 2009, 2010, 2011 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.
 
@@ -149,5 +150,3 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Use the GC_MAKE_GCPROS_NOOPS (see lisp.h) method for marking the stack.  */
 #define GC_MARK_STACK   GC_MAKE_GCPROS_NOOPS
 
-/* arch-tag: 481d443d-4f89-43ea-b5fb-49706d95fa41
-   (do not change this comment) */
diff --git a/src/s/freebsd.h b/src/s/freebsd.h
index 99dc050bfae..d7cc308f7bc 100644
--- a/src/s/freebsd.h
+++ b/src/s/freebsd.h
@@ -66,5 +66,3 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Use the GC_MAKE_GCPROS_NOOPS (see lisp.h) method for marking the stack.  */
 #define GC_MARK_STACK   GC_MAKE_GCPROS_NOOPS
 
-/* arch-tag: 426529ca-b7c4-448f-b10a-d4dcdc9c78eb
-   (do not change this comment) */
diff --git a/src/s/gnu-kfreebsd.h b/src/s/gnu-kfreebsd.h
index a1e8c024744..a85571915df 100644
--- a/src/s/gnu-kfreebsd.h
+++ b/src/s/gnu-kfreebsd.h
@@ -7,5 +7,3 @@
 
 #define NO_TERMIO               /* use only <termios.h> */
 
-/* arch-tag: 8d098200-2586-469e-99ab-6d092c035e03
-   (do not change this comment) */
diff --git a/src/s/gnu-linux.h b/src/s/gnu-linux.h
index 9c37b8eec03..a102f602bd7 100644
--- a/src/s/gnu-linux.h
+++ b/src/s/gnu-linux.h
@@ -1,7 +1,8 @@
 /* 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, 2011  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.
 
@@ -160,5 +161,3 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #endif
 #endif
 
-/* arch-tag: 6244ea2a-abd0-44ec-abec-ff3dcc9afea9
-   (do not change this comment) */
diff --git a/src/s/gnu.h b/src/s/gnu.h
index df35adc8704..9e46d100d46 100644
--- a/src/s/gnu.h
+++ b/src/s/gnu.h
@@ -1,6 +1,7 @@
 /* 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, 2011  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.
 
@@ -44,5 +45,3 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #endif /* !_IO_STDIO_H */
 #endif /* emacs */
 
-/* arch-tag: 577983d9-87a6-4922-b8f8-ff2b563714a4
-   (do not change this comment) */
diff --git a/src/s/hpux10-20.h b/src/s/hpux10-20.h
index 3e88b57bc91..f6eb2ddfd11 100644
--- a/src/s/hpux10-20.h
+++ b/src/s/hpux10-20.h
@@ -1,6 +1,7 @@
 /* System description file for hpux version 10.20.
-   Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-     2008, 2009, 2010, 2011  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.
 
@@ -134,5 +135,3 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* No underscore please.  */
 #define LDAV_SYMBOL "avenrun"
 
-/* arch-tag: 8d8dcbf1-ca9b-48a1-94be-b750de18a5c6
-   (do not change this comment) */
diff --git a/src/s/hpux11.h b/src/s/hpux11.h
index 48f60841047..40bcc987973 100644
--- a/src/s/hpux11.h
+++ b/src/s/hpux11.h
@@ -7,5 +7,3 @@
    then close and reopen it in the child.  */
 #define USG_SUBTTY_WORKS
 
-/* arch-tag: f5a3d780-82cd-4a9a-832e-a4031aab788b
-   (do not change this comment) */
diff --git a/src/s/irix6-5.h b/src/s/irix6-5.h
index 6ddae984a66..f755e119bc6 100644
--- a/src/s/irix6-5.h
+++ b/src/s/irix6-5.h
@@ -97,8 +97,4 @@ char *_getpty();
 #define GC_SETJMP_WORKS 1
 #define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS
 
-/* arch-tag: ad0660e0-acf8-46ae-b866-4f3df5b1101b
-   (do not change this comment) */
 
-/* arch-tag: d7ad9ec2-54ad-4b2f-adf2-0070c5c63e83
-   (do not change this comment) */
diff --git a/src/s/ms-w32.h b/src/s/ms-w32.h
index 6900cbcc45b..18e3fd2982e 100644
--- a/src/s/ms-w32.h
+++ b/src/s/ms-w32.h
@@ -389,5 +389,3 @@ extern void _DebPrint (const char *fmt, ...);
 
 /* ============================================================ */
 
-/* arch-tag: 5d4a3a1c-40dc-4dea-9c7c-38fed9ae0eae
-   (do not change this comment) */
diff --git a/src/s/msdos.h b/src/s/msdos.h
index 3bb1dfe03e7..b48177da052 100644
--- a/src/s/msdos.h
+++ b/src/s/msdos.h
@@ -125,5 +125,3 @@ You lose; /* Emacs for DOS must be compiled with DJGPP */
 #define GC_SETJMP_WORKS 1
 #define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS
 
-/* arch-tag: d184f860-815d-4ff4-8187-d05c0f3c37d0
-   (do not change this comment) */
diff --git a/src/s/netbsd.h b/src/s/netbsd.h
index 115779a7cbc..a469cc228f6 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, 2011  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.
 
@@ -45,5 +45,3 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Use the GC_MAKE_GCPROS_NOOPS (see lisp.h) method.  */
 #define GC_MARK_STACK   GC_MAKE_GCPROS_NOOPS
 
-/* arch-tag: e80f364a-04e9-4faf-93cb-f36a0fe95c81
-   (do not change this comment) */
diff --git a/src/s/openbsd.h b/src/s/openbsd.h
index d9d60e3b868..175d61dc9c9 100644
--- a/src/s/openbsd.h
+++ b/src/s/openbsd.h
@@ -3,5 +3,3 @@
 /* The same as NetBSD.  Note there are differences in configure.  */
 #include "netbsd.h"
 
-/* arch-tag: 7e3f65ca-3f48-4237-933f-2b208b21e8e2
-   (do not change this comment) */
diff --git a/src/s/sol2-10.h b/src/s/sol2-10.h
index fd7f30021ea..b20476e7fba 100644
--- a/src/s/sol2-10.h
+++ b/src/s/sol2-10.h
@@ -8,5 +8,3 @@
 /* This is needed for the system_process_attributes implementation.  */
 #define _STRUCTURED_PROC 1
 
-/* arch-tag: 7c51a134-5469-4d16-aa00-d69224640eeb
-   (do not change this comment) */
diff --git a/src/s/sol2-6.h b/src/s/sol2-6.h
index 3b707aa5c3c..dd1c41a1af8 100644
--- a/src/s/sol2-6.h
+++ b/src/s/sol2-6.h
@@ -1,7 +1,7 @@
 /* Definitions file for GNU Emacs running on Solaris 2.6.
 
 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.
 
@@ -62,5 +62,3 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define GC_SETJMP_WORKS 1
 #define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS
 
-/* arch-tag: 71ea3857-89dc-4395-9623-77964e6ed3ca
-   (do not change this comment) */
diff --git a/src/s/template.h b/src/s/template.h
index d6aad17d396..f08da48dfc0 100644
--- a/src/s/template.h
+++ b/src/s/template.h
@@ -121,5 +121,3 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    you should also check `etc/MACHINES' to make sure its descriptions
    of known problems in that configuration should be updated.  */
 
-/* arch-tag: 4b426b11-cb2e-4c0e-a488-e663f76a0515
-   (do not change this comment) */
diff --git a/src/s/unixware.h b/src/s/unixware.h
index 81b1b3d97fa..150cef604b7 100644
--- a/src/s/unixware.h
+++ b/src/s/unixware.h
@@ -1,7 +1,7 @@
 /* s/ file for Unixware.
 
 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.
 
@@ -61,5 +61,3 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->__ptr - (FILE)->__base)
 
-/* arch-tag: d82e92e7-9443-4a60-a581-7f293cbae8a3
-   (do not change this comment) */
diff --git a/src/s/usg5-4-common.h b/src/s/usg5-4-common.h
index 366d92b95a0..a9164d12bbc 100644
--- a/src/s/usg5-4-common.h
+++ b/src/s/usg5-4-common.h
@@ -107,5 +107,3 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* This definition was suggested for next release.  So give it a try.  */
 #define HAVE_SOCKETS
 
-/* arch-tag: 1a0ed909-5faa-434b-b7c3-9d86c63d53a6
-   (do not change this comment) */