Merge from mainline.

author: Paul Eggert 2011-01-17 11:01:01 -0800
committer: Paul Eggert 2011-01-17 11:01:01 -0800
commit: a3e44e793796153ff1534be9c74fcab50b45de30 (patch)
tree: 863d5db087c8e034c96d06ea955515f4d3f3d0a3 /src
parent: 7f818df9420a1320539f7e3e633003573a570413 (diff)
parent: 721be9cd4865e9f7d68020adcfa672d2edd52b07 (diff)
download: emacs-a3e44e793796153ff1534be9c74fcab50b45de30.tar.gz
emacs-a3e44e793796153ff1534be9c74fcab50b45de30.zip
209 files changed, 128 insertions, 451 deletions
diff --git a/src/.gitignore b/src/.gitignore
index c0a9b2cf132..070a38fea54 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -5,5 +5,3 @@ stamp_BLD
 oo/
 oo-spd/
-# arch-tag: 0648c91e-6070-4cc5-a029-cade1f8b6098
diff --git a/src/ChangeLog b/src/ChangeLog
index 2265f12138e..8f3c4056495 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,4 +1,4 @@
-2011-01-11  Paul Eggert  <eggert@cs.ucla.edu>
+2011-01-17  Paul Eggert  <eggert@cs.ucla.edu>
        Give a name FLOAT_TO_STRING_BUFSIZE to the constant 350.
        * lisp.h (FLOAT_TO_STRING_BUFSIZE): New macro.
@@ -33,6 +33,14 @@
        ($(lib)/libgnu.a): New rule.
        (temacs$(EXEEXT)): Also link $(lib)/libgnu.a.
+2011-01-15  Martin Rudalics  <rudalics@gmx.at>
+        * window.c (inhibit_point_swap): New variable.
+        (Fselect_window): If inhibit_point_swap is nonzero, avoid swapping
+        point this time.
+        (Fset_window_configuration): Set inhibit_point_swap to 1 instead
+        of setting selected_window to nil (Bug#7728).
 2011-01-11  Tassilo Horn  <tassilo@member.fsf.org>
        * image.c (imagemagick_load_image, Finit_image_library): Free
@@ -29539,7 +29547,8 @@ See ChangeLog.10 for earlier changes.
 ;; coding: utf-8
 ;; End:
-    Copyright (C) 2007, 2008, 2009, 2010, 2011  Free Software Foundation, Inc.
+  Copyright (C) 2007, 2008, 2009, 2010, 2011
+    Free Software Foundation, Inc.
  This file is part of GNU Emacs.
diff --git a/src/ChangeLog.1 b/src/ChangeLog.1
index b1dca3c0ca1..9cb3e5ec18b 100644
--- a/src/ChangeLog.1
+++ b/src/ChangeLog.1
@@ -3539,4 +3539,3 @@
  You should have received a copy of the GNU General Public License
  along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-;;; arch-tag: 2d2c1086-b0a5-437c-bc58-fb38ce2e0f9b
diff --git a/src/ChangeLog.10 b/src/ChangeLog.10
index 28409d9be62..133f5e6029d 100644
--- a/src/ChangeLog.10
+++ b/src/ChangeLog.10
@@ -27930,4 +27930,3 @@ See ChangeLog.9 for earlier changes.
  You should have received a copy of the GNU General Public License
  along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-;;; arch-tag: 5dcc435f-4038-4141-b3bf-5be51cd76bd4
diff --git a/src/ChangeLog.2 b/src/ChangeLog.2
index ace0a064a81..94d166f0c54 100644
--- a/src/ChangeLog.2
+++ b/src/ChangeLog.2
@@ -4789,4 +4789,3 @@ See ChangeLog.1 for earlier changes.
  You should have received a copy of the GNU General Public License
  along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-;;; arch-tag: 3334fc8a-ec24-4601-99fc-4c8adc2b31bb
diff --git a/src/ChangeLog.3 b/src/ChangeLog.3
index cf336ca3eab..f44c214f56b 100644
--- a/src/ChangeLog.3
+++ b/src/ChangeLog.3
@@ -16525,4 +16525,3 @@ See ChangeLog.2 for earlier changes.
  You should have received a copy of the GNU General Public License
  along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-;;; arch-tag: 136a8e5c-4f83-403b-9132-874f1c47f8a9
diff --git a/src/ChangeLog.4 b/src/ChangeLog.4
index a50f6c3842e..925c65a7cab 100644
--- a/src/ChangeLog.4
+++ b/src/ChangeLog.4
@@ -6924,4 +6924,3 @@ See ChangeLog.3 for earlier changes.
  You should have received a copy of the GNU General Public License
  along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-;;; arch-tag: 2e44924a-e45a-4129-ad93-1f7bb410b609
diff --git a/src/ChangeLog.5 b/src/ChangeLog.5
index 4ac6e225053..a1d241b8f86 100644
--- a/src/ChangeLog.5
+++ b/src/ChangeLog.5
@@ -7166,4 +7166,3 @@ See ChangeLog.4 for earlier changes.
  You should have received a copy of the GNU General Public License
  along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-;;; arch-tag: aea244d6-d513-4b51-8dba-5ecdf1aa5875
diff --git a/src/ChangeLog.6 b/src/ChangeLog.6
index 5b37df5209d..44452aa6222 100644
--- a/src/ChangeLog.6
+++ b/src/ChangeLog.6
@@ -5372,4 +5372,3 @@ See ChangeLog.5 for earlier changes.
  You should have received a copy of the GNU General Public License
  along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-;;; arch-tag: 66a98e1c-2268-45e8-8a57-286b9c85a4e9
diff --git a/src/ChangeLog.7 b/src/ChangeLog.7
index 9f2ce1f90ff..540eaa0cc72 100644
--- a/src/ChangeLog.7
+++ b/src/ChangeLog.7
@@ -11110,4 +11110,3 @@ See ChangeLog.6 for earlier changes.
  You should have received a copy of the GNU General Public License
  along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-;;; arch-tag: 3b03e091-1123-4031-b67d-41683932cc48
diff --git a/src/ChangeLog.8 b/src/ChangeLog.8
index 719c77f44ab..8bdc4d492b6 100644
--- a/src/ChangeLog.8
+++ b/src/ChangeLog.8
@@ -13997,4 +13997,3 @@ See ChangeLog.7 for earlier changes.
  You should have received a copy of the GNU General Public License
  along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-;;; arch-tag: 4d73444a-8f6e-4255-92a6-d3abc438b8d3
diff --git a/src/README b/src/README
index 354f1bf07ac..238e69308f3 100644
--- a/src/README
+++ b/src/README
@@ -1,5 +1,5 @@
-Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-  Free Software Foundation, Inc.
+  2010, 2011  Free Software Foundation, Inc.
 See the end of the file for license conditions.
diff --git a/src/alloc.c b/src/alloc.c
index 9a249e679b7..59d8f887c05 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -6315,5 +6315,3 @@ The time is in seconds as a floating point value.  */);
 #endif
 }
-/* arch-tag: 6695ca10-e3c5-4c2c-8bc3-ed26a7dda857
-   (do not change this comment) */
diff --git a/src/atimer.c b/src/atimer.c
index 5ecf45d0bf0..aff506a9f70 100644
--- a/src/atimer.c
+++ b/src/atimer.c
@@ -444,5 +444,3 @@ init_atimer (void)
  signal (SIGALRM, alarm_signal_handler);
 }
-/* arch-tag: e6308261-eec6-404b-89fb-6e5909518d70
-   (do not change this comment) */
diff --git a/src/atimer.h b/src/atimer.h
index ca19c767186..eeba657703e 100644
--- a/src/atimer.h
+++ b/src/atimer.h
@@ -82,5 +82,3 @@ Lisp_Object unwind_stop_other_atimers (Lisp_Object);
 #endif /* EMACS_ATIMER_H */
-/* arch-tag: 02c7c1c8-45bd-4222-b874-4ca44662f60b
-   (do not change this comment) */
diff --git a/src/bidi.c b/src/bidi.c
index 1f14f6ab840..39142e0f4dc 100644
--- a/src/bidi.c
+++ b/src/bidi.c
@@ -1,5 +1,5 @@
 /* Low-level bidirectional buffer-scanning functions for GNU Emacs.
-   Copyright (C) 2000, 2001, 2004, 2005, 2009, 2010
+   Copyright (C) 2000, 2001, 2004, 2005, 2009, 2010, 2011
   Free Software Foundation, Inc.
 This file is part of GNU Emacs.
diff --git a/src/blockinput.h b/src/blockinput.h
index 75f8c9cbc84..daa8e472218 100644
--- a/src/blockinput.h
+++ b/src/blockinput.h
@@ -126,5 +126,3 @@ extern void reinvoke_input_signal (void);
 #endif /* EMACS_BLOCKINPUT_H */
-/* arch-tag: 51a9ec86-945a-4966-8f04-2d1341250e03
-   (do not change this comment) */
diff --git a/src/buffer.c b/src/buffer.c
index 58e2702ec74..24f653b761b 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -1,8 +1,8 @@
 /* Buffer manipulation primitives for GNU Emacs.
-   Copyright (C) 1985, 1986, 1987, 1988, 1989, 1993, 1994,
-                 1995, 1997, 1998, 1999, 2000, 2001, 2002,
+Copyright (C) 1985, 1986, 1987, 1988, 1989, 1993, 1994, 1995, 1997,
-                 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+  1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-                 Free Software Foundation, Inc.
+  2009, 2010, 2011  Free Software Foundation, Inc.
 This file is part of GNU Emacs.
diff --git a/src/buffer.h b/src/buffer.h
index cdc5fba58a8..570d7f1a64e 100644
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -1,6 +1,7 @@
 /* Header file for the buffer manipulation primitives.
-   Copyright (C) 1985, 1986, 1993, 1994, 1995, 1997, 1998, 1999, 2000, 2001,
-                 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+Copyright (C) 1985, 1986, 1993, 1994, 1995, 1997, 1998, 1999, 2000,
+  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/bytecode.c b/src/bytecode.c
index b04d71a20d5..cd6f4a93143 100644
--- a/src/bytecode.c
+++ b/src/bytecode.c
@@ -1713,5 +1713,3 @@ integer, it is incremented each time that symbol's function is called.  */);
 #endif
 }
-/* arch-tag: b9803b6f-1ed6-4190-8adf-33fd3a9d10e9
-   (do not change this comment) */
diff --git a/src/callint.c b/src/callint.c
index f22a7f6531f..338e8665e7d 100644
--- a/src/callint.c
+++ b/src/callint.c
@@ -981,5 +981,3 @@ a way to turn themselves off when a mouse command switches windows.  */);
  defsubr (&Sprefix_numeric_value);
 }
-/* arch-tag: a3a7cad7-bcac-42ce-916e-1bd2546ebf37
-   (do not change this comment) */
diff --git a/src/casefiddle.c b/src/casefiddle.c
index 907eaf58ddb..8dc985512dd 100644
--- a/src/casefiddle.c
+++ b/src/casefiddle.c
@@ -443,5 +443,3 @@ keys_of_casefiddle (void)
  initial_define_key (meta_map, 'c', "capitalize-word");
 }
-/* arch-tag: 60a73c66-5489-47e7-a81f-cead4057c526
-   (do not change this comment) */
diff --git a/src/casetab.c b/src/casetab.c
index ae2775930c6..87928bd98cb 100644
--- a/src/casetab.c
+++ b/src/casetab.c
@@ -304,5 +304,3 @@ syms_of_casetab (void)
  defsubr (&Sset_standard_case_table);
 }
-/* arch-tag: e06388ad-99fe-40ec-ba67-9d010fcc4916
-   (do not change this comment) */
diff --git a/src/category.c b/src/category.c
index dcbe2cf3589..b8de8eb216b 100644
--- a/src/category.c
+++ b/src/category.c
@@ -542,5 +542,3 @@ See the documentation of the variable `word-combining-categories'.  */);
  category_table_version = 0;
 }
-/* arch-tag: 74ebf524-121b-4d9c-bd68-07f8d708b211
-   (do not change this comment) */
diff --git a/src/category.h b/src/category.h
index 8968840fd6d..561b06b6f60 100644
--- a/src/category.h
+++ b/src/category.h
@@ -116,5 +116,3 @@ extern Lisp_Object _temp_category_set;
 extern int word_boundary_p (int, int);
 extern void set_category_set (Lisp_Object, Lisp_Object, Lisp_Object);
-/* arch-tag: 309dfe83-c3e2-4d22-8e81-faae5aece0ff
-   (do not change this comment) */
diff --git a/src/ccl.c b/src/ccl.c
index 98ff4667af5..cb097f6ee98 100644
--- a/src/ccl.c
+++ b/src/ccl.c
@@ -2352,5 +2352,3 @@ used by CCL.  */);
  defsubr (&Sregister_code_conversion_map);
 }
-/* arch-tag: bb9a37be-68ce-4576-8d3d-15d750e4a860
-   (do not change this comment) */
diff --git a/src/ccl.h b/src/ccl.h
index 79b3eadb992..8f2608fd5aa 100644
--- a/src/ccl.h
+++ b/src/ccl.h
@@ -124,5 +124,3 @@ EXFUN (Fccl_program_p, 1);
 #endif /* EMACS_CCL_H */
-/* arch-tag: 14681df7-876d-43de-bc71-6b78e23a4e3c
-   (do not change this comment) */
diff --git a/src/character.c b/src/character.c
index e62e283db2e..c9088a3a258 100644
--- a/src/character.c
+++ b/src/character.c
@@ -1141,5 +1141,3 @@ See The Unicode Standard for the meaning of those values.  */);
 #endif /* emacs */
-/* arch-tag: b6665960-3c3d-4184-85cd-af4318197999
-   (do not change this comment) */
diff --git a/src/character.h b/src/character.h
index c8bcb9f4877..4edeb7471fb 100644
--- a/src/character.h
+++ b/src/character.h
@@ -644,5 +644,3 @@ extern Lisp_Object Vscript_representative_chars;
 #endif /* EMACS_CHARACTER_H */
-/* arch-tag: 4ef86004-2eff-4073-8cea-cfcbcf7188ac
-   (do not change this comment) */
diff --git a/src/charset.c b/src/charset.c
index 7ab9197bec4..ede6bebe9d6 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -2443,5 +2443,3 @@ the value may be a list of mnemonics.  */);
 #endif /* emacs */
-/* arch-tag: 66a89b8d-4c28-47d3-9ca1-56f78440d69f
-   (do not change this comment) */
diff --git a/src/charset.h b/src/charset.h
index 1dbeab0fcb4..f35945aab0a 100644
--- a/src/charset.h
+++ b/src/charset.h
@@ -546,5 +546,3 @@ extern void map_charset_chars (void (*) (Lisp_Object, Lisp_Object),
 #endif /* EMACS_CHARSET_H */
-/* arch-tag: 3b96db55-4961-481d-ac3e-219f46a2b3aa
-   (do not change this comment) */
diff --git a/src/chartab.c b/src/chartab.c
index 84b06e1a6fd..cd8aa784eb4 100644
--- a/src/chartab.c
+++ b/src/chartab.c
@@ -1013,5 +1013,3 @@ syms_of_chartab (void)
  defsubr (&Smap_char_table);
 }
-/* arch-tag: 18b5b560-7ab5-4108-b09e-d5dd65dc6fda
-   (do not change this comment) */
diff --git a/src/cm.c b/src/cm.c
index 0eb34ab3869..5ef4e504584 100644
--- a/src/cm.c
+++ b/src/cm.c
@@ -462,5 +462,3 @@ Wcm_init (struct tty_display_info *tty)
  return 0;
 }
-/* arch-tag: bcf64c02-00f6-44ef-94b6-c56eab5b3dc4
-   (do not change this comment) */
diff --git a/src/cm.h b/src/cm.h
index d34f432b681..71aafe69187 100644
--- a/src/cm.h
+++ b/src/cm.h
@@ -170,5 +170,3 @@ extern void cmgoto (struct tty_display_info *, int, int);
 extern void Wcm_clear (struct tty_display_info *);
 extern int Wcm_init (struct tty_display_info *);
-/* arch-tag: acc1535a-7136-49d6-b22d-9bc85702251b
-   (do not change this comment) */
diff --git a/src/cmds.c b/src/cmds.c
index 21175e51cd2..3782e393231 100644
--- a/src/cmds.c
+++ b/src/cmds.c
@@ -561,5 +561,3 @@ keys_of_cmds (void)
  initial_define_key (global_map, Ctl ('F'), "forward-char");
 }
-/* arch-tag: 022ba3cd-67f9-4978-9c5d-7d2b18d8644e
-   (do not change this comment) */
diff --git a/src/coding.c b/src/coding.c
index 38fb55366df..5f9b207c6b3 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -10902,5 +10902,3 @@ emacs_strerror (int error_number)
 #endif /* emacs */
-/* arch-tag: 3a3a2b01-5ff6-4071-9afe-f5b808d9229d
-   (do not change this comment) */
diff --git a/src/coding.h b/src/coding.h
index 0ddc08d139c..e424ab72fa4 100644
--- a/src/coding.h
+++ b/src/coding.h
@@ -830,5 +830,3 @@ extern int emacs_mule_string_char (unsigned char *);
 #endif /* EMACS_CODING_H */
-/* arch-tag: 2bc3b4fa-6870-4f64-8135-b962b2d290e4
-   (do not change this comment) */
diff --git a/src/commands.h b/src/commands.h
index c2150508f4b..154e5cb4978 100644
--- a/src/commands.h
+++ b/src/commands.h
@@ -100,5 +100,3 @@ extern int update_mode_lines;
 extern int cursor_in_echo_area;
-/* arch-tag: 4f7ca0b7-6a56-4b20-8bf5-b67a99921d1d
-   (do not change this comment) */
diff --git a/src/composite.c b/src/composite.c
index ab1c11a0f70..92bedcc5f2b 100644
--- a/src/composite.c
+++ b/src/composite.c
@@ -2041,5 +2041,3 @@ See also the documentation of `auto-composition-mode'.  */);
  defsubr (&Scomposition_get_gstring);
 }
-/* arch-tag: 79cefaf8-ca48-4eed-97e5-d5afb290d272
-   (do not change this comment) */
diff --git a/src/composite.h b/src/composite.h
index 9559700d382..f36b55214c8 100644
--- a/src/composite.h
+++ b/src/composite.h
@@ -326,5 +326,3 @@ EXFUN (Fcomposition_get_gstring, 4);
 #endif /* not EMACS_COMPOSITE_H */
-/* arch-tag: 59524d89-c645-47bd-b5e6-65e861690118
-   (do not change this comment) */
diff --git a/src/data.c b/src/data.c
index 603801b1739..0a2d4b855de 100644
--- a/src/data.c
+++ b/src/data.c
@@ -3338,5 +3338,3 @@ init_data (void)
 #endif /* uts */
 }
-/* arch-tag: 25879798-b84d-479a-9c89-7d148e2109f7
-   (do not change this comment) */
diff --git a/src/dbusbind.c b/src/dbusbind.c
index 0c59c08f5b7..ba82ee3ec61 100644
--- a/src/dbusbind.c
+++ b/src/dbusbind.c
@@ -2360,5 +2360,3 @@ be called when the D-Bus reply message arrives.  */);
 #endif /* HAVE_DBUS */
-/* arch-tag: 0e828477-b571-4fe4-b559-5c9211bc14b8
-   (do not change this comment) */
diff --git a/src/deps.mk b/src/deps.mk
index eb7dfedd3b6..d05e1b4a901 100644
--- a/src/deps.mk
+++ b/src/deps.mk
@@ -1,7 +1,7 @@
 ### deps.mk --- src/Makefile fragment for GNU Emacs
 ## Copyright (C) 1985, 1987, 1988, 1993, 1994, 1995, 1999, 2000, 2001, 2002,
-##   2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+##   2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
 ##   Free Software Foundation, Inc.
 ## This file is part of GNU Emacs.
diff --git a/src/dired.c b/src/dired.c
index 0f91ccbfbf1..7fe2cbf3014 100644
--- a/src/dired.c
+++ b/src/dired.c
@@ -1104,5 +1104,3 @@ ends in a slash.  */);
  Vcompletion_ignored_extensions = Qnil;
 }
-/* arch-tag: 1ac8deca-4d8f-4d41-ade9-089154d98c03
-   (do not change this comment) */
diff --git a/src/dispextern.h b/src/dispextern.h
index 6ab5ebcda35..f4f1164b696 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -3401,5 +3401,3 @@ extern Lisp_Object x_default_parameter (struct frame *, Lisp_Object,
 #endif /* not DISPEXTERN_H_INCLUDED */
-/* arch-tag: c65c475f-1c1e-4534-8795-990b8509fd65
-   (do not change this comment) */
diff --git a/src/dispnew.c b/src/dispnew.c
index eb632aeb264..83ffd6a5774 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -6646,5 +6646,3 @@ If nil, never pre-empt redisplay.  */);
    }
 }
-/* arch-tag: 8d812b1f-04a2-4195-a9c4-381f8457a413
-   (do not change this comment) */
diff --git a/src/disptab.h b/src/disptab.h
index 0445a8f867c..14e406a7425 100644
--- a/src/disptab.h
+++ b/src/disptab.h
@@ -104,5 +104,3 @@ extern Lisp_Object Vglyph_table;
 #define SET_GLYPH_FROM_CHAR(glyph, c) \
  SET_GLYPH (glyph, c, DEFAULT_FACE_ID)
-/* arch-tag: d7f792d2-f59c-4904-a91e-91522e3ab349
-   (do not change this comment) */
diff --git a/src/doc.c b/src/doc.c
index d5f8099603c..38deed1bbf4 100644
--- a/src/doc.c
+++ b/src/doc.c
@@ -944,5 +944,3 @@ syms_of_doc (void)
  defsubr (&Ssubstitute_command_keys);
 }
-/* arch-tag: 56281d4d-6949-43e2-be2e-f6517de744ba
-   (do not change this comment) */
diff --git a/src/doprnt.c b/src/doprnt.c
index 6b07a68c0bc..16565ff703a 100644
--- a/src/doprnt.c
+++ b/src/doprnt.c
@@ -279,5 +279,3 @@ doprnt (char *buffer, register int bufsize, const char *format,
  return bufptr - buffer;
 }
-/* arch-tag: aa0ab528-7c5f-4c73-894c-aa2526a1efb3
-   (do not change this comment) */
diff --git a/src/dosfns.c b/src/dosfns.c
index eb3983a51bc..1724e7d1de6 100644
--- a/src/dosfns.c
+++ b/src/dosfns.c
@@ -781,5 +781,3 @@ If zero, the decimal point key returns the country code specific value.  */);
 }
 #endif /* MSDOS */
-/* arch-tag: f5ea8847-a014-42c9-83f5-7738ad640b17
-   (do not change this comment) */
diff --git a/src/dosfns.h b/src/dosfns.h
index e5f179302bf..839b67184e2 100644
--- a/src/dosfns.h
+++ b/src/dosfns.h
@@ -43,5 +43,3 @@ extern Lisp_Object msdos_stdcolor_name (int);
 extern void        x_set_title (struct frame *, Lisp_Object);
 #endif
-/* arch-tag: a83b8c4c-63c8-451e-9e94-bc72e3e2f8bc
-   (do not change this comment) */
diff --git a/src/editfns.c b/src/editfns.c
index 73abf779110..e7da96265bf 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -4693,5 +4693,3 @@ functions if all the text being accessed has this property.  */);
  defsubr (&Stranspose_regions);
 }
-/* arch-tag: fc3827d8-6f60-4067-b11e-c3218031b018
-   (do not change this comment) */
diff --git a/src/emacs-icon.h b/src/emacs-icon.h
index c11c26ee55a..59840105f59 100644
--- a/src/emacs-icon.h
+++ b/src/emacs-icon.h
@@ -351,5 +351,3 @@ static unsigned char gnu_xbm_bits[] = {
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
   0x00, 0x00};
-/* arch-tag: b57020c7-c937-4d77-8ca6-3875178d9828
-   (do not change this comment) */
diff --git a/src/epaths.in b/src/epaths.in
index 67b6c23bbd0..b6c9b4cd494 100644
--- a/src/epaths.in
+++ b/src/epaths.in
@@ -59,5 +59,3 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Where Emacs should look for the application default file. */
 #define PATH_X_DEFAULTS "/usr/lib/X11/%L/%T/%N%C%S:/usr/lib/X11/%l/%T/%N%C%S:/usr/lib/X11/%T/%N%C%S:/usr/lib/X11/%L/%T/%N%S:/usr/lib/X11/%l/%T/%N%S:/usr/lib/X11/%T/%N%S"
-/* arch-tag: d30686c4-629c-4666-9499-beaa69f1641e
-   (do not change this comment) */
diff --git a/src/eval.c b/src/eval.c
index cd06b147c28..709a54fc2ec 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -1,7 +1,7 @@
 /* Evaluator for GNU Emacs Lisp interpreter.
   Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1999, 2000, 2001,
-                 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+                 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-                 Free Software Foundation, Inc.
+                 2011  Free Software Foundation, Inc.
 This file is part of GNU Emacs.
@@ -3699,5 +3699,3 @@ The value the function returns is not used.  */);
  defsubr (&Sbacktrace_frame);
 }
-/* arch-tag: 014a07aa-33ab-4a8f-a3d2-ee8a4a9ff7fb
-   (do not change this comment) */
diff --git a/src/fileio.c b/src/fileio.c
index f4f90658d3a..2a415d2d697 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -1,7 +1,8 @@
 /* File IO for GNU Emacs.
-   Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1996,
-                 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1996, 1997,
-                 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+  1998, 1999, 2000, 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/filelock.c b/src/filelock.c
index 02c5eb05ac9..6ef3a4973d5 100644
--- a/src/filelock.c
+++ b/src/filelock.c
@@ -743,5 +743,3 @@ syms_of_filelock (void)
 #endif
 }
-/* arch-tag: e062676d-50b2-4be0-ab96-197c81b181a1
-   (do not change this comment) */
diff --git a/src/filemode.c b/src/filemode.c
index 5e175eaf432..a1fc388638b 100644
--- a/src/filemode.c
+++ b/src/filemode.c
@@ -244,5 +244,3 @@ setst (short unsigned int bits, char *chars)
 #endif
 }
-/* arch-tag: 4340830c-15a5-47d2-b45f-1d43c45a91bb
-   (do not change this comment) */
diff --git a/src/firstfile.c b/src/firstfile.c
index f6885e38a49..7fb19c4d5b8 100644
--- a/src/firstfile.c
+++ b/src/firstfile.c
@@ -32,5 +32,3 @@ extern int initialized;
 static int * dummy = &initialized;
 #endif
-/* arch-tag: a6c0d2dd-00c3-4ba5-95a5-9c8ab82f39b2
-   (do not change this comment) */
diff --git a/src/floatfns.c b/src/floatfns.c
index 126f1171865..2b26347cc16 100644
--- a/src/floatfns.c
+++ b/src/floatfns.c
@@ -1074,5 +1074,3 @@ syms_of_floatfns (void)
  defsubr (&Struncate);
 }
-/* arch-tag: be05bf9d-049e-4e31-91b9-e6153d483ae7
-   (do not change this comment) */
diff --git a/src/fns.c b/src/fns.c
index cd95f6c27fd..17c65d7f050 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -4945,5 +4945,3 @@ init_fns (void)
 {
 }
-/* arch-tag: 787f8219-5b74-46bd-8469-7e1cc475fa31
-   (do not change this comment) */
diff --git a/src/font.c b/src/font.c
index 667a23e4b56..6ab349e763d 100644
--- a/src/font.c
+++ b/src/font.c
@@ -1,5 +1,7 @@
 /* font.c -- "Font" primitives.
-   Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011
+  Free Software Foundation, Inc.
   Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011
     National Institute of Advanced Industrial Science and Technology (AIST)
     Registration Number H13PRO009
diff --git a/src/font.h b/src/font.h
index ea0913f493e..55435f94899 100644
--- a/src/font.h
+++ b/src/font.h
@@ -873,5 +873,3 @@ extern void font_deferred_log (const char *, Lisp_Object, Lisp_Object);
 #endif  /* not EMACS_FONT_H */
-/* arch-tag: 3b7260c3-5bec-4d6b-a0db-95c1b431b1a2
-   (do not change this comment) */
diff --git a/src/fontset.c b/src/fontset.c
index fbfd89f619c..c38b01d4725 100644
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -2264,5 +2264,3 @@ at the vertical center of lines.  */);
 #endif
 }
-/* arch-tag: ea861585-2f5f-4e5b-9849-d04a9c3a3537
-   (do not change this comment) */
diff --git a/src/fontset.h b/src/fontset.h
index 3ad4fc4ed05..15c81aa1850 100644
--- a/src/fontset.h
+++ b/src/fontset.h
@@ -60,5 +60,3 @@ extern int face_for_font (struct frame *, Lisp_Object, struct face *);
 #endif /* EMACS_FONTSET_H */
-/* arch-tag: c27cef7b-3cab-488a-8398-7a4daa96bb77
-   (do not change this comment) */
diff --git a/src/frame.c b/src/frame.c
index d1c5065ee8c..ac15dedf716 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -1,6 +1,8 @@
 /* Generic frame functions.
   Copyright (C) 1993, 1994, 1995, 1997, 1999, 2000, 2001, 2002, 2003,
-     2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+  2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+  Free Software Foundation, Inc.
 This file is part of GNU Emacs.
diff --git a/src/frame.h b/src/frame.h
index 36b19c4d29a..dfd30ab8140 100644
--- a/src/frame.h
+++ b/src/frame.h
@@ -1163,5 +1163,3 @@ extern void set_frame_menubar (FRAME_PTR, int, int);
 #endif /* not EMACS_FRAME_H */
-/* arch-tag: 0df048ee-e6bf-4f48-bd56-e3cd055dd8c4
-   (do not change this comment) */
diff --git a/src/fringe.c b/src/fringe.c
index 45d6ecfa4b7..2b5148e3675 100644
--- a/src/fringe.c
+++ b/src/fringe.c
@@ -1847,5 +1847,3 @@ w32_reset_fringes (void)
 #endif /* HAVE_WINDOW_SYSTEM */
-/* arch-tag: 04596920-43eb-473d-b319-82712338162d
-   (do not change this comment) */
diff --git a/src/ftfont.c b/src/ftfont.c
index ffa90ef8ee4..372160dc0f6 100644
--- a/src/ftfont.c
+++ b/src/ftfont.c
@@ -2676,5 +2676,3 @@ syms_of_ftfont (void)
  register_font_driver (&ftfont_driver, NULL);
 }
-/* arch-tag: 7cfa432c-33a6-4988-83d2-a82ed8604aca
-   (do not change this comment) */
diff --git a/src/ftfont.h b/src/ftfont.h
index 38538decf0b..8c8674f3440 100644
--- a/src/ftfont.h
+++ b/src/ftfont.h
@@ -41,5 +41,3 @@ extern FcCharSet *ftfont_get_fc_charset (Lisp_Object);
 #endif  /* EMACS_FTFONT_H */
-/* arch-tag: cec13d1c-7156-4997-9ebd-e989040c3d78
-   (do not change this comment) */
diff --git a/src/ftxfont.c b/src/ftxfont.c
index 6821a4b61cb..58850bf4165 100644
--- a/src/ftxfont.c
+++ b/src/ftxfont.c
@@ -385,5 +385,3 @@ syms_of_ftxfont (void)
  register_font_driver (&ftxfont_driver, NULL);
 }
-/* arch-tag: 59bd3469-5330-413f-b29d-1aa36492abe8
-   (do not change this comment) */
diff --git a/src/getloadavg.c b/src/getloadavg.c
index 3b25e691166..d9c24717b79 100644
--- a/src/getloadavg.c
+++ b/src/getloadavg.c
@@ -1035,5 +1035,3 @@ main (argc, argv)
 }
 #endif /* TEST */
-/* arch-tag: 2b37a242-6289-41f4-8cd5-0e73fd615db1
-   (do not change this comment) */
diff --git a/src/getpagesize.h b/src/getpagesize.h
index 174e5c4667c..2c134dfa021 100644
--- a/src/getpagesize.h
+++ b/src/getpagesize.h
@@ -47,5 +47,3 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #endif /* no HAVE_GETPAGESIZE */
-/* arch-tag: ff6206e3-97e2-4763-923a-e84bf28eabbc
-   (do not change this comment) */
diff --git a/src/gmalloc.c b/src/gmalloc.c
index 7a5e95c7435..5237432872d 100644
--- a/src/gmalloc.c
+++ b/src/gmalloc.c
@@ -2171,5 +2171,3 @@ mprobe (__ptr_t ptr)
 #endif /* GC_MCHECK */
-/* arch-tag: 93dce5c0-f49a-41b5-86b1-f91c4169c02e
-   (do not change this comment) */
diff --git a/src/gnutls.c b/src/gnutls.c
index 1cc258a5096..1872d6cc340 100644
--- a/src/gnutls.c
+++ b/src/gnutls.c
@@ -1,5 +1,5 @@
 /* GnuTLS glue for GNU Emacs.
-   Copyright (C) 2010  Free Software Foundation, Inc.
+   Copyright (C) 2010, 2011  Free Software Foundation, Inc.
 This file is part of GNU Emacs.
diff --git a/src/gnutls.h b/src/gnutls.h
index 2669317e97a..d22dee9072b 100644
--- a/src/gnutls.h
+++ b/src/gnutls.h
@@ -1,5 +1,5 @@
 /* GnuTLS glue for GNU Emacs.
-   Copyright (C) 2010  Free Software Foundation, Inc.
+   Copyright (C) 2010, 2011  Free Software Foundation, Inc.
 This file is part of GNU Emacs.
diff --git a/src/gtkutil.c b/src/gtkutil.c
index e6141de1d27..52512687a07 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -4573,5 +4573,3 @@ xg_initialize (void)
 #endif /* USE_GTK */
-/* arch-tag: fe7104da-bc1e-4aba-9bd1-f349c528f7e3
-   (do not change this comment) */
diff --git a/src/gtkutil.h b/src/gtkutil.h
index 05853226084..78df4fe7863 100644
--- a/src/gtkutil.h
+++ b/src/gtkutil.h
@@ -185,5 +185,3 @@ extern int xg_ignore_gtk_scrollbar;
 #endif /* USE_GTK */
 #endif /* GTKUTIL_H */
-/* arch-tag: 0757f3dc-00c7-4cee-9e4c-282cf1d34c72
-   (do not change this comment) */
diff --git a/src/image.c b/src/image.c
index 023c9763abd..b5b1843ed94 100644
--- a/src/image.c
+++ b/src/image.c
@@ -8905,5 +8905,3 @@ init_image (void)
 {
 }
-/* arch-tag: 123c2a5e-14a8-4c53-ab95-af47d7db49b9
-   (do not change this comment) */
diff --git a/src/indent.c b/src/indent.c
index 28c52f652c8..93c2b5237d3 100644
--- a/src/indent.c
+++ b/src/indent.c
@@ -2171,5 +2171,3 @@ syms_of_indent (void)
  defsubr (&Scompute_motion);
 }
-/* arch-tag: 9adfea44-71f7-4988-8ee3-96da15c502cc
-   (do not change this comment) */
diff --git a/src/indent.h b/src/indent.h
index e1e9a1c96e1..9f5a9f56f1e 100644
--- a/src/indent.h
+++ b/src/indent.h
@@ -76,5 +76,3 @@ void recompute_width_table (struct buffer *buf,
                            struct Lisp_Char_Table *disptab);
-/* arch-tag: f9feb373-5bff-4f4f-9198-94805d00cfd7
-   (do not change this comment) */
diff --git a/src/intervals.c b/src/intervals.c
index 5be579467c0..f3b946ef413 100644
--- a/src/intervals.c
+++ b/src/intervals.c
@@ -2565,5 +2565,3 @@ set_intervals_multibyte (int multi_flag)
                               BEG, BEG_BYTE, Z, Z_BYTE);
 }
-/* arch-tag: 3d402b60-083c-4271-b4a3-ebd9a74bfe27
-   (do not change this comment) */
diff --git a/src/intervals.h b/src/intervals.h
index 1ef80be9c8a..14efe74f420 100644
--- a/src/intervals.h
+++ b/src/intervals.h
@@ -346,5 +346,3 @@ extern void syms_of_textprop (void);
 #include "composite.h"
-/* arch-tag: f0bc16c0-b084-498d-9de4-21cc8f077795
-   (do not change this comment) */
diff --git a/src/keymap.c b/src/keymap.c
index 4c7af8a203b..e37b0f18e64 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -4013,5 +4013,3 @@ keys_of_keymap (void)
  initial_define_key (global_map, Ctl ('X'), "Control-X-prefix");
 }
-/* arch-tag: 6dd15c26-7cf1-41c4-b904-f42f7ddda463
-   (do not change this comment) */
diff --git a/src/keymap.h b/src/keymap.h
index 2765799f168..931da76e555 100644
--- a/src/keymap.h
+++ b/src/keymap.h
@@ -58,5 +58,3 @@ extern void map_keymap_canonical (Lisp_Object map,
 #endif
-/* arch-tag: 7400d5a1-ef0b-43d0-b366-f4d678bf3ba2
-   (do not change this comment) */
diff --git a/src/lastfile.c b/src/lastfile.c
index 4e6517e85e1..867ed5a2f7c 100644
--- a/src/lastfile.c
+++ b/src/lastfile.c
@@ -49,5 +49,3 @@ char my_endbss[1];
 static char _my_endbss[1];
 char * my_endbss_static = _my_endbss;
-/* arch-tag: 67e81ab4-e14f-44b2-8875-c0c12252223e
-   (do not change this comment) */
diff --git a/src/m/alpha.h b/src/m/alpha.h
index d6d4202cb3b..c4981a89762 100644
--- a/src/m/alpha.h
+++ b/src/m/alpha.h
@@ -59,5 +59,3 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
   this avoids the assembler bug.  */
 #define DBL_MIN_REPLACEMENT 2.2250738585072019e-308
-/* arch-tag: 978cb578-1e25-4a60-819b-adae0972aa78
-   (do not change this comment) */
diff --git a/src/m/amdx86-64.h b/src/m/amdx86-64.h
index 0441d4e22d5..ff3d6171db8 100644
--- a/src/m/amdx86-64.h
+++ b/src/m/amdx86-64.h
@@ -1,6 +1,7 @@
 /* machine description file for AMD x86-64.
-   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
-     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.
@@ -39,5 +40,3 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define XPNTR to avoid or'ing with DATA_SEG_BITS */
 #undef DATA_SEG_BITS
-/* arch-tag: 8a5e001d-e12e-4692-a3a6-0b15ba271c6e
-   (do not change this comment) */
diff --git a/src/m/ia64.h b/src/m/ia64.h
index 4a0d242b444..7aed9fa36df 100644
--- a/src/m/ia64.h
+++ b/src/m/ia64.h
@@ -1,6 +1,8 @@
 /* machine description file for the IA-64 architecture.
-   Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-                 2008, 2009, 2010, 2011  Free Software Foundation, Inc.
+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.
@@ -45,5 +47,3 @@ extern void r_alloc_free ();
 #endif /* not _MALLOC_INTERNAL */
 #endif /* REL_ALLOC */
-/* arch-tag: 9b8e9fb2-2e49-4c22-b68f-11a488e77c66
-   (do not change this comment) */
diff --git a/src/m/ibmrs6000.h b/src/m/ibmrs6000.h
index 12030d5dff6..13eea3d44f0 100644
--- a/src/m/ibmrs6000.h
+++ b/src/m/ibmrs6000.h
@@ -1,6 +1,7 @@
 /* R2 AIX machine/system dependent defines
-   Copyright (C) 1988, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-                 2008, 2009, 2010, 2011  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.
@@ -44,5 +45,3 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define BROKEN_SIGPTY
 #define BROKEN_SIGPOLL
-/* arch-tag: 028318ee-a7ae-4a08-804d-cc1e6588d003
-   (do not change this comment) */
diff --git a/src/m/ibms390.h b/src/m/ibms390.h
index eef6c75b150..fdcc002507c 100644
--- a/src/m/ibms390.h
+++ b/src/m/ibms390.h
@@ -33,5 +33,3 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
   numerically.  */
 #define VIRT_ADDR_VARIES
-/* arch-tag: d8a0ffa4-a8f0-4736-90d3-7fd7b21b8314
-   (do not change this comment) */
diff --git a/src/m/ibms390x.h b/src/m/ibms390x.h
index 467526fe0c6..854bcdaed07 100644
--- a/src/m/ibms390x.h
+++ b/src/m/ibms390x.h
@@ -1,7 +1,7 @@
 /* Machine description file for IBM S390 in 64-bit mode
-Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-  Free Software Foundation, Inc.
+  2011  Free Software Foundation, Inc.
 This file is part of GNU Emacs.
@@ -33,5 +33,3 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define XPNTR to avoid or'ing with DATA_SEG_BITS */
 #define XPNTR(a) XUINT (a)
-/* arch-tag: 4b87653c-6add-4663-8691-7d9dc17b5519
-   (do not change this comment) */
diff --git a/src/m/intel386.h b/src/m/intel386.h
index a05c38c05d9..732e89328fc 100644
--- a/src/m/intel386.h
+++ b/src/m/intel386.h
@@ -1,6 +1,7 @@
 /* Machine description file for intel 386.
-   Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-                 2008, 2009, 2010, 2011  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.
@@ -29,5 +30,3 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define ULIMIT_BREAK_VALUE (32*1024*1024)
 #endif
-/* arch-tag: 746338f0-cb7b-4f49-a98c-cb50817cf2ec
-   (do not change this comment) */
diff --git a/src/m/iris4d.h b/src/m/iris4d.h
index e598e6fbcba..0b1c2f360b0 100644
--- a/src/m/iris4d.h
+++ b/src/m/iris4d.h
@@ -1,6 +1,7 @@
 /* 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, 2011  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.
@@ -24,5 +25,3 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define DATA_START 0x10000000
 #define DATA_SEG_BITS   0x10000000
-/* arch-tag: fff5e139-9ae0-465d-afec-837c41ea0aa6
-   (do not change this comment) */
diff --git a/src/m/m68k.h b/src/m/m68k.h
index 6a516ca3a50..cebc2e87735 100644
--- a/src/m/m68k.h
+++ b/src/m/m68k.h
@@ -31,5 +31,3 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #endif
-/* arch-tag: 4eadd161-b4e8-4b82-82a1-e4ce7f42969d
-   (do not change this comment) */
diff --git a/src/m/macppc.h b/src/m/macppc.h
index ce708bb079f..895a6981975 100644
--- a/src/m/macppc.h
+++ b/src/m/macppc.h
@@ -1,6 +1,7 @@
 /* machine description file For the powerpc Macintosh.
-   Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-                 2008, 2009, 2010, 2011  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.
@@ -29,5 +30,3 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #endif
 #endif
-/* arch-tag: 41913e4e-e7d1-4023-aadb-210cc31712ed
-   (do not change this comment) */
diff --git a/src/m/sparc.h b/src/m/sparc.h
index c3f3ba528ec..e1eb9eedb20 100644
--- a/src/m/sparc.h
+++ b/src/m/sparc.h
@@ -1,6 +1,7 @@
 /* machine description file for Sun 4 SPARC.
-   Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-                 2008, 2009, 2010, 2011  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.
@@ -35,5 +36,3 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #endif  /* __arch64__ */
-/* arch-tag: 0a6f7882-33fd-4811-9832-7466c51e50f7
-   (do not change this comment) */
diff --git a/src/m/template.h b/src/m/template.h
index cae95a802b3..a8e9e148b53 100644
--- a/src/m/template.h
+++ b/src/m/template.h
@@ -48,5 +48,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: d7dae0a9-4f99-4939-bef9-5738e1f33955
-   (do not change this comment) */
diff --git a/src/m/vax.h b/src/m/vax.h
index 39550a42fe4..8720873236f 100644
--- a/src/m/vax.h
+++ b/src/m/vax.h
@@ -32,5 +32,3 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define HAVE_FTIME
-/* arch-tag: 508bdf7a-01a0-4ce0-8eba-0704d0df55a0
-   (do not change this comment) */
diff --git a/src/macros.c b/src/macros.c
index 835fdaec814..c8e4a6bb421 100644
--- a/src/macros.c
+++ b/src/macros.c
@@ -395,5 +395,3 @@ This is nil when not executing a keyboard macro.  */);
                 doc: /* Last kbd macro defined, as a string or vector; nil if none defined.  */);
 }
-/* arch-tag: d293fcc9-2266-4163-9198-7fa0de12ec9e
-   (do not change this comment) */
diff --git a/src/macros.h b/src/macros.h
index 6f5fa21c04e..aa8c1375070 100644
--- a/src/macros.h
+++ b/src/macros.h
@@ -52,5 +52,3 @@ extern void finalize_kbd_macro_chars (void);
 extern void store_kbd_macro_char (Lisp_Object);
-/* arch-tag: 8edb7088-682f-4d1f-a4d9-0fbb7284234e
-   (do not change this comment) */
diff --git a/src/marker.c b/src/marker.c
index 9c56e439c3d..f22b874fc8d 100644
--- a/src/marker.c
+++ b/src/marker.c
@@ -902,5 +902,3 @@ syms_of_marker (void)
  byte_debug_flag = 0;
 }
-/* arch-tag: 50aa418f-cdd0-4838-b64b-94aa4b2a3b74
-   (do not change this comment) */
diff --git a/src/md5.c b/src/md5.c
index 6e7f651189e..9d9d7d8f14f 100644
--- a/src/md5.c
+++ b/src/md5.c
@@ -428,5 +428,3 @@ md5_process_block (const void *buffer, size_t len, struct md5_ctx *ctx)
  ctx->D = D;
 }
-/* arch-tag: 60084f04-b434-42cb-9d2b-e91df01f4325
-   (do not change this comment) */
diff --git a/src/md5.h b/src/md5.h
index cf9566b864b..8ab73050379 100644
--- a/src/md5.h
+++ b/src/md5.h
@@ -146,5 +146,3 @@ extern void *md5_buffer (const char *buffer, size_t len,
 #endif /* md5.h */
-/* arch-tag: 7cd389f3-6c40-4950-999d-0b2ebd1d20d7
-   (do not change this comment) */
diff --git a/src/mem-limits.h b/src/mem-limits.h
index a5a0952998f..aff82565c3e 100644
--- a/src/mem-limits.h
+++ b/src/mem-limits.h
@@ -46,5 +46,3 @@ extern char *start_of_data (void);
 #define EXCEEDS_LISP_PTR(ptr) ((EMACS_UINT) (ptr) >> VALBITS)
 #endif
-/* arch-tag: fe39244e-e54f-4208-b7aa-02556f7841c5
-   (do not change this comment) */
diff --git a/src/menu.c b/src/menu.c
index 186bd474ec3..24df935eef6 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -1354,5 +1354,3 @@ syms_of_menu (void)
  defsubr (&Sx_popup_menu);
 }
-/* arch-tag: 78bbc7cf-8025-4156-aa8a-6c7fd99bf51d
-   (do not change this comment) */
diff --git a/src/menu.h b/src/menu.h
index dae9c92ac51..866214e7356 100644
--- a/src/menu.h
+++ b/src/menu.h
@@ -53,5 +53,3 @@ extern Lisp_Object xmenu_show (FRAME_PTR, int, int, int, int,
                               Lisp_Object, const char **, EMACS_UINT);
 #endif /* MENU_H */
-/* arch-tag: c32b2778-724d-4e85-81d7-45f98530a988
-   (do not change this comment) */
diff --git a/src/msdos.c b/src/msdos.c
index ea828d9391b..4bd933527b2 100644
--- a/src/msdos.c
+++ b/src/msdos.c
@@ -4242,5 +4242,3 @@ This variable is used only by MS-DOS terminals.  */);
 #endif /* MSDOS */
-/* arch-tag: db404e92-52a5-475f-9eb2-1cb78dd05f30
-   (do not change this comment) */
diff --git a/src/msdos.h b/src/msdos.h
index 9d4de5ad3f6..2b75e813274 100644
--- a/src/msdos.h
+++ b/src/msdos.h
@@ -113,5 +113,3 @@ void XMenuDestroy (Display *, XMenu *);
 #endif /* not EMACS_MSDOS_H */
-/* arch-tag: ad21eeed-8fdb-4357-8007-36368a6bdbf3
-   (do not change this comment) */
diff --git a/src/ndir.h b/src/ndir.h
index 92d198334b7..cd7cdbe55f5 100644
--- a/src/ndir.h
+++ b/src/ndir.h
@@ -39,5 +39,3 @@ extern void		closedir (DIR *);
 #define rewinddir( dirp )       seekdir( dirp, 0L )
-/* arch-tag: aea50570-ffb7-43fd-b423-7743b10fbe6e
-   (do not change this comment) */
diff --git a/src/ns.mk b/src/ns.mk
index d674466a407..02b7b697331 100644
--- a/src/ns.mk
+++ b/src/ns.mk
@@ -1,6 +1,6 @@
 ### autodeps.mk --- src/Makefile fragment for GNU Emacs
-## Copyright (C) 2008, 2009, 2010  Free Software Foundation, Inc.
+## Copyright (C) 2008, 2009, 2010, 2011  Free Software Foundation, Inc.
 ## This file is part of GNU Emacs.
diff --git a/src/nsfns.m b/src/nsfns.m
index 6b8276e1b87..b98f8bc815f 100644
--- a/src/nsfns.m
+++ b/src/nsfns.m
@@ -1,6 +1,7 @@
 /* Functions for the NeXT/Open/GNUstep and MacOSX window system.
-   Copyright (C) 1989, 1992, 1993, 1994, 2005, 2006, 2008, 2009, 2010, 2011
-     Free Software Foundation, Inc.
+Copyright (C) 1989, 1992, 1993, 1994, 2005, 2006, 2008, 2009, 2010,
+  2011  Free Software Foundation, Inc.
 This file is part of GNU Emacs.
diff --git a/src/nsfont.m b/src/nsfont.m
index 546c47d27a9..9dc0fb5160d 100644
--- a/src/nsfont.m
+++ b/src/nsfont.m
@@ -1521,4 +1521,3 @@ syms_of_nsfont (void)
               doc: /* Internal use: maps font registry to unicode script. */);
 }
-// arch-tag: d6c3c6f0-62de-4978-8b1e-b7966fe02cae
diff --git a/src/nsgui.h b/src/nsgui.h
index f161ba490ea..3ad9b2ce232 100644
--- a/src/nsgui.h
+++ b/src/nsgui.h
@@ -198,5 +198,3 @@ typedef struct _NSRect  { NSPoint origin; NSSize size; } NSRect;
 #endif  /* __NSGUI_H__ */
-/* arch-tag: b2af3275-62c3-45b4-9335-4c9635c67e55
-   (do not change this comment) */
diff --git a/src/nsimage.m b/src/nsimage.m
index a5bea91e633..d194a3eee0b 100644
--- a/src/nsimage.m
+++ b/src/nsimage.m
@@ -499,4 +499,3 @@ static EmacsImage *ImageList = nil;
 @end
-// arch-tag: 6b310280-6892-4e5e-8f34-41c4d384874f
diff --git a/src/nsmenu.m b/src/nsmenu.m
index 8017715b251..330a17ab6f8 100644
--- a/src/nsmenu.m
+++ b/src/nsmenu.m
@@ -1797,4 +1797,3 @@ syms_of_nsmenu (void)
  staticpro (&Qdebug_on_next_call);
 }
-// arch-tag: 75773656-52e5-4c44-a398-47bd87b32619
diff --git a/src/nsselect.m b/src/nsselect.m
index 0c941712fd2..7920918eb6e 100644
--- a/src/nsselect.m
+++ b/src/nsselect.m
@@ -609,4 +609,3 @@ The functions are called with one argument, the selection type\n\
  staticpro (&Qforeign_selection);
 }
-// arch-tag: 39d1dde7-06a6-49ff-95a7-0e7af12d2218
diff --git a/src/nsterm.h b/src/nsterm.h
index 82ee03a944f..baf567f88d6 100644
--- a/src/nsterm.h
+++ b/src/nsterm.h
@@ -812,5 +812,3 @@ extern char gnustep_base_version[];  /* version tracking */
 #endif  /* HAVE_NS */
-/* arch-tag: 0a28b142-4ac1-4a81-a243-abcd82d9c4e5
-   (do not change this comment) */
diff --git a/src/nsterm.m b/src/nsterm.m
index 821279dfdac..714b8a03d63 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -6429,4 +6429,3 @@ baseline level.  The default value is nil.  */);
 }
-// arch-tag: 6eaa8f7d-a69b-4e1c-b43d-ab31defbe0d2
diff --git a/src/pre-crt0.c b/src/pre-crt0.c
index 8abc9545417..ea5736eba2a 100644
--- a/src/pre-crt0.c
+++ b/src/pre-crt0.c
@@ -8,5 +8,3 @@
 int data_start = 0;
-/* arch-tag: 2e260272-0790-495f-9362-55abd56b5c5a
-   (do not change this comment) */
diff --git a/src/print.c b/src/print.c
index 8de27fe811f..bb9dd7102aa 100644
--- a/src/print.c
+++ b/src/print.c
@@ -2358,5 +2358,3 @@ priorities.  */);
  defsubr (&Swith_output_to_temp_buffer);
 }
-/* arch-tag: bc797170-94ae-41de-86e3-75e20f8f7a39
-   (do not change this comment) */
diff --git a/src/process.h b/src/process.h
index 396319d4414..00531d2664a 100644
--- a/src/process.h
+++ b/src/process.h
@@ -200,5 +200,3 @@ extern void delete_read_fd (int fd);
 extern void add_write_fd (int fd, fd_callback func, void *data);
 extern void delete_write_fd (int fd);
-/* arch-tag: dffedfc4-d7bc-4b58-a26f-c16155449c72
-   (do not change this comment) */
diff --git a/src/puresize.h b/src/puresize.h
index 13e5b0f0ffa..593eb3d717f 100644
--- a/src/puresize.h
+++ b/src/puresize.h
@@ -96,5 +96,3 @@ extern char my_edata[];
 #endif /* VIRT_ADDRESS_VARIES */
-/* arch-tag: fd9b0a91-a70e-4729-a75a-6bb4ca1ce14f
-   (do not change this comment) */
diff --git a/src/ralloc.c b/src/ralloc.c
index d574893ca2e..62a65c24623 100644
--- a/src/ralloc.c
+++ b/src/ralloc.c
@@ -1261,5 +1261,3 @@ r_alloc_init (void)
  use_relocatable_buffers = 1;
 }
-/* arch-tag: 6a524a15-faff-44c8-95d4-a5da6f55110f
-   (do not change this comment) */
diff --git a/src/regex.h b/src/regex.h
index f19123deab8..4785f06e4fb 100644
--- a/src/regex.h
+++ b/src/regex.h
@@ -626,5 +626,3 @@ extern void re_set_whitespace_regexp (const char *regexp);
 #endif /* regex.h */
-/* arch-tag: bda6e3ec-3c02-4237-a55a-01ad2e120083
-   (do not change this comment) */
diff --git a/src/region-cache.c b/src/region-cache.c
index 14fe119da0a..956460a19cd 100644
--- a/src/region-cache.c
+++ b/src/region-cache.c
@@ -808,5 +808,3 @@ pp_cache (struct region_cache *c)
    }
 }
-/* arch-tag: 98c29f3f-2ca2-4e3a-92f0-f2249200a17d
-   (do not change this comment) */
diff --git a/src/region-cache.h b/src/region-cache.h
index 0a63c62df66..c963e897ea2 100644
--- a/src/region-cache.h
+++ b/src/region-cache.h
@@ -110,5 +110,3 @@ extern int region_cache_backward (struct buffer *BUF,
                                  EMACS_INT POS,
                                  EMACS_INT *NEXT);
-/* arch-tag: 70f79125-ef22-4f58-9aec-a48ca2791435
-   (do not change this comment) */
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
+Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-  Free Software Foundation, Inc.
+  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,
+Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-                 2008, 2009, 2010, 2011  Free Software Foundation, Inc.
+  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) */
diff --git a/src/scroll.c b/src/scroll.c
index b91c7de034e..296e5784d0c 100644
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -1035,5 +1035,3 @@ do_line_insertion_deletion_costs (FRAME_PTR frame,
                 coefficient);
 }
-/* arch-tag: cdb7149c-48e7-4793-a948-2786c8e45485
-   (do not change this comment) */
diff --git a/src/search.c b/src/search.c
index c3584030dbb..ff2b116d7fd 100644
--- a/src/search.c
+++ b/src/search.c
@@ -3262,5 +3262,3 @@ is to bind it with `let' around a small expression.  */);
  defsubr (&Sregexp_quote);
 }
-/* arch-tag: a6059d79-0552-4f14-a2cb-d379a4e3c78f
-   (do not change this comment) */
diff --git a/src/sheap.c b/src/sheap.c
index 816c1080e98..249fcc6b7b1 100644
--- a/src/sheap.c
+++ b/src/sheap.c
@@ -94,5 +94,3 @@ report_sheap_usage (int die_if_pure_storage_exceeded)
  message ("%s", buf);
 }
-/* arch-tag: 1bc386e8-71c2-4da4-b8b5-c1674a9cf926
-   (do not change this comment) */
diff --git a/src/sound.c b/src/sound.c
index ddd8ddbec2d..6ea1cb3bbdc 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -1500,5 +1500,3 @@ init_sound (void)
 #endif /* HAVE_SOUND */
-/* arch-tag: dd850ad8-0433-4e2c-9cba-b7aeeccc0dbd
-   (do not change this comment) */
diff --git a/src/syntax.c b/src/syntax.c
index 1c619044ffb..d8749a18eea 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -3548,5 +3548,3 @@ In both cases, LIMIT bounds the search. */);
  defsubr (&Sparse_partial_sexp);
 }
-/* arch-tag: 3e297b9f-088e-4b64-8f4c-fb0b3443e412
-   (do not change this comment) */
diff --git a/src/syntax.h b/src/syntax.h
index 77902a04143..87a33402834 100644
--- a/src/syntax.h
+++ b/src/syntax.h
@@ -302,5 +302,3 @@ extern int parse_sexp_lookup_properties;
 extern EMACS_INT scan_words (EMACS_INT, EMACS_INT);
-/* arch-tag: 28833cca-cd73-4741-8c85-a3111166a0e0
-   (do not change this comment) */
diff --git a/src/sysselect.h b/src/sysselect.h
index cb7e0957a3b..0edd9a4f328 100644
--- a/src/sysselect.h
+++ b/src/sysselect.h
@@ -54,5 +54,3 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define select sys_select
 #endif
-/* arch-tag: 36d05500-8cf6-4847-8e78-6721f18c06ef
-   (do not change this comment) */
diff --git a/src/syssignal.h b/src/syssignal.h
index 83743dd8cc7..34bae9bab3b 100644
--- a/src/syssignal.h
+++ b/src/syssignal.h
@@ -159,5 +159,3 @@ extern pthread_t main_thread;
 #else /* not FORWARD_SIGNAL_TO_MAIN_THREAD */
 #define SIGNAL_THREAD_CHECK(signo)
 #endif /* not FORWARD_SIGNAL_TO_MAIN_THREAD */
-/* arch-tag: 4580e86a-340d-4574-9e11-a742b6e1a152
-   (do not change this comment) */
diff --git a/src/systime.h b/src/systime.h
index c35fae19c4e..96daac19494 100644
--- a/src/systime.h
+++ b/src/systime.h
@@ -174,5 +174,3 @@ extern int lisp_time_argument (Lisp_Object, time_t *, int *);
 #endif /* EMACS_SYSTIME_H */
-/* arch-tag: dcb79915-cf99-4bce-9778-aade71d07651
-   (do not change this comment) */
diff --git a/src/syswait.h b/src/syswait.h
index 3c51a3dab83..73fb4a5de54 100644
--- a/src/syswait.h
+++ b/src/syswait.h
@@ -58,5 +58,3 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #endif /* EMACS_SYSWAIT_H */
-/* arch-tag: 7e5d9719-ec66-4b6f-89bb-563eea16a899
-   (do not change this comment) */
diff --git a/src/termcap.c b/src/termcap.c
index 39ad08a66d3..9e64d027640 100644
--- a/src/termcap.c
+++ b/src/termcap.c
@@ -713,5 +713,3 @@ tprint (cap)
 #endif /* TEST */
-/* arch-tag: c2e8d427-2271-4fac-95fe-411857238b80
-   (do not change this comment) */
diff --git a/src/termchar.h b/src/termchar.h
index e0eccaa5bde..befbb8b9f82 100644
--- a/src/termchar.h
+++ b/src/termchar.h
@@ -212,5 +212,3 @@ extern struct tty_display_info *tty_list;
 #define CURTTY() FRAME_TTY (SELECTED_FRAME())
-/* arch-tag: bf9f0d49-842b-42fb-9348-ec8759b27193
-   (do not change this comment) */
diff --git a/src/termhooks.h b/src/termhooks.h
index 7f86f04c0aa..246e0a13a11 100644
--- a/src/termhooks.h
+++ b/src/termhooks.h
@@ -658,5 +658,3 @@ extern struct terminal *initial_terminal;
 extern void close_gpm (int gpm_fd);
 #endif
-/* arch-tag: 33a00ecc-52b5-4186-a410-8801ac9f087d
-   (do not change this comment) */
diff --git a/src/terminal.c b/src/terminal.c
index ab6f9fd6457..f6390f3fa5f 100644
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -558,5 +558,3 @@ or some time later.  */);
  Fprovide (intern_c_string ("multi-tty"), Qnil);
 }
-/* arch-tag: e9af6f27-b483-47dc-bb1a-730c1c5cab03
-   (do not change this comment) */
diff --git a/src/terminfo.c b/src/terminfo.c
index 4b80308d233..e42c52be88d 100644
--- a/src/terminfo.c
+++ b/src/terminfo.c
@@ -49,5 +49,3 @@ tparam (char *string, char *outstring,
  return outstring;
 }
-/* arch-tag: a6f96a69-e68f-4e9d-a223-f0b0da26ead5
-   (do not change this comment) */
diff --git a/src/termopts.h b/src/termopts.h
index 8f613804291..eecd9481410 100644
--- a/src/termopts.h
+++ b/src/termopts.h
@@ -44,5 +44,3 @@ extern Lisp_Object Vtruncate_partial_width_windows;
   used for Emacs and another for all else. */
 extern int no_redraw_on_reenter;
-/* arch-tag: 35d4d284-dc1a-4fff-97fa-0154a21aebdb
-   (do not change this comment) */
diff --git a/src/textprop.c b/src/textprop.c
index a73c31255fd..a2794264d90 100644
--- a/src/textprop.c
+++ b/src/textprop.c
@@ -2338,5 +2338,3 @@ inherits it if NONSTICKINESS is nil.  The `front-sticky' and
 /*  defsubr (&Scopy_text_properties); */
 }
-/* arch-tag: 454cdde8-5f86-4faa-a078-101e3625d479
-   (do not change this comment) */
diff --git a/src/tparam.c b/src/tparam.c
index d8a8f0260f0..fcbb63881e6 100644
--- a/src/tparam.c
+++ b/src/tparam.c
@@ -278,5 +278,3 @@ main (argc, argv)
 #endif /* DEBUG */
-/* arch-tag: 83f7b5ac-a808-4f75-b87a-123de009b402
-   (do not change this comment) */
diff --git a/src/undo.c b/src/undo.c
index 8d5c5797c06..c6d2747f270 100644
--- a/src/undo.c
+++ b/src/undo.c
@@ -728,5 +728,3 @@ so it must make sure not to do a lot of consing.  */);
  undo_inhibit_record_point = 0;
 }
-/* arch-tag: d546ee01-4aed-4ffb-bb8b-eefaae50d38a
-   (do not change this comment) */
diff --git a/src/unexaix.c b/src/unexaix.c
index 273762d67bc..edffaa098d5 100644
--- a/src/unexaix.c
+++ b/src/unexaix.c
@@ -639,5 +639,3 @@ start_of_text (void)
  return ((char *) 0x10000000);
 }
-/* arch-tag: 0783857a-7c2d-456f-a426-58b722d69fd0
-   (do not change this comment) */
diff --git a/src/unexcoff.c b/src/unexcoff.c
index b7b1801879d..d098d862f1e 100644
--- a/src/unexcoff.c
+++ b/src/unexcoff.c
@@ -556,5 +556,3 @@ unexec (const char *new_name, const char *a_name)
 #endif /* not CANNOT_DUMP */
-/* arch-tag: 62409b69-e27a-4a7c-9413-0210d6b54e7f
-   (do not change this comment) */
diff --git a/src/unexcw.c b/src/unexcw.c
index af85fd14ea4..54ffcf216ee 100644
--- a/src/unexcw.c
+++ b/src/unexcw.c
@@ -300,5 +300,3 @@ unexec (const char *outfile, const char *infile)
  return (0);
 }
-/* arch-tag: fc44f6c3-ca0a-45e0-a5a2-58b6101b1e65
-   (do not change this comment) */
diff --git a/src/unexelf.c b/src/unexelf.c
index 0732e202710..0aac216b1c3 100644
--- a/src/unexelf.c
+++ b/src/unexelf.c
@@ -1309,5 +1309,3 @@ temacs:
    fatal ("Can't chmod (%s): errno %d\n", new_name, errno);
 }
-/* arch-tag: e02e1512-95e2-4ef0-bba7-b6bce658f1e3
-   (do not change this comment) */
diff --git a/src/unexhp9k800.c b/src/unexhp9k800.c
index b9edd4f3a84..c0471992a72 100644
--- a/src/unexhp9k800.c
+++ b/src/unexhp9k800.c
@@ -320,5 +320,3 @@ display_header (hdr, auxhdr)
 }
 #endif /* DEBUG */
-/* arch-tag: d55a09ac-9427-4ec4-8496-cb9d7710774f
-   (do not change this comment) */
diff --git a/src/unexmacosx.c b/src/unexmacosx.c
index 12b8bef6a69..75d6677f535 100644
--- a/src/unexmacosx.c
+++ b/src/unexmacosx.c
@@ -1376,5 +1376,3 @@ unexec_free (void *ptr)
    malloc_zone_free (emacs_zone, (unexec_malloc_header_t *) ptr - 1);
 }
-/* arch-tag: 1a784f7b-a184-4c4f-9544-da8619593d72
-   (do not change this comment) */
diff --git a/src/unexsol.c b/src/unexsol.c
index 1d58ed46d4b..e1a10f7d211 100644
--- a/src/unexsol.c
+++ b/src/unexsol.c
@@ -27,5 +27,3 @@ unexec (const char *new_name, const char *old_name)
           Fcons (build_string ("Cannot unexec"), Fcons (errstring, data)));
 }
-/* arch-tag: d8ff72b3-8198-4011-8ef5-011b12027f59
-   (do not change this comment) */
diff --git a/src/unexw32.c b/src/unexw32.c
index 7d2e639d7d5..54352147c97 100644
--- a/src/unexw32.c
+++ b/src/unexw32.c
@@ -826,5 +826,3 @@ unexec (const char *new_name, const char *old_name)
 /* eof */
-/* arch-tag: fe1d3d1c-ef88-4917-ab22-f12ab16b3254
-   (do not change this comment) */
diff --git a/src/vm-limit.c b/src/vm-limit.c
index bae247ec57a..4b16f0ee908 100644
--- a/src/vm-limit.c
+++ b/src/vm-limit.c
@@ -299,5 +299,3 @@ memory_warnings (POINTER start, void (*warnfun) (const char *))
  lim_data = 0;
 }
-/* arch-tag: eab04eda-1f69-447a-8d9f-95f0a3983ca5
-   (do not change this comment) */
diff --git a/src/w16select.c b/src/w16select.c
index 6882a8b7edf..0b39af01574 100644
--- a/src/w16select.c
+++ b/src/w16select.c
@@ -1,6 +1,7 @@
 /* 16-bit Windows Selection processing for emacs on MS-Windows
-   Copyright (C) 1996, 1997, 2001, 2002, 2003, 2004,
-                 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+Copyright (C) 1996, 1997, 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/w32.h b/src/w32.h
index f770027475f..42cc542c549 100644
--- a/src/w32.h
+++ b/src/w32.h
@@ -146,5 +146,3 @@ extern int _sys_wait_accept (int fd);
 #endif /* EMACS_W32_H */
-/* arch-tag: 02c36b00-312b-4c4d-a1d9-f905c5e968f0
-   (do not change this comment) */
diff --git a/src/w32console.c b/src/w32console.c
index c324a299ab5..3e8ced62892 100644
--- a/src/w32console.c
+++ b/src/w32console.c
@@ -760,5 +760,3 @@ scroll-back buffer.  */);
  defsubr (&Sset_message_beep);
 }
-/* arch-tag: a390a07f-f661-42bc-aeb4-e6d8bf860337
-   (do not change this comment) */
diff --git a/src/w32font.c b/src/w32font.c
index 891f7ac8c78..46add9094f8 100644
--- a/src/w32font.c
+++ b/src/w32font.c
@@ -2584,5 +2584,3 @@ versions of Windows) characters.  */);
  register_font_driver (&w32font_driver, NULL);
 }
-/* arch-tag: 65b8a3cd-46aa-4c0d-a1f3-99e75b9c07ee
-   (do not change this comment) */
diff --git a/src/w32font.h b/src/w32font.h
index 79572237883..ab81849375c 100644
--- a/src/w32font.h
+++ b/src/w32font.h
@@ -85,5 +85,3 @@ Lisp_Object intern_font_name (char *);
 #endif
-/* arch-tag: ef9d9675-a2a5-4d01-9526-815e9a3da7cb
-   (do not change this comment) */
diff --git a/src/w32gui.h b/src/w32gui.h
index 4a6903debf8..c43f812a29c 100644
--- a/src/w32gui.h
+++ b/src/w32gui.h
@@ -149,5 +149,3 @@ typedef struct {
 #endif /* EMACS_W32GUI_H */
-/* arch-tag: 9172e5fb-45a5-4684-afd9-ca0e81324604
-   (do not change this comment) */
diff --git a/src/w32heap.h b/src/w32heap.h
index 4f22e17687a..a439b4747c1 100644
--- a/src/w32heap.h
+++ b/src/w32heap.h
@@ -94,5 +94,3 @@ IMAGE_SECTION_HEADER * rva_to_section (DWORD rva, IMAGE_NT_HEADERS * nt_header);
 #endif /* NTHEAP_H_ */
-/* arch-tag: 3ba4cbe1-8a09-4a41-8f37-fd31f7426b3c
-   (do not change this comment) */
diff --git a/src/w32inevt.h b/src/w32inevt.h
index 160de502e77..c18d722e4b1 100644
--- a/src/w32inevt.h
+++ b/src/w32inevt.h
@@ -30,5 +30,3 @@ extern void w32_console_mouse_position (FRAME_PTR *f, int insist,
 #endif /* EMACS_W32INEVT_H */
-/* arch-tag: 7641bd54-199f-4552-8e8a-6a2f5340ef13
-   (do not change this comment) */
diff --git a/src/w32menu.c b/src/w32menu.c
index fa047aee5c4..26938ff065e 100644
--- a/src/w32menu.c
+++ b/src/w32menu.c
@@ -1734,5 +1734,3 @@ globals_of_w32menu (void)
  unicode_message_box = (MessageBoxW_Proc) GetProcAddress (user32, "MessageBoxW");
 }
-/* arch-tag: 0eaed431-bb4e-4aac-a527-95a1b4f1fed0
-   (do not change this comment) */
diff --git a/src/w32reg.c b/src/w32reg.c
index 5c7e9cca0fc..99fca62fbd0 100644
--- a/src/w32reg.c
+++ b/src/w32reg.c
@@ -161,5 +161,3 @@ x_get_string_resource (XrmDatabase rdb, char *name, char *class)
  return (w32_get_string_resource (name, class, REG_SZ));
 }
-/* arch-tag: 755fce25-42d7-4acb-874f-2fb42336823d
-   (do not change this comment) */
diff --git a/src/w32select.c b/src/w32select.c
index 88996e12926..369f49ebbeb 100644
--- a/src/w32select.c
+++ b/src/w32select.c
@@ -1,6 +1,7 @@
 /* Selection processing for Emacs on the Microsoft W32 API.
-   Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004,
-                 2005, 2006, 2007, 2008, 2009, 2010, 2011  Free Software Foundation, Inc.
+Copyright (C) 1993, 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/w32term.c b/src/w32term.c
index f411a78b2d9..3cf4a0e9657 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -1,7 +1,8 @@
 /* Implementation of GUI terminal on the Microsoft W32 API.
-   Copyright (C) 1989, 1993, 1994, 1995, 1996, 1997, 1998,
-                 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+Copyright (C) 1989, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-                 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+  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/w32term.h b/src/w32term.h
index 1c4169194f1..e6b29b41031 100644
--- a/src/w32term.h
+++ b/src/w32term.h
@@ -707,5 +707,3 @@ typedef BOOL (WINAPI * AppendMenuW_Proc) (
    IN UINT_PTR,
    IN LPCWSTR);
-/* arch-tag: f201d05a-1240-4fc5-8ea4-ca24d4ee5671
-   (do not change this comment) */
diff --git a/src/w32uniscribe.c b/src/w32uniscribe.c
index dc146789fa4..59e4b69b8b3 100644
--- a/src/w32uniscribe.c
+++ b/src/w32uniscribe.c
@@ -965,5 +965,3 @@ syms_of_w32uniscribe (void)
  register_font_driver (&uniscribe_font_driver, NULL);
 }
-/* arch-tag: 9530f0e1-7471-47dd-a780-94330af87ea0
-   (do not change this comment) */
diff --git a/src/w32xfns.c b/src/w32xfns.c
index 7f330b9b000..75780d14c78 100644
--- a/src/w32xfns.c
+++ b/src/w32xfns.c
@@ -443,5 +443,3 @@ x_sync (void *f)
 {
 }
-/* arch-tag: 4fab3695-4ad3-4cc6-a2b1-fd2c67dc46be
-   (do not change this comment) */
diff --git a/src/widget.c b/src/widget.c
index d4fb341531d..72ee0e3ab91 100644
--- a/src/widget.c
+++ b/src/widget.c
@@ -842,5 +842,3 @@ widget_store_internal_border (Widget widget)
  ew->emacs_frame.internal_border_width = f->internal_border_width;
 }
-/* arch-tag: 931d28e5-0d59-405a-8325-7d475d0a13d9
-   (do not change this comment) */
diff --git a/src/widget.h b/src/widget.h
index f1df67ac368..3f404909130 100644
--- a/src/widget.h
+++ b/src/widget.h
@@ -99,5 +99,3 @@ void widget_store_internal_border (Widget widget);
 #endif /* _EmacsFrame_h */
-/* arch-tag: 98be17cc-8878-4701-abfa-66f1c04e9cb7
-   (do not change this comment) */
diff --git a/src/widgetprv.h b/src/widgetprv.h
index 34ec3bfbfe8..f721ecdae14 100644
--- a/src/widgetprv.h
+++ b/src/widgetprv.h
@@ -77,5 +77,3 @@ extern EmacsFrameClassRec emacsFrameClassRec;	 /* class pointer */
 #endif /* _EmacsFrameP_h */
-/* arch-tag: 2b579b4c-f697-4f86-b27a-35b7cb1a4a1c
-   (do not change this comment) */
diff --git a/src/window.c b/src/window.c
index 1487f3033fe..69dc8c7c68e 100644
--- a/src/window.c
+++ b/src/window.c
@@ -158,6 +158,11 @@ static int sequence_number;
 static int window_initialized;
+/* Set in `set-window-configuration' to prevent "swapping out point"
+   in the old selected window.  */
+static int inhibit_point_swap;
 /* Hook to run when window config changes.  */
 static Lisp_Object Qwindow_configuration_change_hook;
@@ -191,6 +196,10 @@ static int window_scroll_preserve_vpos;
 static int inhibit_frame_unsplittable;
 #endif /* 0 */
+extern EMACS_INT scroll_margin;
+extern Lisp_Object Qwindow_scroll_functions, Vwindow_scroll_functions;
 /* If non-nil, then the `recenter' command with a nil argument
   the entire frame to be redrawn; the special value `tty' causes the
   frame to be redrawn only if it is a tty frame.  */
@@ -3594,7 +3603,9 @@ selected window before each command.  */)
  /* Store the current buffer's actual point into the
     old selected window.  It belongs to that window,
     and when the window is not selected, must be in the window.  */
-  if (!NILP (selected_window))
+  if (inhibit_point_swap)
+    inhibit_point_swap = 0;
+  else
    {
      ow = XWINDOW (selected_window);
      if (! NILP (ow->buffer))
@@ -5767,7 +5778,7 @@ zero means top of window, negative means relative to bottom of window.  */)
    /* This test is needed to make sure PT/PT_BYTE make sense in w->buffer
       when passed below to set_marker_both.  */
    error ("move-to-window-line called from unrelated buffer");
-  
  window = selected_window;
  start = marker_position (w->start);
  if (start < BEGV || start > ZV)
@@ -6144,10 +6155,6 @@ the return value is nil.  Otherwise the value is t.  */)
        }
      FRAME_ROOT_WINDOW (f) = data->root_window;
-      /* Prevent "swapping out point" in the old selected window
-         using the buffer that has been restored into it.
-         We already swapped out point that from that window's old buffer.  */
-      selected_window = Qnil;
      /* Arrange *not* to restore point in the buffer that was
         current when the window configuration was saved.  */
@@ -6156,6 +6163,11 @@ the return value is nil.  Otherwise the value is t.  */)
                               make_number (old_point),
                               XWINDOW (data->current_window)->buffer);
+      /* In the following call to `select-window, prevent "swapping
+         out point" in the old selected window using the buffer that
+         has been restored into it.  We already swapped out that point
+         from that window's old buffer.  */
+      inhibit_point_swap = 1;
      Fselect_window (data->current_window, Qnil);
      XBUFFER (XWINDOW (selected_window)->buffer)->last_selected_window
        = selected_window;
@@ -6165,13 +6177,6 @@ the return value is nil.  Otherwise the value is t.  */)
              && FRAME_LIVE_P (XFRAME (data->focus_frame))))
        Fredirect_frame_focus (frame, data->focus_frame);
-#if 0 /* I don't understand why this is needed, and it causes problems
-         when the frame's old selected window has been deleted.  */
-      if (f != selected_frame && FRAME_WINDOW_P (f))
-        do_switch_frame (WINDOW_FRAME (XWINDOW (data->root_window)),
-                         0, 0, Qnil);
-#endif
      /* Set the screen height to the value it had before this function.  */
      if (previous_frame_lines != FRAME_LINES (f)
          || previous_frame_cols != FRAME_COLS (f))
@@ -7094,6 +7099,8 @@ syms_of_window (void)
  window_scroll_preserve_hpos = -1;
  window_scroll_preserve_vpos = -1;
+  inhibit_point_swap = 0;
  DEFVAR_LISP ("temp-buffer-show-function", &Vtemp_buffer_show_function,
               doc: /* Non-nil means call as function to display a help buffer.
 The function is called with one argument, the buffer to be displayed.
@@ -7272,5 +7279,3 @@ keys_of_window (void)
  initial_define_key (meta_map, 'v', "scroll-down-command");
 }
-/* arch-tag: 90a9c576-0590-48f1-a5f1-6c96a0452d9f
-   (do not change this comment) */
diff --git a/src/window.h b/src/window.h
index 1143b6f094d..620c1b3392e 100644
--- a/src/window.h
+++ b/src/window.h
@@ -894,5 +894,3 @@ extern int window_box_text_cols (struct window *w);
 #endif /* not WINDOW_H_INCLUDED */
-/* arch-tag: d4a6942f-e433-4ffe-ac10-2c3574f28577
-   (do not change this comment) */
diff --git a/src/xfaces.c b/src/xfaces.c
index 58027799c2d..9d3c5927d6c 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -1,6 +1,8 @@
 /* xfaces.c -- "Face" primitives.
   Copyright (C) 1993, 1994, 1998, 1999, 2000, 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 is part of GNU Emacs.
diff --git a/src/xfns.c b/src/xfns.c
index bbec8759cd1..7fcb4c637a1 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -1,7 +1,8 @@
 /* Functions for the X window system.
-   Copyright (C) 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-                 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+Copyright (C) 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-                 Free Software Foundation, Inc.
+  2000, 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/xfont.c b/src/xfont.c
index c167a0ddc93..a3de5988093 100644
--- a/src/xfont.c
+++ b/src/xfont.c
@@ -1114,5 +1114,3 @@ syms_of_xfont (void)
  register_font_driver (&xfont_driver, NULL);
 }
-/* arch-tag: 23c5f366-a5ee-44b7-a3b7-90d6da7fd749
-   (do not change this comment) */
diff --git a/src/xftfont.c b/src/xftfont.c
index 79dc6c5715a..722eb09e9df 100644
--- a/src/xftfont.c
+++ b/src/xftfont.c
@@ -778,5 +778,3 @@ syms_of_xftfont (void)
  register_font_driver (&xftfont_driver, NULL);
 }
-/* arch-tag: 64ec61bf-7c8e-4fe6-b953-c6a85d5e1605
-   (do not change this comment) */
diff --git a/src/xgselect.c b/src/xgselect.c
index 971b204ca4d..4091f501c43 100644
--- a/src/xgselect.c
+++ b/src/xgselect.c
@@ -157,5 +157,3 @@ xgselect_initialize (void)
 #endif /* defined (USE_GTK) || defined (HAVE_GCONF) */
 }
-/* arch-tag: c5873ee3-d1f6-44f9-9f3b-b14f70fd0e6a
-   (do not change this comment) */
diff --git a/src/xgselect.h b/src/xgselect.h
index dc26ccee34a..14faf068131 100644
--- a/src/xgselect.h
+++ b/src/xgselect.h
@@ -34,5 +34,3 @@ extern void xgselect_initialize (void);
 #endif /* XGSELECT_H */
-/* arch-tag: 0c5392a8-3a41-41eb-839c-58e6595926f0
-   (do not change this comment) */
diff --git a/src/xml.c b/src/xml.c
index fde9d4d382a..1e260bdeb9a 100644
--- a/src/xml.c
+++ b/src/xml.c
@@ -1,5 +1,5 @@
 /* Interface to libxml2.
-   Copyright (C) 2010 Free Software Foundation, Inc.
+   Copyright (C) 2010, 2011 Free Software Foundation, Inc.
 This file is part of GNU Emacs.
diff --git a/src/xrdb.c b/src/xrdb.c
index 3d3aeb4ab57..64879fbc4d3 100644
--- a/src/xrdb.c
+++ b/src/xrdb.c
@@ -764,5 +764,3 @@ main (argc, argv)
 }
 #endif /* TESTRM */
-/* arch-tag: 37e6fbab-ed05-4363-9e76-6c4109ed511f
-   (do not change this comment) */
diff --git a/src/xselect.c b/src/xselect.c
index cca4117cb37..da562609b9c 100644
--- a/src/xselect.c
+++ b/src/xselect.c
@@ -2714,5 +2714,3 @@ A value of 0 means wait as long as necessary.  This is initialized from the
  staticpro (&Qforeign_selection);
 }
-/* arch-tag: 7c293b0f-9918-4f69-8ac7-03e142307236
-   (do not change this comment) */
diff --git a/src/xsettings.c b/src/xsettings.c
index 16c4603f592..dbb3a8701ed 100644
--- a/src/xsettings.c
+++ b/src/xsettings.c
@@ -1,6 +1,6 @@
-/* Functions for handle font and other changes dynamically.
+/* Functions for handling font and other changes dynamically.
-   Copyright (C) 2009, 2010, 2011
-                 Free Software Foundation, Inc.
+Copyright (C) 2009, 2010, 2011  Free Software Foundation, Inc.
 This file is part of GNU Emacs.
@@ -777,5 +777,3 @@ If this variable is nil, Emacs ignores system font changes.  */);
  Fprovide (intern_c_string ("dynamic-setting"), Qnil);
 }
-/* arch-tag: 541716ed-2e6b-42e1-8212-3197e01ea61d
-   (do not change this comment) */
diff --git a/src/xsettings.h b/src/xsettings.h
index 858c358b1bb..66005cf99b6 100644
--- a/src/xsettings.h
+++ b/src/xsettings.h
@@ -31,5 +31,3 @@ extern const char *xsettings_get_system_normal_font (void);
 #endif /* XSETTINGS_H */
-/* arch-tag: 2c0f5c49-e925-4452-b778-4c082da6dd72
-   (do not change this comment) */
diff --git a/src/xsmfns.c b/src/xsmfns.c
index d67166e48fa..515d0e28a86 100644
--- a/src/xsmfns.c
+++ b/src/xsmfns.c
@@ -594,5 +594,3 @@ See also `emacs-save-session-functions', `emacs-session-save' and
 #endif /* HAVE_X_SM */
-/* arch-tag: 56a2c58c-adfa-430a-b772-130abd29fd2e
-   (do not change this comment) */
diff --git a/src/xterm.c b/src/xterm.c
index c15539182f6..2c04e9fa848 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -1,6 +1,7 @@
 /* X Communication module for terminals which understand the X protocol.
-   Copyright (C) 1989, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-                 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+Copyright (C) 1989, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+  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/xterm.h b/src/xterm.h
index 9a1222be9cc..4f075be7fc0 100644
--- a/src/xterm.h
+++ b/src/xterm.h
@@ -1113,5 +1113,3 @@ extern Lisp_Object Qx_gtk_map_stock;
   (nr).width = (rwidth),                               \
   (nr).height = (rheight))
-/* arch-tag: 78a7972a-b18f-4694-861a-0780c4b3090e
-   (do not change this comment) */
author	Paul Eggert	2011-01-17 11:01:01 -0800
committer	Paul Eggert	2011-01-17 11:01:01 -0800
commit	a3e44e793796153ff1534be9c74fcab50b45de30 (patch)
tree	863d5db087c8e034c96d06ea955515f4d3f3d0a3 /src
parent	7f818df9420a1320539f7e3e633003573a570413 (diff)
parent	721be9cd4865e9f7d68020adcfa672d2edd52b07 (diff)
download	emacs-a3e44e793796153ff1534be9c74fcab50b45de30.tar.gz emacs-a3e44e793796153ff1534be9c74fcab50b45de30.zip