Merge from trunk

author: Stefan Monnier 2011-02-01 12:09:25 -0500
committer: Stefan Monnier 2011-02-01 12:09:25 -0500
commit: 8f1d2ef658f95549eb33fe5265f8f11c5129bece (patch)
tree: b7cd852a1adb423384532cfe22c31547160b22bc /etc
parent: 590130fb19e1f433965c421d98fedeb2d7c33310 (diff)
parent: 1dc4075fa8809805aed5092e93e225e889725c94 (diff)
download: emacs-8f1d2ef658f95549eb33fe5265f8f11c5129bece.tar.gz
emacs-8f1d2ef658f95549eb33fe5265f8f11c5129bece.zip
241 files changed, 770 insertions, 621 deletions
diff --git a/etc/.gitignore b/etc/.gitignore
index 83bad1103f6..618d09438f8 100644
--- a/etc/.gitignore
+++ b/etc/.gitignore
@@ -1,5 +1,3 @@
 DOC
 DOC-*
 icons/
-# arch-tag: 617d2467-cd9f-42e2-9115-88e1d44e66e6
diff --git a/etc/CONTRIBUTE b/etc/CONTRIBUTE
index 99f24653ac9..df5dd7daefc 100644
--- a/etc/CONTRIBUTE
+++ b/etc/CONTRIBUTE
@@ -1,5 +1,4 @@
-Copyright (C) 2006, 2007, 2008, 2009, 2010
+Copyright (C) 2006-2011  Free Software Foundation, Inc.
-  Free Software Foundation, Inc.
 See end for license conditions.
diff --git a/etc/ChangeLog b/etc/ChangeLog
index eba8529f63d..db1c5d41c34 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,87 @@
+2011-01-28  Paul Eggert  <eggert@cs.ucla.edu>
+        Redo spelling of Makefile variables to conform to POSIX.
+        POSIX does not allow "-" in Makefile variable names.
+        Reported by Bruno Haible in
+        <http://lists.gnu.org/archive/html/emacs-devel/2011-01/msg00990.html>.
+        * refcards/Makefile (DIRED_REFCARDS_PDF): Renamed from
+        DIRED-REFCARDS_PDF.
+        (MISC_REFCARDS_PDF): Renamed from MISC-REFCARDS_PDF.
+        (SURVIVAL_CARDS_PDF): Renamed from SURVIVAL-CARDS_PDF.
+        (VIPER_CARDS_PDF): Renamed from VIPER-CARDS_PDF.
+2011-01-18  Glenn Morris  <rgm@gnu.org>
+        * PROBLEMS: Add note about svn+ssh.  (Bug#7791)
+2011-01-14  Glenn Morris  <rgm@gnu.org>
+        * refcards/calccard.tex, refcards/cs-dired-ref.tex:
+        * refcards/cs-refcard.tex, refcards/cs-survival.tex:
+        * refcards/de-refcard.tex, refcards/dired-ref.tex:
+        * refcards/fr-dired-ref.tex, refcards/fr-refcard.tex:
+        * refcards/fr-survival.tex, refcards/orgcard.tex:
+        * refcards/pl-refcard.tex, refcards/pt-br-refcard.tex:
+        * refcards/refcard.tex, refcards/ru-refcard.tex:
+        * refcards/sk-dired-ref.tex, refcards/sk-refcard.tex:
+        * refcards/sk-survival.tex, refcards/survival.tex:
+        * refcards/vipcard.tex, refcards/viperCard.tex:
+        Update short copyright year to 2011.
+2011-01-13  Christian Ohler  <ohler@gnu.org>
+        * NEWS: Mention ERT.
+2011-01-10  Jan Moringen  <jan.moringen@uni-bielefeld.de>
+        * NEWS: Add new function dbus-register-service.
+2011-01-09  Chong Yidong  <cyd@stupidchicken.com>
+        * themes/tango-theme.el, themes/tango-dark-theme.el: Let-bind
+        tango palette colors.  Only define faces for color displays.
+        Customize the ansi-color-names-vector variable.  Add Ediff,
+        Flyspell, and Semantic faces as suggested by Jan Moringen.
+2011-01-08  Andreas Schwab  <schwab@linux-m68k.org>
+        * compilation.txt: Add column to gcc-include sample.
+2011-01-08  Glenn Morris  <rgm@gnu.org>
+        * PROBLEMS: -batch implies -q.
+2011-01-07  Tassilo Horn  <tassilo@member.fsf.org>
+        * themes/tsdh-light-theme.el, themes/tsdh-dark-theme.el: Remove
+        dev-prefix from file names, so that the files don't clash on 8x3
+        filesystems.
+2011-01-06  Tassilo Horn  <tassilo@member.fsf.org>
+        * themes/dev-tsdh-light-theme.el (dev-tsdh-light): New theme.
+        * themes/dev-tsdh-dark-theme.el (dev-tsdh-dark): New theme.
+2011-01-04  Jan Moringen  <jan.moringen@uni-bielefeld.de>
+        * NEWS: Extended behaviour of dbus-register-{method,property}.
+2011-01-02  Kenichi Handa  <handa@m17n.org>
+        * NEWS.23: Describe the changes for rmail's MIME handling.
+2010-12-18  Chong Yidong  <cyd@stupidchicken.com>
+        * images/separator.xpm: Tweak colors.
+2010-12-14  Michael Albinus  <michael.albinus@gmx.de>
+        * NEWS: Mention new Tramp method "ksu".
+2010-12-13  W. Martin Borgert <debacle@debian.org>  (tiny change)
+        * schema/schemas.xml: Add DocBook (Bug#7491).
 2010-12-11  Carsten Dominik  <carsten.dominik@gmail.com>
        * refcards/orgcard.tex: Cleanup.
@@ -5122,9 +5206,7 @@
 ;; coding: utf-8
 ;; End:
-  Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002,
+  Copyright (C) 1993-1999, 2001-2011  Free Software Foundation, Inc.
-    2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-    Free Software Foundation, Inc.
  This file is part of GNU Emacs.
diff --git a/etc/DEBUG b/etc/DEBUG
index 6fd5b412f4c..c8fd48c6bfa 100644
--- a/etc/DEBUG
+++ b/etc/DEBUG
@@ -1,7 +1,6 @@
 Debugging GNU Emacs
-Copyright (C) 1985, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+Copyright (C) 1985, 2000-2011  Free Software Foundation, Inc.
-  2008, 2009, 2010  Free Software Foundation, Inc.
 See the end of the file for license conditions.
@@ -755,4 +754,3 @@ mode: outline
 paragraph-separate: "[  ]*$"
 end:
-;;; arch-tag: fbf32980-e35d-481f-8e4c-a2eca2586e6b
diff --git a/etc/DISTRIB b/etc/DISTRIB
index 61434b6edd1..cc121105073 100644
--- a/etc/DISTRIB
+++ b/etc/DISTRIB
@@ -1,9 +1,7 @@
                                                -*- text -*-
            GNU Emacs availability information
-Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1995,
+Copyright (C) 1986-1993, 1995, 1998, 2000-2011  Free Software Foundation, Inc.
-  1998, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-  2010  Free Software Foundation, Inc.
 See the end of the file for license conditions.
diff --git a/etc/ERC-NEWS b/etc/ERC-NEWS
index ac7861ae8af..17bf4fc3877 100644
--- a/etc/ERC-NEWS
+++ b/etc/ERC-NEWS
@@ -1,6 +1,6 @@
 ERC NEWS                                                       -*- outline -*-
-Copyright (C) 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+Copyright (C) 2006-2011  Free Software Foundation, Inc.
 See the end of the file for license conditions.
 * Changes in ERC 5.3
@@ -1343,4 +1343,3 @@ GNU General Public License for more details.
 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: 2b21b387-6cdc-4192-889c-6743cfffdcb1
diff --git a/etc/ETAGS.EBNF b/etc/ETAGS.EBNF
index 09f07a8239e..333465b7a41 100644
--- a/etc/ETAGS.EBNF
+++ b/etc/ETAGS.EBNF
@@ -94,8 +94,7 @@ those.
 ===================== end of discussion of tag names =====================
-Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+Copyright (C) 2002-2011  Free Software Foundation, Inc.
-Free Software Foundation, Inc.
 COPYING PERMISSIONS:
diff --git a/etc/ETAGS.README b/etc/ETAGS.README
index eff5d5b048c..fd9636c9734 100644
--- a/etc/ETAGS.README
+++ b/etc/ETAGS.README
@@ -28,8 +28,7 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-Copyright (C) 1984, 1987, 1988, 1989, 1993, 1994, 1995, 1998, 1999,
+Copyright (C) 1984, 1987-1989, 1993-1995, 1998-2011
-  2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
  Free Software Foundation, Inc.
 This file is not considered part of GNU Emacs.
diff --git a/etc/GNU b/etc/GNU
index fb1e81b3424..97ad4aa9d4b 100644
--- a/etc/GNU
+++ b/etc/GNU
@@ -1,5 +1,4 @@
-Copyright (C) 1985, 1993, 2001, 2002, 2003, 2004,
+Copyright (C) 1985, 1993, 2001-2011  Free Software Foundation, Inc.
-   2005, 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
   Permission is granted to anyone to make or distribute verbatim copies
 of this document, in any medium, provided that the copyright notice and
diff --git a/etc/GNUS-NEWS b/etc/GNUS-NEWS
index ca2f2309b99..3192a58ce90 100644
--- a/etc/GNUS-NEWS
+++ b/etc/GNUS-NEWS
@@ -1,7 +1,6 @@
 GNUS NEWS -- history of user-visible changes.
-Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+Copyright (C) 1999-2011  Free Software Foundation, Inc.
-   2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
 See the end of the file for license conditions.
 Please send Gnus bug reports to bugs@gnus.org.
diff --git a/etc/HELLO b/etc/HELLO
index 5461d4cd7ef..d330bc8625c 100644
--- a/etc/HELLO
+++ b/etc/HELLO
@@ -72,8 +72,7 @@ Korean ($(CGQ1[(B)	$(C>H3gGO<<?d(B / $(C>H3gGO=J4O1n(B
-Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+Copyright (C) 2001-2011  Free Software Foundation, Inc.
-  Free Software Foundation, Inc.
 This file is part of GNU Emacs.
diff --git a/etc/MACHINES b/etc/MACHINES
index ebefc8905e0..126ae40cb57 100644
--- a/etc/MACHINES
+++ b/etc/MACHINES
@@ -1,7 +1,7 @@
 Emacs machines list
-Copyright (C) 1989, 1990, 1992, 1993, 1998, 2001, 2002, 2003, 2004,
+Copyright (C) 1989-1990, 1992-1993, 1998, 2001-2011
-  2005, 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+  Free Software Foundation, Inc.
 See the end of the file for license conditions.
 This is a list of the status of GNU Emacs on various machines and systems.
@@ -402,5 +402,3 @@ GNU General Public License for more details.
 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: 7d2e93c7-e982-40ec-9055-3cd064042473
diff --git a/etc/MAILINGLISTS b/etc/MAILINGLISTS
index 796a39e6996..ef918d3d211 100644
--- a/etc/MAILINGLISTS
+++ b/etc/MAILINGLISTS
@@ -318,8 +318,7 @@ mode: outline
 fill-column: 72
 End:
-Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+Copyright (C) 1999, 2001-2011  Free Software Foundation, Inc.
-Free Software Foundation, Inc.
    Permission is hereby granted, free of charge, to any person obtaining
    a copy of this file, to deal in the file without restriction, including
@@ -330,6 +329,3 @@ Free Software Foundation, Inc.
    The above copyright notice and this permission notice shall be
    included in all copies or substantial portions of the file.
-arch-tag: 6e42bba8-7532-4a23-8486-99dbc5770a8e
diff --git a/etc/MH-E-NEWS b/etc/MH-E-NEWS
index f4bf030eb32..27b6d40bd89 100644
--- a/etc/MH-E-NEWS
+++ b/etc/MH-E-NEWS
@@ -1,7 +1,6 @@
 * COPYRIGHT
-Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+Copyright (C) 2001-2011  Free Software Foundation, Inc.
-  2010  Free Software Foundation, Inc.
 See the end of the file for license conditions.
@@ -3253,4 +3252,3 @@ mode: outline
 paragraph-separate: "[  ]*$"
 end:
-arch-tag: f6696cad-eb1b-4c5f-8057-4e3954a98d18
diff --git a/etc/MORE.STUFF b/etc/MORE.STUFF
index 36c89651d67..d876b6df504 100644
--- a/etc/MORE.STUFF
+++ b/etc/MORE.STUFF
@@ -1,7 +1,6 @@
 More Neat Stuff for your Emacs
-Copyright (C) 1993, 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+Copyright (C) 1993, 1999, 2001-2011  Free Software Foundation, Inc.
-  2009, 2010  Free Software Foundation, Inc.
 See the end of the file for license conditions.
 This file describes GNU Emacs programs and resources that are
@@ -277,4 +276,3 @@ GNU General Public License for more details.
 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: c1d4e7c8-db85-44e6-909e-659e2b20fefa
diff --git a/etc/NEWS b/etc/NEWS
index 5972481358c..a20ecd4fe7f 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1,6 +1,6 @@
 GNU Emacs NEWS -- history of user-visible changes.
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2010-2011  Free Software Foundation, Inc.
 See the end of the file for license conditions.
 Please send Emacs bug reports to bug-gnu-emacs@gnu.org.
@@ -59,6 +59,9 @@ automatically select it.
 command line arguments, and the EMACS_UNIBYTE environment variable, no
 longer have any effect.  (They were declared obsolete in Emacs 23.)
+** New command line option `--no-site-lisp' removes site-lisp directories
+from load-path.  -Q now implies this.
 * Changes in Emacs 24.1
@@ -207,6 +210,10 @@ automatically when Emacs starts up.  To disable this, set
 `package-enable-at-startup' to nil.  To change which packages are
 loaded, customize `package-load-list'.
+** An Emacs Lisp testing tool is now included.
+Emacs Lisp developers can use this tool to write automated tests for
+their code.  See the ERT info manual for details.
 ** Custom Themes
 *** `M-x customize-themes' lists Custom themes which can be enabled.
@@ -216,12 +223,19 @@ Emacs no longer looks for custom themes in `load-path'.  The default
 is to search in `custom-theme-directory', followed by a built-in theme
 directory named "themes/" in `data-directory'.
+*** New option `custom-safe-themes' records known-safe theme files.
+If a theme is not in this list, Emacs queries before loading it, and
+offers to save the theme to `custom-safe-themes' automatically.  By
+default, all themes included in Emacs are treated as safe.
 ** The user option `remote-file-name-inhibit-cache' controls whether
 the remote file-name cache is used for read access.
 ** The standalone programs lib-src/digest-doc and sorted-doc have been
 replaced with Lisp commands `doc-file-to-man' and `doc-file-to-info'.
+** The variable `focus-follows-mouse' now always defaults to nil.
 * Editing Changes in Emacs 24.1
@@ -232,6 +246,9 @@ replaced with Lisp commands `doc-file-to-man' and `doc-file-to-info'.
 ** The default value of `backup-by-copying-when-mismatch' is now t.
+** The command `just-one-space' (C-SPC), if given a negative argument,
+also deletes newlines around point.
 ** Deletion changes
 *** New option `delete-active-region'.
@@ -252,60 +269,67 @@ should use delete-char with a negative argument instead.
 ** Selection changes.
-The default handling of clipboard and primary selections has been
+The default handling of clipboard and primary selections was changed
-changed to conform with other X applications.  The exact changes are
+to conform with modern X applications.  In short, most commands for
-described below; in short, mouse commands to select and paste text now
+killing and yanking text now use the clipboard, while mouse commands
-use the primary selection, while all other commands for killing and
+use the primary selection.
-yanking text now use the clipboard.
-*** Merely selecting text (e.g. with drag-mouse-1) does not add it to
-the kill-ring.  On systems with a primary selection separate from the
-clipboard (such as X), the selected text is put in the primary
-selection.
-*** mouse-2 is now bound to `mouse-yank-primary', which pastes from
+In the following, we provide a list of these changes, followed by a
-the primary selection regardless of the contents of the kill-ring.
+list of steps to get the old behavior back if you prefer that.
-*** Commands that kill text or copy it to the kill-ring (M-w, C-w,
+*** `mouse-drag-copy-region' now defaults to nil.
-C-k, etc.) also put the killed text into the clipboard.  This change
+*** `select-active-regions' now defaults to t.
-also means that the "Copy", "Cut", and "Paste" items in the "Edit"
+Merely selecting text (e.g. with drag-mouse-1) no longer puts it in
-menu are now exactly equivalent to, respectively M-w, C-w, and C-y.
+the kill-ring.  The selected text is put in the primary selection, if
+the system possesses a separate primary selection facility (e.g. X).
-*** Yank commands, such as C-y and M-y, retrieve text from the
+**** `select-active-regions' also accepts a new value, `only'.
-clipboard if it is available.
+This means to only set the primary selection for temporarily active
+regions (usually made by mouse-dragging or shift-selection);
+"ordinary" active regions, such as those made with C-SPC followed by
+point motion, do not alter the primary selection.
-*** The above changes are reflected in the following new defaults:
+*** mouse-2 is now bound to `mouse-yank-primary'.
+This pastes from the primary selection, ignoring the kill-ring.
+Previously, mouse-2 was bound to `mouse-yank-at-click'.
-**** `select-active-regions' now defaults to t.
+*** `x-select-enable-clipboard' now defaults to t on all platforms.
-It also accepts a new value, `only', which means to only set the
+*** `x-select-enable-primary' now defaults to nil.
-primary selection for temporarily active regions (usually made by
+Thus, commands that kill text or copy it to the kill-ring (such as
-mouse-dragging or shift-selection).
+M-w, C-w, and C-k) also use the clipboard---not the primary selection.
-**** `mouse-2' is now bound to `mouse-yank-primary'.
+**** The "Copy", "Cut", and "Paste" items in the "Edit" menu are now
-Previously, it was bound to `mouse-yank-at-click' (which is now
+exactly equivalent to, respectively M-w, C-w, and C-y.
-unbound by default).
-**** `x-select-enable-clipboard' now defaults to t on all platforms.
+**** Note that on MS-Windows, `x-select-enable-clipboard' was already
-Note that this variable was already non-nil by default on MS-Windows,
+non-nil by default, as Windows does not support the primary selection
-which does not support the primary selection between applications.
+between applications.
-**** `x-select-enable-primary' now defaults to nil.
+*** To return to the previous behavior, do the following:
-This variable exists only on X; its default value was t in previous
-versions.
-**** `mouse-drag-copy-region' now defaults to nil.
+**** Change `mouse-drag-copy-region' to t.
+**** Change `x-select-enable-primary' to t (on X only).
-*** To return to the previous behavior, where mouse commands use the
+**** Change `x-select-enable-clipboard' to nil.
-clipboard, change `mouse-drag-copy-region' and (on X only)
+**** Bind `mouse-yank-at-click' to mouse-2.
-`x-select-enable-primary' to t.  If you don't want Emacs to put the
-text into the clipboard, only to the primary selection, additionally
-set `x-select-enable-clipboard' to nil.
 *** Support for X cut buffers has been removed.
+** New command `rectangle-number-lines', bound to `C-x r N', numbers
+the lines in the current rectangle.  With an prefix argument, this
+prompts for a number to count from and for a format string.
 * Changes in Specialized Modes and Packages in Emacs 24.1
+** The compile.el mode can be used without font-lock-mode.
+`compilation-parse-errors-function' is now obsolete.
+** The Landmark game is now invoked with `landmark', not `lm'.
+** Prolog mode has been completely revamped, with lots of additional
+functionality such as more intelligent indentation, electricty, support for
+more variants, including Mercury, and a lot more.
 ** shell-mode can track your cwd by reading it from your prompt.
 Just set shell-dir-cookie-re to an appropriate regexp.
@@ -333,6 +357,12 @@ as the server coding system, this variable will then be consulted.
 The default is to decode strings that can be decoded as utf-8 as
 utf-8, and do the normal `undecided' decoding for the rest.
+** Eshell changes
+*** The default value of eshell-directory-name is a directory named
+"eshell" in `user-emacs-directory'.  If the old "~/.eshell/" directory
+exists, that is used instead.
 ** In ido-mode, C-v is no longer bound to ido-toggle-vc.
 The reason is that this interferes with cua-mode.
@@ -526,6 +556,8 @@ listing object name completions when being sent text via
 *** An API for manipulating SQL product definitions has been added.
+** sregex.el is now obsolete, since rx.el is a strict superset.
 ** s-region.el is now declared obsolete, superceded by shift-select-mode
 enabled by default in 23.1.
@@ -540,28 +572,42 @@ threads simultaneously.
 *** It is possible now, to access alternative buses than the default
 system or session bus.
+*** dbus-register-{service,method,property}
+The -method and -property functions do not automatically register
+names anymore.
+The new function dbus-register-service registers a service known name
+on a D-Bus without simultaneously registering a property or a method.
 ** Tramp
+*** There exists a new inline access method "ksu" (kerberized su).
 *** The following access methods are discontinued: "ssh1_old",
 "ssh2_old", "scp1_old", "scp2_old" and "fish".
 ** VC and related modes
 *** Support for pulling on distributed version control systems.
-The vc-update command now runs a "pull" operation, if it is supported.
+The vc-pull command runs a "pull" operation, if it is supported.
 This updates the current branch from upstream.  A prefix argument
-means to prompt the user for command specifics, e.g. a pull location.
+means to prompt the user for specifics, e.g. a pull location.
-**** vc-pull is an alias for vc-update.
+**** vc-update is now an alias for vc-update.
-**** Currently supported by Bzr.
+**** Currently supported by Bzr, Git, and Mercurial.
 *** Support for merging on distributed version control systems.
 The vc-merge command now runs a "merge" operation, if it is supported.
-This merges another branch into the current one.  A prefix argument
+This merges another branch into the current one.  This command prompts
-means to prompt the user for command specifics, e.g. a merge location.
+the user for specifics, e.g. a merge source.
+**** Currently supported by Bzr, Git, and Mercurial.
-**** Currently supported by Bzr.
+** Miscellaneous
+---
+*** `copyright-fix-years' can optionally convert consecutive years to ranges.
 * New Modes and Packages in Emacs 24.1
@@ -583,6 +629,11 @@ Notifications API.  It requires D-Bus for communication.
 * Incompatible Lisp Changes in Emacs 24.1
+** `compose-mail' now accepts an optional 8th arg, RETURN-ACTION, and
+passes it to the mail user agent function.  This argument specifies an
+action for returning to the caller after finishing with the mail.
+This is currently used by Rmail to delete a mail window.
 ** For mouse click input events in the text area, the Y pixel
 coordinate in the POSITION list now counts from the top of the text
 area, excluding any header line.  Previously, it counted from the top
@@ -638,6 +689,14 @@ sc.el, x-menu.el, rnews.el, rnewspost.el
 * Lisp changes in Emacs 24.1
+** Removed the stack-trace-on-error variable.
+Also the debugger can now "continue" from an error, which means it will jump
+to the error handler as if the debugger had not been invoked instead of
+jumping all the way to the top-level.
+** New function `read-char-choice' reads a restricted set of characters,
+discarding any inputs not inside the set.
 ** `image-library-alist' is renamed to `dynamic-library-alist'.
 The variable is now used to load all kind of supported dynamic libraries,
 not just image libraries.  The previous name is still available as an
@@ -675,6 +734,9 @@ The command `read-color' now requires a match for a color name or RGB
 triplet, instead of signalling an error if the user provides a invalid
 input.
+** Tool-bars can display separators.
+Tool-bar separators are handled like menu separators in menu-bar maps,
+i.e. via menu entries of the form `(menu-item "--")'.
 ** Image API
@@ -691,8 +753,8 @@ by the Graphic Control Extension of the image.
 *** If Emacs is compiled with libxml2 support (which is the default),
 two new Emacs Lisp-level functions are defined:
-`xml-parse-html-string-internal' (which will parse "real world" HTML)
+`libxml-parse-html-region' (which will parse "real world" HTML)
-and `xml-parse-string-internal' (which parses XML).  Both return an
+and `libxml-parse-xml-region' (which parses XML).  Both return an
 Emacs Lisp parse tree.
 FIXME: These should be front-ended by xml.el.
diff --git a/etc/NEWS.1-17 b/etc/NEWS.1-17
index b45ddedbe28..89856429b1d 100644
--- a/etc/NEWS.1-17
+++ b/etc/NEWS.1-17
@@ -1,6 +1,6 @@
 GNU Emacs NEWS -- history of user-visible changes.  26-Mar-1986
-Copyright (C) 1985, 1986, 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+Copyright (C) 1985-1986, 2006-2011  Free Software Foundation, Inc.
 See the end of the file for license conditions.
@@ -2531,4 +2531,3 @@ Local variables:
 mode: text
 end:
-arch-tag: 33dc900d-9c58-473b-87c9-b6d7222323ea
diff --git a/etc/NEWS.18 b/etc/NEWS.18
index 7cffb52a08d..6bf854d8b33 100644
--- a/etc/NEWS.18
+++ b/etc/NEWS.18
@@ -1,6 +1,6 @@
 GNU Emacs NEWS -- history of user-visible changes.  17-Aug-1988
-Copyright (C) 1988, 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+Copyright (C) 1988, 2006-2011  Free Software Foundation, Inc.
 See the end of the file for license conditions.
@@ -1621,4 +1621,3 @@ Local variables:
 mode: text
 end:
-arch-tag: 8fed393b-c9c5-47d1-afbb-c0e7a135094a
diff --git a/etc/NEWS.19 b/etc/NEWS.19
index a97925bf909..90d96c12fb8 100644
--- a/etc/NEWS.19
+++ b/etc/NEWS.19
@@ -1,7 +1,6 @@
 GNU Emacs NEWS -- history of user-visible changes.  1992.
-Copyright (C) 1993, 1994, 1995, 2001, 2006, 2007, 2008, 2009, 2010
+Copyright (C) 1993-1995, 2001, 2006-2011  Free Software Foundation, Inc.
-  Free Software Foundation, Inc.
 See the end of the file for license conditions.
@@ -6541,5 +6540,3 @@ Local variables:
 mode: outline
 paragraph-separate: "[  ]*$"
 end:
-arch-tag: 944be39b-afe8-4217-9977-c745b68a7ca2
diff --git a/etc/NEWS.20 b/etc/NEWS.20
index 29623c4ee9d..c76ddb2485e 100644
--- a/etc/NEWS.20
+++ b/etc/NEWS.20
@@ -1,7 +1,6 @@
 GNU Emacs NEWS -- history of user-visible changes.  2006-05-31
-Copyright (C) 1999, 2000, 2001, 2006, 2007, 2008, 2009, 2010
+Copyright (C) 1999-2001, 2006-2011  Free Software Foundation, Inc.
-  Free Software Foundation, Inc.
 See the end of the file for license conditions.
diff --git a/etc/NEWS.21 b/etc/NEWS.21
index 10accb2236b..47f61a13e3b 100644
--- a/etc/NEWS.21
+++ b/etc/NEWS.21
@@ -1,7 +1,6 @@
 GNU Emacs NEWS -- history of user-visible changes.  2006-05-31
-Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+Copyright (C) 2000-2011  Free Software Foundation, Inc.
-  Free Software Foundation, Inc.
 See the end of the file for license conditions.
diff --git a/etc/NEWS.22 b/etc/NEWS.22
index 79ccaf3101a..3920f59fefa 100644
--- a/etc/NEWS.22
+++ b/etc/NEWS.22
@@ -1,7 +1,6 @@
 GNU Emacs NEWS -- history of user-visible changes.
-Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+Copyright (C) 2001-2011  Free Software Foundation, Inc.
-          Free Software Foundation, Inc.
 See the end of the file for license conditions.
 Please send Emacs bug reports to bug-gnu-emacs@gnu.org.
@@ -5606,5 +5605,3 @@ Local variables:
 mode: outline
 paragraph-separate: "[  ]*$"
 end:
-arch-tag: 1aca9dfa-2ac4-4d14-bebf-0007cee12793
diff --git a/etc/NEWS.23 b/etc/NEWS.23
index 0608286e6d5..22c0b1de19c 100644
--- a/etc/NEWS.23
+++ b/etc/NEWS.23
@@ -1,6 +1,6 @@
 GNU Emacs NEWS -- history of user-visible changes.
-Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+Copyright (C) 2007-2011 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 Please send Emacs bug reports to bug-gnu-emacs@gnu.org.
@@ -21,6 +21,10 @@ with a prefix argument or by typing C-u C-h C-n.
 * Changes in Emacs 23.3
+++
+** The last-resort backup file `%backup%~' is now written to
+`user-emacs-directory', instead of the user's home directory.
 * Editing Changes in Emacs 23.3
@@ -67,6 +71,27 @@ Bazaar recognizes the headers "Author", "Date" and "Fixes".
 Git, Mercurial, and Monotone recognize "Author" and "Date".
 Any unknown header is left as is in the message, so it is not lost.
+** Rmail
+*** The default value of `rmail-enable-mime' is now t.  Rmail decodes
+MIME contents automatically.  You can customize the variable
+`rmail-enable-mime' back to `nil' to disable this automatic MIME
+decoding.
+*** The command `rmail-mime' change the displaying of a MIME message
+between decoded presentation form and raw data if `rmail-enable-mime'
+is non-nil.  And, with prefix argument, it change only the displaying
+of the MIME entity at point.
+*** The new command `rmail-mime-next-item' (bound to TAB) moves point
+to the next item of MIME message.
+*** The new command `rmail-mime-previous-item' (bound to backtab) moves
+point to the previous item of MIME message.
+*** The new command `rmail-mime-toggle-hidden' (RET) hide or show the
+body of the MIME entity at point.
 ** Obsolete packages
 +++
@@ -2493,4 +2518,3 @@ mode: outline
 paragraph-separate: "[  ]*$"
 end:
-arch-tag: e759449d-88b3-4de4-9900-3a6c3dfa23e2
diff --git a/etc/NEXTSTEP b/etc/NEXTSTEP
index d55bd65d884..fcde9727dff 100644
--- a/etc/NEXTSTEP
+++ b/etc/NEXTSTEP
@@ -1,4 +1,4 @@
-Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
+Copyright (C) 2008-2011 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 This file contains information about GNU Emacs on "Nextstep" platforms.
diff --git a/etc/PROBLEMS b/etc/PROBLEMS
index 7090b225d7e..15d4ea227d0 100644
--- a/etc/PROBLEMS
+++ b/etc/PROBLEMS
@@ -1,7 +1,6 @@
 Known Problems with GNU Emacs
-Copyright (C) 1987, 1988, 1989, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+Copyright (C) 1987-1989, 1993-1999, 2001-2011
-  2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
  Free Software Foundation, Inc.
 See the end of the file for license conditions.
@@ -102,7 +101,7 @@ This can be another symptom of stale *.elc files in your load-path.
 The following command will print any duplicate Lisp files that are
 present in load-path:
-    emacs -q -batch -f list-load-path-shadows
+    emacs -batch -f list-load-path-shadows
 If this command prints any file names, some of these files are stale,
 and should be deleted or their directories removed from your
@@ -1660,6 +1659,19 @@ the script:
 exec 2> >(exec cat >&2 2>/dev/null)
 exec ssh "$@"
+*** GNU/Linux: Truncated svn annotate output with SSH.
+http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7791
+The symptoms are: you are accessing a svn repository over SSH.
+You use vc-annotate on a large (several thousand line) file, and the
+result is truncated around the 1000 line mark.  It works fine with
+other access methods (eg http), or from outside Emacs.
+This may be a similar libc/SSH issue to the one mentioned above for CVS.
+A similar workaround seems to be effective: create a script with the
+same contents as the one used above for CVS_RSH, and set the SVN_SSH
+environment variable to point to it.
 *** GNU/Linux: On Linux-based GNU systems using libc versions 5.4.19 through
 5.4.22, Emacs crashes at startup with a segmentation fault.
@@ -3244,5 +3256,3 @@ Local variables:
 mode: outline
 paragraph-separate: "[  ]*$"
 end:
-arch-tag: 49fc0d95-88cb-4715-b21c-f27fb5a4764a
diff --git a/etc/README b/etc/README
index 8fe5075142b..d1cad4a3a0f 100644
--- a/etc/README
+++ b/etc/README
@@ -9,6 +9,5 @@ COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES
 File: emacs.icon
  Author: Sun Microsystems, Inc
-  Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+  Copyright (C) 1999, 2001-2011  Free Software Foundation, Inc.
-    Free Software Foundation, Inc.
  License: GNU General Public License version 3 or later (see COPYING)
diff --git a/etc/SERVICE b/etc/SERVICE
index 3a057b98af1..61a4b950cee 100644
--- a/etc/SERVICE
+++ b/etc/SERVICE
@@ -7,4 +7,3 @@ GNU software, including GNU Emacs, for a fee or in some cases at no
 charge.
-arch-tag: 1253ce32-1cbd-428a-ac36-70ed9e3999fc
diff --git a/etc/TERMS b/etc/TERMS
index d4003cbebb0..e361188247b 100644
--- a/etc/TERMS
+++ b/etc/TERMS
@@ -1,5 +1,4 @@
-Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+Copyright (C) 1999, 2001-2011  Free Software Foundation, Inc.
-Free Software Foundation, Inc.
 See the end of the file for copying permissions.
 This file describes what you must or might want to do to termcap entries
diff --git a/etc/TODO b/etc/TODO
index 8394be6611d..6019473b92f 100644
--- a/etc/TODO
+++ b/etc/TODO
@@ -1,7 +1,6 @@
 Emacs TODO List                                                   -*-outline-*-
-Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+Copyright (C) 2001-2011  Free Software Foundation, Inc.
-  2010  Free Software Foundation, Inc.
 See the end of the file for license conditions.
diff --git a/etc/charsets/README b/etc/charsets/README
index 82a9e0bbdde..cd009220c3b 100644
--- a/etc/charsets/README
+++ b/etc/charsets/README
@@ -1,9 +1,8 @@
 # README file for charset mapping files in this directory.
-# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
 #   National Institute of Advanced Industrial Science and Technology (AIST)
 #   Registration Number H13PRO009
-# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+# Copyright (C) 2003-2011  Free Software Foundation, Inc.
-#   Free Software Foundation, Inc.
 # This file is part of GNU Emacs.
diff --git a/etc/compilation.txt b/etc/compilation.txt
index 9cf39c90f9f..85971cc26dd 100644
--- a/etc/compilation.txt
+++ b/etc/compilation.txt
@@ -233,7 +233,7 @@ symbol: gcc-include
 The last file, i.e. the one you are compiling, is the interesting one.
 In file included from /usr/include/c++/3.3/backward/warn.h:4,
-                 from /usr/include/c++/3.3/backward/iostream.h:31,
+                 from /usr/include/c++/3.3/backward/iostream.h:31:0,
                 from test_clt.cc:1:
@@ -548,8 +548,7 @@ Compilation segmentation fault at Thu Jul 13 10:55:49
 Compilation finished at Thu Jul 21 15:02:15
-Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
+Copyright (C) 2004-2011  Free Software Foundation, Inc.
-Free Software Foundation, Inc.
 COPYING PERMISSIONS:
diff --git a/etc/edt-user.el b/etc/edt-user.el
index 663c6617ce4..84e6f8ca1b8 100644
--- a/etc/edt-user.el
+++ b/etc/edt-user.el
@@ -1,7 +1,6 @@
 ;;; edt-user.el --- Sample user customizations for Emacs EDT emulation
-;; Copyright (C) 1986, 1992, 1993, 2000, 2001, 2002, 2003, 2004, 2005,
+;; Copyright (C) 1986, 1992-1993, 2000-2011  Free Software Foundation, Inc.
-;;   2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
 ;; Author: Kevin Gallagher <kgallagh@@spd.dsccc.com>
 ;; Maintainer: Kevin Gallagher <kgallagh@@spd.dsccc.com>
@@ -166,5 +165,4 @@ G-C-\\: Split Window
  (interactive)
  (describe-function 'edt-user-keypad-help))
-;; arch-tag: a4671ca7-34b7-43a5-844c-2b2a89134ff4
 ;;; edt-user.el ends here
diff --git a/etc/emacs-buffer.gdb b/etc/emacs-buffer.gdb
index f0709aba7a0..14a7615801c 100644
--- a/etc/emacs-buffer.gdb
+++ b/etc/emacs-buffer.gdb
@@ -1,6 +1,6 @@
 # emacs-buffer.gdb --- gdb macros for recovering buffers from emacs coredumps
-# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2005-2011 Free Software Foundation, Inc.
 # Maintainer: Noah Friedman <friedman@splode.com>
 # Status: Works with Emacs 22.0.51.1 (prerelease) as of 2006-01-12.
@@ -268,4 +268,3 @@ end
 # mode: gdb-script
 # end:
-# arch-tag: 02087f62-2663-4868-977a-1fbb2fc2e7ef
diff --git a/etc/emacs.py b/etc/emacs.py
index 964c1f17f40..24004b321fe 100644
--- a/etc/emacs.py
+++ b/etc/emacs.py
@@ -8,4 +8,3 @@ if sys.version_info[0] == 3:
 else:
    from emacs2 import *
-# arch-tag: 894b5227-638f-45fd-8567-0417d5c35900
diff --git a/etc/emacs2.py b/etc/emacs2.py
index 12faf7a8be1..805024cca3d 100644
--- a/etc/emacs2.py
+++ b/etc/emacs2.py
@@ -1,6 +1,6 @@
 """Definitions used by commands sent to inferior Python in python.el."""
-# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+# Copyright (C) 2004-2011  Free Software Foundation, Inc.
 # Author: Dave Love <fx@gnu.org>
 # This file is part of GNU Emacs.
@@ -234,4 +234,3 @@ Assumes that MODULE.py and MODULE.pyc are in the same directory."""
 # print '_emacs_ok'             # ready for input and can call continuation
-# arch-tag: d90408f3-90e2-4de4-99c2-6eb9c7b9ca46
diff --git a/etc/emacs3.py b/etc/emacs3.py
index de81848e5c3..470547b1877 100644
--- a/etc/emacs3.py
+++ b/etc/emacs3.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+# Copyright (C) 2004-2011  Free Software Foundation, Inc.
 # Author: Dave Love <fx@gnu.org>
 # This file is part of GNU Emacs.
@@ -232,4 +232,3 @@ Assumes that MODULE.py and MODULE.pyc are in the same directory."""
 # print '_emacs_ok'             # ready for input and can call continuation
-# arch-tag: 37bfed38-5f4a-4027-a2bf-d5f41819dd89
diff --git a/etc/enriched.doc b/etc/enriched.doc
index 4f01dea385f..5b2e1a88f24 100644
--- a/etc/enriched.doc
+++ b/etc/enriched.doc
@@ -256,8 +256,7 @@ bug reports are welcome.</indent>
-Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+Copyright (C) 1995, 1997, 2001-2011  Free Software Foundation, Inc.
-Free Software Foundation, Inc.
 COPYING PERMISSIONS:
diff --git a/etc/gnus-tut.txt b/etc/gnus-tut.txt
index ca8dd11d8aa..80a652ba25f 100644
--- a/etc/gnus-tut.txt
+++ b/etc/gnus-tut.txt
@@ -24,8 +24,7 @@ was done by moi, yours truly, your humble servant, Lars Magne
 Ingebrigtsen.  If you have a WWW browser, you can investigate to your
 heart's delight at <URL:http://www.ifi.uio.no/~larsi/larsi.html>.
-;; Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+;; Copyright (C) 1995, 2001-2011  Free Software Foundation, Inc.
-;;   2008, 2009, 2010  Free Software Foundation, Inc.
 ;; Author: Lars Magne Ingebrigtsen <larsi@ifi.uio.no>
 ;; Keywords: news
diff --git a/etc/grep.txt b/etc/grep.txt
index fa3f63c9ffc..9a3159f6b08 100644
--- a/etc/grep.txt
+++ b/etc/grep.txt
@@ -84,8 +84,7 @@ grep -nH -e "xyzxyz" ../info/*
-Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010
+Copyright (C) 2005-2011  Free Software Foundation, Inc.
-Free Software Foundation, Inc.
 COPYING PERMISSIONS:
diff --git a/etc/images/README b/etc/images/README
index 7adb3c7eb85..ae2d0556ad2 100644
--- a/etc/images/README
+++ b/etc/images/README
@@ -23,21 +23,19 @@ COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES
 File: mh-logo.xpm
  Author: Satyaki Das
-  Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+  Copyright (C) 2003-2011  Free Software Foundation, Inc.
-    Free Software Foundation, Inc.
 Files: splash.pbm, splash.xpm, gnus.pbm
  Author: Luis Fernandes <elf@ee.ryerson.ca>
-  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+  Copyright (C) 2001-2011  Free Software Foundation, Inc.
-    2010 Free Software Foundation, Inc.
 Files: splash.png, splash.svg
  Author: Francesc Rocher <rocher@member.fsf.org>
-  Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
+  Copyright (C) 2008-2011  Free Software Foundation, Inc.
 Files: checked.xpm, unchecked.xpm
  Author: Chong Yidong <cyd@stupidchicken.com>
-  Copyright (C) 2010 Free Software Foundation, Inc.
+  Copyright (C) 2010-2011  Free Software Foundation, Inc.
 * The following icons are from GTK+ 2.x. They are not part of Emacs, but
diff --git a/etc/images/checked.xpm b/etc/images/checked.xpm
index e0152594836..959e77d7050 100644
--- a/etc/images/checked.xpm
+++ b/etc/images/checked.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-/* Copyright (C) 2010 Free Software Foundation, Inc.
+/* Copyright (C) 2010-2011 Free Software Foundation, Inc.
 *
 * Author: Chong Yidong <cyd@stupidchicken.com>
 *
diff --git a/etc/images/custom/README b/etc/images/custom/README
index 1b67e16526b..ad37dc1a7ac 100644
--- a/etc/images/custom/README
+++ b/etc/images/custom/README
@@ -6,5 +6,5 @@ COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES
 Files: down.xpm down-pushed.xpm right.xpm right-pushed.xpm
 Author: Juri Linkov
-Copyright (C) 2008, 2009, 2010  Free Software Foundation, Inc.
+Copyright (C) 2008-2011  Free Software Foundation, Inc.
 License: GNU General Public License version 3 or later (see COPYING)
diff --git a/etc/images/ezimage/README b/etc/images/ezimage/README
index a2b54c84e29..38d49f3bb64 100644
--- a/etc/images/ezimage/README
+++ b/etc/images/ezimage/README
@@ -7,6 +7,5 @@ Files: bits.xpm bitsbang.xpm box-minus.xpm box-plus.xpm
       tag-gt.xpm tag-minus.xpm tag-plus.xpm tag-type.xpm tag-v.xpm
       tag.xpm unlock.xpm
 Author: Eric M. Ludlam
-Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+Copyright (C) 1999-2011  Free Software Foundation, Inc.
-  2009, 2010  Free Software Foundation, Inc.
 License: GNU General Public License version 3 or later (see COPYING)
diff --git a/etc/images/gnus/README b/etc/images/gnus/README
index 03efb7f7164..b19ad3fedcb 100644
--- a/etc/images/gnus/README
+++ b/etc/images/gnus/README
@@ -7,8 +7,7 @@ COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES
 Files: important.xpm, unimportant.xpm
 Author: Simon Josefsson <simon@josefsson.org>
-Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+Copyright (C) 2001-2011  Free Software Foundation, Inc.
-  2010  Free Software Foundation, Inc.
 Files: catchup.pbm catchup.xpm cu-exit.pbm cu-exit.xpm
  describe-group.pbm describe-group.xpm exit-gnus.pbm exit-gnus.xpm
@@ -22,12 +21,11 @@ Files: catchup.pbm catchup.xpm cu-exit.pbm cu-exit.xpm
  unsubscribe.pbm unsubscribe.xpm uu-decode.pbm uu-decode.xpm
  uu-post.pbm uu-post.xpm
 Author: Luis Fernandes <elf@ee.ryerson.ca>
-Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+Copyright (C) 2001-2011  Free Software Foundation, Inc.
-  2010  Free Software Foundation, Inc.
 Files: gnus.png, gnus.svg
  Author: Francesc Rocher <rocher@member.fsf.org>
-  Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
+  Copyright (C) 2008-2011 Free Software Foundation, Inc.
 * The following icons are from GNOME 2.x. They are not part of Emacs,
diff --git a/etc/images/gnus/gnus.svg b/etc/images/gnus/gnus.svg
index ff21a81d485..aad6560a004 100644
--- a/etc/images/gnus/gnus.svg
+++ b/etc/images/gnus/gnus.svg
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Gnu Emacs Logo
-   Copyright (C) 2008, 2009, 2010
+   Copyright (C) 2008-2011  Free Software Foundation, Inc.
-   Free Software Foundation, Inc.
   Author: Francesc Rocher <f.rocher@member.fsf.org>
diff --git a/etc/images/gud/README b/etc/images/gud/README
index a9c18c42070..11c22bab49f 100644
--- a/etc/images/gud/README
+++ b/etc/images/gud/README
@@ -1,8 +1,7 @@
 COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES
 The following icons were created by Nick Roberts <nickrob@snap.net.nz>.
-Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+Copyright (C) 2002-2011  Free Software Foundation, Inc.
-  Free Software Foundation, Inc.
 License: GNU General Public License version 3 or later (see COPYING)
  
  break.pbm, nexti.pbm, go.pbm, pp.pbm, print.pbm, pstar.pbm, remove.pbm
@@ -32,8 +31,7 @@ their copyright assignment included the icons.
 The following icons are converted from the Insight Windows style icon
 set in src/gdb/gdbtk/library/images2.
-Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+Copyright (C) 2002-2011  Free Software Foundation, Inc.
-  Free Software Foundation, Inc.
 License: GNU General Public License version 3 or later (see COPYING)
  cont.pbm and cont.xpm were converted from continue.gif
@@ -49,8 +47,7 @@ License: GNU General Public License version 3 or later (see COPYING)
 The following icons are created from the Insight Windows style icon
 set in src/gdb/gdbtk/library/images2.
-Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+Copyright (C) 2002-2011  Free Software Foundation, Inc.
-  Free Software Foundation, Inc.
 License: GNU General Public License version 3 or later (see COPYING)
  rcont.xpm rfinish.xpm
diff --git a/etc/images/icons/README b/etc/images/icons/README
index 491dc96c848..7855f401bb1 100644
--- a/etc/images/icons/README
+++ b/etc/images/icons/README
@@ -5,7 +5,7 @@ Files: hicolor/16x16/apps/emacs.png hicolor/24x24/apps/emacs.png
       hicolor/128x128/apps/emacs.png hicolor/scalable/apps/emacs.svg
 Author: Kentaro Ohkouchi <nanasess@fsm.ne.jp>
-Copyright (C) 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+Copyright (C) 2007-2011  Free Software Foundation, Inc.
 License: GNU General Public License version 3 or later (see COPYING)
@@ -13,5 +13,5 @@ Files: hicolor/16x16/apps/emacs22.png hicolor/24x24/apps/emacs22.png
       hicolor/32x32/apps/emacs22.png hicolor/48x48/apps/emacs22.png
 Author: Andrew Zhilin <andrew_zhilin@yahoo.com>
-Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+Copyright (C) 2005-2011  Free Software Foundation, Inc.
 License: GNU General Public License version 3 or later (see COPYING)
diff --git a/etc/images/icons/hicolor/scalable/apps/emacs.svg b/etc/images/icons/hicolor/scalable/apps/emacs.svg
index 7565ef4b1f0..5abdc931c1c 100644
--- a/etc/images/icons/hicolor/scalable/apps/emacs.svg
+++ b/etc/images/icons/hicolor/scalable/apps/emacs.svg
@@ -10,7 +10,7 @@
   id="svg4768"
   xml:space="preserve">
 <!-- Gnu Emacs Icon
-   Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2008-2011  Free Software Foundation, Inc.
   This file is part of GNU Emacs.
diff --git a/etc/images/icons/hicolor/scalable/mimetypes/emacs-document.svg b/etc/images/icons/hicolor/scalable/mimetypes/emacs-document.svg
index f76091defae..2abe908b92c 100644
--- a/etc/images/icons/hicolor/scalable/mimetypes/emacs-document.svg
+++ b/etc/images/icons/hicolor/scalable/mimetypes/emacs-document.svg
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Gnu Emacs Document Icon
-   Copyright (C) 2008, 2009, 2010
+   Copyright (C) 2008-2011  Free Software Foundation, Inc.
-   Free Software Foundation, Inc.
   This file is part of GNU Emacs.
diff --git a/etc/images/mh-logo.xpm b/etc/images/mh-logo.xpm
index adc0c3a7bb3..8b1d1f53788 100644
--- a/etc/images/mh-logo.xpm
+++ b/etc/images/mh-logo.xpm
@@ -1,8 +1,7 @@
 /* XPM */
 /* MH-E Logo
 *
- * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+ * Copyright (C) 2003-2011  Free Software Foundation, Inc.
- *   Free Software Foundation, Inc.
 *
 * Author: Satyaki Das
 *
diff --git a/etc/images/mpc/README b/etc/images/mpc/README
index b46ba78077b..99317ea90c0 100644
--- a/etc/images/mpc/README
+++ b/etc/images/mpc/README
@@ -2,5 +2,5 @@ COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES
 Files: add.xpm ffwd.xpm next.xpm pause.xpm play.xpm prev.xpm rewind.xpm stop.xpm
 Author: Stefan Monnier <monnier@iro.umontreal.ca>
-Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+Copyright (C) 2009-2011 Free Software Foundation, Inc.
 License: GNU General Public License version 3 or later (see COPYING)
diff --git a/etc/images/mpc/ffwd.xpm b/etc/images/mpc/ffwd.xpm
index c0b5a91a735..0d1ca0136e1 100644
--- a/etc/images/mpc/ffwd.xpm
+++ b/etc/images/mpc/ffwd.xpm
@@ -31,4 +31,3 @@ static char * ffwd_xpm[] = {
 " .ooooooooooooooooooooo ",
 "                        "};
-/* arch-tag: 9b0fa3cf-1e36-4c20-ac68-948c2ae86b62 */
diff --git a/etc/images/mpc/next.xpm b/etc/images/mpc/next.xpm
index e94b6388a4f..af712de14f7 100644
--- a/etc/images/mpc/next.xpm
+++ b/etc/images/mpc/next.xpm
@@ -31,4 +31,3 @@ static char * next_xpm[] = {
 " .ooooooooooooooooooooo ",
 "                        "};
-/* arch-tag: 69a2ee4e-e71f-432d-b17b-ac8055dacc93 */
diff --git a/etc/images/mpc/pause.xpm b/etc/images/mpc/pause.xpm
index 5a5d977c6f5..e02c3b80a2b 100644
--- a/etc/images/mpc/pause.xpm
+++ b/etc/images/mpc/pause.xpm
@@ -30,4 +30,3 @@ static char * pause_xpm[] = {
 " .ooooooooooooooooooooo ",
 "                        "};
-/* arch-tag: 3fe99afb-7dfd-49dd-b5b3-d8eedf14b362 */
diff --git a/etc/images/mpc/play.xpm b/etc/images/mpc/play.xpm
index 0f9b6905d74..9a6e289b36e 100644
--- a/etc/images/mpc/play.xpm
+++ b/etc/images/mpc/play.xpm
@@ -31,4 +31,3 @@ static char * play_xpm[] = {
 " .ooooooooooooooooooooo ",
 "                        "};
-/* arch-tag: 318eb8de-b126-48bd-818b-bb293df74ec8 */
diff --git a/etc/images/mpc/prev.xpm b/etc/images/mpc/prev.xpm
index aa973706fe9..6fe140de9df 100644
--- a/etc/images/mpc/prev.xpm
+++ b/etc/images/mpc/prev.xpm
@@ -30,4 +30,3 @@ static char * prev_xpm[] = {
 " .ooooooooooooooooooooo ",
 "                        "};
-/* arch-tag: 284e0591-6e14-4dae-9cc3-c722fa0b9099 */
diff --git a/etc/images/mpc/rewind.xpm b/etc/images/mpc/rewind.xpm
index 3dd285a9a76..af94c0fed2e 100644
--- a/etc/images/mpc/rewind.xpm
+++ b/etc/images/mpc/rewind.xpm
@@ -30,4 +30,3 @@ static char * rewind_xpm[] = {
 " .ooooooooooooooooooooo ",
 "                        "};
-/* arch-tag: 2bdb6c7f-8ddb-4110-b8ee-ffc3f06d1aa9 */
diff --git a/etc/images/mpc/stop.xpm b/etc/images/mpc/stop.xpm
index d5e4d517d0b..446c462e126 100644
--- a/etc/images/mpc/stop.xpm
+++ b/etc/images/mpc/stop.xpm
@@ -30,4 +30,3 @@ static char * stop_xpm[] = {
 " .ooooooooooooooooooooo ",
 "                        "};
-/* arch-tag: 184ad626-ea69-40ae-839a-f5b5929ebb93 */
diff --git a/etc/images/separator.xpm b/etc/images/separator.xpm
index 0c518fa7599..b728316a8f8 100644
--- a/etc/images/separator.xpm
+++ b/etc/images/separator.xpm
@@ -2,11 +2,12 @@
 static char * separator_xpm[] = {
 "2 24 3 1",
 "       c None",
-".      c #DBD3CB",
+".      c #888888",
-"+      c #FCFBFA",
+"+      c #FFFFFF",
-"  ",
 "  ",
 "  ",
+".+ ",
+".+",
 ".+",
 ".+",
 ".+",
@@ -25,6 +26,5 @@ static char * separator_xpm[] = {
 ".+",
 ".+",
 ".+",
-"  ",
 "  ",
 "  "};
diff --git a/etc/images/smilies/README b/etc/images/smilies/README
index bd0ec8da7bb..d009849e36c 100644
--- a/etc/images/smilies/README
+++ b/etc/images/smilies/README
@@ -3,6 +3,5 @@ Files: blink.pbm blink.xpm braindamaged.xpm cry.xpm dead.xpm evil.xpm
       sad.xpm smile.pbm smile.xpm wry.pbm wry.xpm
 Authors: Reiner Steib, Simon Josefsson, Kai Grossjohann, Alex
         Schroeder, Oliver Scholz, Per Abrahamsen, Kim F. Storm.
-Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+Copyright (C) 1999-2011  Free Software Foundation, Inc.
-  2009, 2010  Free Software Foundation, Inc.
 License: GNU General Public License version 3 or later (see COPYING)
diff --git a/etc/images/smilies/grayscale/README b/etc/images/smilies/grayscale/README
index 1cd5ff7879f..dc356104a78 100644
--- a/etc/images/smilies/grayscale/README
+++ b/etc/images/smilies/grayscale/README
@@ -2,5 +2,5 @@ Files: blink.xpm braindamaged.xpm cry.xpm dead.xpm evil.xpm forced.xpm
       frown.xpm grin.xpm indifferent.xpm reverse-smile.xpm sad.xpm
       smile.xpm wry.xpm 
 Author: Adam Sj�gren
-Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+Copyright (C) 2007-2011 Free Software Foundation, Inc.
 License: GNU General Public License version 3 or later (see COPYING)
diff --git a/etc/images/smilies/medium/README b/etc/images/smilies/medium/README
index 1cd5ff7879f..dc356104a78 100644
--- a/etc/images/smilies/medium/README
+++ b/etc/images/smilies/medium/README
@@ -2,5 +2,5 @@ Files: blink.xpm braindamaged.xpm cry.xpm dead.xpm evil.xpm forced.xpm
       frown.xpm grin.xpm indifferent.xpm reverse-smile.xpm sad.xpm
       smile.xpm wry.xpm 
 Author: Adam Sj�gren
-Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+Copyright (C) 2007-2011 Free Software Foundation, Inc.
 License: GNU General Public License version 3 or later (see COPYING)
diff --git a/etc/images/splash.svg b/etc/images/splash.svg
index 1346619f1d1..68ba4d7f7d7 100644
--- a/etc/images/splash.svg
+++ b/etc/images/splash.svg
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Gnu Emacs Logo
-   Copyright (C) 2008, 2009, 2010
+   Copyright (C) 2008-2011  Free Software Foundation, Inc.
-   Free Software Foundation, Inc.
   Author: Francesc Rocher <f.rocher@members.fsf.org>
   Based on the original work by Luis Fernandes <elf@ee.ryerson.ca>
diff --git a/etc/images/splash.xpm b/etc/images/splash.xpm
index 2b42a8d8455..30a587babaa 100644
--- a/etc/images/splash.xpm
+++ b/etc/images/splash.xpm
@@ -1,8 +1,7 @@
 /* XPM */
 /* Gnu Emacs Logo
 *
- * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+ * Copyright (C) 2001-2011  Free Software Foundation, Inc.
- *   Free Software Foundation, Inc.
 *
 * Author: Luis Fernandes <elf@ee.ryerson.ca>
 *
diff --git a/etc/images/tree-widget/default/README b/etc/images/tree-widget/default/README
index ca52bb5fb74..ccc6cdbf21e 100644
--- a/etc/images/tree-widget/default/README
+++ b/etc/images/tree-widget/default/README
@@ -5,6 +5,5 @@ Files: close.png close.xpm empty.png empty.xpm end-guide.png end-guide.xpm
       no-guide.png no-guide.xpm no-handle.png no-handle.xpm open.png
       open.xpm
 Author: David Ponce <david.ponce@wanadoo.fr>
-Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
+Copyright (C) 2004-2011  Free Software Foundation, Inc.
-  Free Software Foundation, Inc.
 License: GNU General Public License version 3 or later (see COPYING)
diff --git a/etc/images/tree-widget/folder/README b/etc/images/tree-widget/folder/README
index d4f24a7f85c..58716db456d 100644
--- a/etc/images/tree-widget/folder/README
+++ b/etc/images/tree-widget/folder/README
@@ -5,6 +5,5 @@ Files:  close.png close.xpm empty.png empty.xpm end-guide.png
        leaf.png leaf.xpm no-guide.png no-guide.xpm no-handle.png
        no-handle.xpm open.png open.xpm
 Author: David Ponce <david.ponce@wanadoo.fr>
-Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
+Copyright (C) 2004-2011  Free Software Foundation, Inc.
-  Free Software Foundation, Inc.
 License: GNU General Public License version 3 or later (see COPYING)
diff --git a/etc/images/unchecked.xpm b/etc/images/unchecked.xpm
index ad01824d222..06e5178bce0 100644
--- a/etc/images/unchecked.xpm
+++ b/etc/images/unchecked.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-/* Copyright (C) 2010 Free Software Foundation, Inc.
+/* Copyright (C) 2010-2011 Free Software Foundation, Inc.
 *
 * Author: Chong Yidong <cyd@stupidchicken.com>
 *
diff --git a/etc/nxml/00000-0007F.el b/etc/nxml/00000-0007F.el
index da2be08938c..4fc236b53f9 100644
--- a/etc/nxml/00000-0007F.el
+++ b/etc/nxml/00000-0007F.el
@@ -96,4 +96,3 @@
    ("TILDE" #x007E)
    ))
-;; arch-tag: c46ffe15-ef5b-46f6-837f-d6bcf56db5b2
diff --git a/etc/nxml/00080-000FF.el b/etc/nxml/00080-000FF.el
index 61fd8e0a4b0..8f00b10afa2 100644
--- a/etc/nxml/00080-000FF.el
+++ b/etc/nxml/00080-000FF.el
@@ -97,4 +97,3 @@
    ("LATIN SMALL LETTER Y WITH DIAERESIS" #x00FF)
    ))
-;; arch-tag: f7ca0f06-9eb7-4b7a-b014-795af10f23ac
diff --git a/etc/nxml/00100-0017F.el b/etc/nxml/00100-0017F.el
index 5c15ef91dfb..f78006615e5 100644
--- a/etc/nxml/00100-0017F.el
+++ b/etc/nxml/00100-0017F.el
@@ -129,4 +129,3 @@
    ("LATIN SMALL LETTER LONG S" #x017F)
    ))
-;; arch-tag: 30e6e868-1bc7-4cd1-b75b-7fd4354cf8fe
diff --git a/etc/nxml/00180-0024F.el b/etc/nxml/00180-0024F.el
index 5bc138be499..fe99beef0e5 100644
--- a/etc/nxml/00180-0024F.el
+++ b/etc/nxml/00180-0024F.el
@@ -180,4 +180,3 @@
    ("LATIN SMALL LETTER Y WITH MACRON" #x0233)
    ))
-;; arch-tag: d2a4e7e0-0d3a-4a29-994e-f5d0ed62cea2
diff --git a/etc/nxml/00250-002AF.el b/etc/nxml/00250-002AF.el
index 62ffa630e96..63c474c63d8 100644
--- a/etc/nxml/00250-002AF.el
+++ b/etc/nxml/00250-002AF.el
@@ -95,4 +95,3 @@
    ("LATIN LETTER BIDENTAL PERCUSSIVE" #x02AD)
    ))
-;; arch-tag: edc50b43-a94e-48db-91c5-0f9ea113c93c
diff --git a/etc/nxml/002B0-002FF.el b/etc/nxml/002B0-002FF.el
index e94f58cc186..e72339e44a4 100644
--- a/etc/nxml/002B0-002FF.el
+++ b/etc/nxml/002B0-002FF.el
@@ -64,4 +64,3 @@
    ("MODIFIER LETTER DOUBLE APOSTROPHE" #x02EE)
    ))
-;; arch-tag: 5fa09061-850e-4bbe-ad44-54c57a81a461
diff --git a/etc/nxml/00300-0036F.el b/etc/nxml/00300-0036F.el
index d82fa0b2faf..09024c92ec0 100644
--- a/etc/nxml/00300-0036F.el
+++ b/etc/nxml/00300-0036F.el
@@ -97,4 +97,3 @@
    ("COMBINING LATIN SMALL LETTER X" #x036F)
    ))
-;; arch-tag: a3b46b6e-38fc-4043-b7f5-92a3591e2e47
diff --git a/etc/nxml/00370-003FF.el b/etc/nxml/00370-003FF.el
index 780653b57b9..e127ea137a7 100644
--- a/etc/nxml/00370-003FF.el
+++ b/etc/nxml/00370-003FF.el
@@ -116,4 +116,3 @@
    ("GREEK REVERSED LUNATE EPSILON SYMBOL" #x03F6)
    ))
-;; arch-tag: 033e25a2-6f9c-4e9f-b517-be5ed38829af
diff --git a/etc/nxml/00400-004FF.el b/etc/nxml/00400-004FF.el
index b041b437cc9..e93109913a7 100644
--- a/etc/nxml/00400-004FF.el
+++ b/etc/nxml/00400-004FF.el
@@ -247,4 +247,3 @@
    ("CYRILLIC SMALL LETTER YERU WITH DIAERESIS" #x04F9)
    ))
-;; arch-tag: 9cd8c4dd-3386-4c0a-b1dd-984efa12d958
diff --git a/etc/nxml/00500-0052F.el b/etc/nxml/00500-0052F.el
index c098c898240..ba1587a43cd 100644
--- a/etc/nxml/00500-0052F.el
+++ b/etc/nxml/00500-0052F.el
@@ -17,4 +17,3 @@
    ("CYRILLIC SMALL LETTER KOMI TJE" #x050F)
    ))
-;; arch-tag: 3ae51d36-3921-4ec5-b6be-3e9c895be9f3
diff --git a/etc/nxml/00530-0058F.el b/etc/nxml/00530-0058F.el
index 2b530a5afe4..83b5bdff208 100644
--- a/etc/nxml/00530-0058F.el
+++ b/etc/nxml/00530-0058F.el
@@ -87,4 +87,3 @@
    ("ARMENIAN HYPHEN" #x058A)
    ))
-;; arch-tag: 7b3d705a-d060-42de-a918-ff39dbe5d276
diff --git a/etc/nxml/00590-005FF.el b/etc/nxml/00590-005FF.el
index 764022948ea..ecd07b12cf5 100644
--- a/etc/nxml/00590-005FF.el
+++ b/etc/nxml/00590-005FF.el
@@ -83,4 +83,3 @@
    ("HEBREW PUNCTUATION GERSHAYIM" #x05F4)
    ))
-;; arch-tag: 262da37d-1065-4dfd-b6e4-a8259a780caf
diff --git a/etc/nxml/00600-006FF.el b/etc/nxml/00600-006FF.el
index c489a70dcac..a3b997f7555 100644
--- a/etc/nxml/00600-006FF.el
+++ b/etc/nxml/00600-006FF.el
@@ -209,4 +209,3 @@
    ("ARABIC SIGN SINDHI POSTPOSITION MEN" #x06FE)
    ))
-;; arch-tag: b20189fa-7cdb-4544-a41c-f4e0477d9e5e
diff --git a/etc/nxml/00700-0074F.el b/etc/nxml/00700-0074F.el
index 549387afe89..16bc7ae7f5c 100644
--- a/etc/nxml/00700-0074F.el
+++ b/etc/nxml/00700-0074F.el
@@ -72,4 +72,3 @@
    ("SYRIAC BARREKH" #x074A)
    ))
-;; arch-tag: c008122a-484e-4253-b18f-eb215dbd1ecf
diff --git a/etc/nxml/00780-007BF.el b/etc/nxml/00780-007BF.el
index cda860cfebd..8d54fd5c229 100644
--- a/etc/nxml/00780-007BF.el
+++ b/etc/nxml/00780-007BF.el
@@ -51,4 +51,3 @@
    ("THAANA LETTER NAA" #x07B1)
    ))
-;; arch-tag: e1974c30-0604-412a-af3d-b6e688e0586c
diff --git a/etc/nxml/00900-0097F.el b/etc/nxml/00900-0097F.el
index 49bcde867d6..3a253f67b1b 100644
--- a/etc/nxml/00900-0097F.el
+++ b/etc/nxml/00900-0097F.el
@@ -105,4 +105,3 @@
    ("DEVANAGARI ABBREVIATION SIGN" #x0970)
    ))
-;; arch-tag: c9d655c5-2ec9-4b64-a13f-d4fafe0cbad7
diff --git a/etc/nxml/00980-009FF.el b/etc/nxml/00980-009FF.el
index 6c6b01e1a82..5cec96ecebf 100644
--- a/etc/nxml/00980-009FF.el
+++ b/etc/nxml/00980-009FF.el
@@ -90,4 +90,3 @@
    ("BENGALI ISSHAR" #x09FA)
    ))
-;; arch-tag: 66599f15-c2b7-436a-9737-577d4f041abd
diff --git a/etc/nxml/00A00-00A7F.el b/etc/nxml/00A00-00A7F.el
index 98f221a2014..be542ff3eb5 100644
--- a/etc/nxml/00A00-00A7F.el
+++ b/etc/nxml/00A00-00A7F.el
@@ -76,4 +76,3 @@
    ("GURMUKHI EK ONKAR" #x0A74)
    ))
-;; arch-tag: e97fe67c-79ac-48f8-8274-22436eec2f01
diff --git a/etc/nxml/00A80-00AFF.el b/etc/nxml/00A80-00AFF.el
index 3bbd427271a..029c3519f6e 100644
--- a/etc/nxml/00A80-00AFF.el
+++ b/etc/nxml/00A80-00AFF.el
@@ -79,4 +79,3 @@
    ("GUJARATI DIGIT NINE" #x0AEF)
    ))
-;; arch-tag: e11e63c9-1fd7-496b-be1b-4c2bb32bdec4
diff --git a/etc/nxml/00B00-00B7F.el b/etc/nxml/00B00-00B7F.el
index 033d73b41dc..5f32f4fb2ca 100644
--- a/etc/nxml/00B00-00B7F.el
+++ b/etc/nxml/00B00-00B7F.el
@@ -80,4 +80,3 @@
    ("ORIYA ISSHAR" #x0B70)
    ))
-;; arch-tag: 3a780627-f875-450a-b482-6b25f28c6f96
diff --git a/etc/nxml/00B80-00BFF.el b/etc/nxml/00B80-00BFF.el
index ab5a34b821c..5258288dbe6 100644
--- a/etc/nxml/00B80-00BFF.el
+++ b/etc/nxml/00B80-00BFF.el
@@ -62,4 +62,3 @@
    ("TAMIL NUMBER ONE THOUSAND" #x0BF2)
    ))
-;; arch-tag: a299bfdc-4543-4405-a4a8-202d178a578f
diff --git a/etc/nxml/00C00-00C7F.el b/etc/nxml/00C00-00C7F.el
index 8ccda98c60b..f33086da5d0 100644
--- a/etc/nxml/00C00-00C7F.el
+++ b/etc/nxml/00C00-00C7F.el
@@ -81,4 +81,3 @@
    ("TELUGU DIGIT NINE" #x0C6F)
    ))
-;; arch-tag: 12e2c9a2-fa3a-400a-9adb-82a89e0a639b
diff --git a/etc/nxml/00C80-00CFF.el b/etc/nxml/00C80-00CFF.el
index d5251fafbab..459b2532756 100644
--- a/etc/nxml/00C80-00CFF.el
+++ b/etc/nxml/00C80-00CFF.el
@@ -81,4 +81,3 @@
    ("KANNADA DIGIT NINE" #x0CEF)
    ))
-;; arch-tag: b17f4e00-00e9-4e2f-8343-37b9c8e29e89
diff --git a/etc/nxml/00D00-00D7F.el b/etc/nxml/00D00-00D7F.el
index 5d4a728ae05..80001ac8f72 100644
--- a/etc/nxml/00D00-00D7F.el
+++ b/etc/nxml/00D00-00D7F.el
@@ -79,4 +79,3 @@
    ("MALAYALAM DIGIT NINE" #x0D6F)
    ))
-;; arch-tag: 1bce48f6-bdc3-4ebc-b1f0-1563c32e4926
diff --git a/etc/nxml/00D80-00DFF.el b/etc/nxml/00D80-00DFF.el
index 3130b1f919d..98068983f2a 100644
--- a/etc/nxml/00D80-00DFF.el
+++ b/etc/nxml/00D80-00DFF.el
@@ -81,4 +81,3 @@
    ("SINHALA PUNCTUATION KUNDDALIYA" #x0DF4)
    ))
-;; arch-tag: 3dfac4e1-97f5-433a-bd47-8cd364b09075
diff --git a/etc/nxml/00E00-00E7F.el b/etc/nxml/00E00-00E7F.el
index f265a069a5c..992ee9a46da 100644
--- a/etc/nxml/00E00-00E7F.el
+++ b/etc/nxml/00E00-00E7F.el
@@ -88,4 +88,3 @@
    ("THAI CHARACTER KHOMUT" #x0E5B)
    ))
-;; arch-tag: cf6119b0-ae54-4871-a8a7-10621d74cba8
diff --git a/etc/nxml/00E80-00EFF.el b/etc/nxml/00E80-00EFF.el
index 29be3e172a7..8ef8a304d1d 100644
--- a/etc/nxml/00E80-00EFF.el
+++ b/etc/nxml/00E80-00EFF.el
@@ -66,4 +66,3 @@
    ("LAO HO MO" #x0EDD)
    ))
-;; arch-tag: 36f98cb4-447d-49e0-bae5-03a026adabac
diff --git a/etc/nxml/00F00-00FFF.el b/etc/nxml/00F00-00FFF.el
index 8e8be125ccc..adc8fecfa9b 100644
--- a/etc/nxml/00F00-00FFF.el
+++ b/etc/nxml/00F00-00FFF.el
@@ -194,4 +194,3 @@
    ("TIBETAN SIGN RDEL NAG GSUM" #x0FCF)
    ))
-;; arch-tag: 547e48c6-3ded-4dc7-be69-4ee324c604c3
diff --git a/etc/nxml/01000-0109F.el b/etc/nxml/01000-0109F.el
index 56ab64648b5..56c6310415c 100644
--- a/etc/nxml/01000-0109F.el
+++ b/etc/nxml/01000-0109F.el
@@ -79,4 +79,3 @@
    ("MYANMAR VOWEL SIGN VOCALIC LL" #x1059)
    ))
-;; arch-tag: 030cc7f0-2667-4504-ae9c-39c00fe146ff
diff --git a/etc/nxml/010A0-010FF.el b/etc/nxml/010A0-010FF.el
index d8c3ab7d314..e7b5916f1c8 100644
--- a/etc/nxml/010A0-010FF.el
+++ b/etc/nxml/010A0-010FF.el
@@ -81,4 +81,3 @@
    ("GEORGIAN PARAGRAPH SEPARATOR" #x10FB)
    ))
-;; arch-tag: 8f5a9cec-8b71-48c9-af68-c8c51112e5b2
diff --git a/etc/nxml/01100-011FF.el b/etc/nxml/01100-011FF.el
index 7e7619d3e8f..dbaa6212757 100644
--- a/etc/nxml/01100-011FF.el
+++ b/etc/nxml/01100-011FF.el
@@ -241,4 +241,3 @@
    ("HANGUL JONGSEONG YEORINHIEUH" #x11F9)
    ))
-;; arch-tag: e631a2ad-7d7e-4a86-89f0-e6e4f7db5f39
diff --git a/etc/nxml/01200-0137F.el b/etc/nxml/01200-0137F.el
index 26a5a3a3836..c7ac4e0ddb6 100644
--- a/etc/nxml/01200-0137F.el
+++ b/etc/nxml/01200-0137F.el
@@ -346,4 +346,3 @@
    ("ETHIOPIC NUMBER TEN THOUSAND" #x137C)
    ))
-;; arch-tag: a34092f4-c605-4c01-b619-222a1241853d
diff --git a/etc/nxml/013A0-013FF.el b/etc/nxml/013A0-013FF.el
index e3fd669671f..392b4f267a7 100644
--- a/etc/nxml/013A0-013FF.el
+++ b/etc/nxml/013A0-013FF.el
@@ -86,4 +86,3 @@
    ("CHEROKEE LETTER YV" #x13F4)
    ))
-;; arch-tag: 42d669f3-aa0a-4b38-8f60-c1bf05b0d8be
diff --git a/etc/nxml/01400-0167F.el b/etc/nxml/01400-0167F.el
index 1dfce26a852..996d5b46d63 100644
--- a/etc/nxml/01400-0167F.el
+++ b/etc/nxml/01400-0167F.el
@@ -631,4 +631,3 @@
    ("CANADIAN SYLLABICS NNGAA" #x1676)
    ))
-;; arch-tag: 7b4079a4-dea1-44b9-9699-8826b5919ad7
diff --git a/etc/nxml/01680-0169F.el b/etc/nxml/01680-0169F.el
index 52c4cce8798..ef593328741 100644
--- a/etc/nxml/01680-0169F.el
+++ b/etc/nxml/01680-0169F.el
@@ -30,4 +30,3 @@
    ("OGHAM REVERSED FEATHER MARK" #x169C)
    ))
-;; arch-tag: db8ea8fc-61b4-4f83-97f5-d2a952b9d8b6
diff --git a/etc/nxml/016A0-016FF.el b/etc/nxml/016A0-016FF.el
index 81f1df77c27..b194a0ca0d0 100644
--- a/etc/nxml/016A0-016FF.el
+++ b/etc/nxml/016A0-016FF.el
@@ -82,4 +82,3 @@
    ("RUNIC BELGTHOR SYMBOL" #x16F0)
    ))
-;; arch-tag: e21b5eb5-adb4-44fa-a453-995bf3c7fdc5
diff --git a/etc/nxml/01700-0171F.el b/etc/nxml/01700-0171F.el
index 06df5066a6a..2b1238c8149 100644
--- a/etc/nxml/01700-0171F.el
+++ b/etc/nxml/01700-0171F.el
@@ -21,4 +21,3 @@
    ("TAGALOG SIGN VIRAMA" #x1714)
    ))
-;; arch-tag: f30d4825-3942-4534-8671-5fcd71df44ba
diff --git a/etc/nxml/01720-0173F.el b/etc/nxml/01720-0173F.el
index a7530051cea..7fb9c228b57 100644
--- a/etc/nxml/01720-0173F.el
+++ b/etc/nxml/01720-0173F.el
@@ -24,4 +24,3 @@
    ("PHILIPPINE DOUBLE PUNCTUATION" #x1736)
    ))
-;; arch-tag: d577c8e1-70e3-4afc-82f4-b61e4cf0b603
diff --git a/etc/nxml/01740-0175F.el b/etc/nxml/01740-0175F.el
index 4043bcc317c..26f8f6ed7d5 100644
--- a/etc/nxml/01740-0175F.el
+++ b/etc/nxml/01740-0175F.el
@@ -21,4 +21,3 @@
    ("BUHID VOWEL SIGN U" #x1753)
    ))
-;; arch-tag: a30b6352-4c93-4908-a5df-0172b643ae23
diff --git a/etc/nxml/01760-0177F.el b/etc/nxml/01760-0177F.el
index d6bb109d8db..2097b4f52ea 100644
--- a/etc/nxml/01760-0177F.el
+++ b/etc/nxml/01760-0177F.el
@@ -19,4 +19,3 @@
    ("TAGBANWA VOWEL SIGN U" #x1773)
    ))
-;; arch-tag: 7ec84a4f-8077-400f-9b1a-f31b6d75fb65
diff --git a/etc/nxml/01780-017FF.el b/etc/nxml/01780-017FF.el
index 182440e5eb1..762fd463d34 100644
--- a/etc/nxml/01780-017FF.el
+++ b/etc/nxml/01780-017FF.el
@@ -104,4 +104,3 @@
    ("KHMER DIGIT NINE" #x17E9)
    ))
-;; arch-tag: 2d03b253-c5f2-4595-b346-36e3b87df51c
diff --git a/etc/nxml/01800-018AF.el b/etc/nxml/01800-018AF.el
index a24ec715bc4..b3701d4596a 100644
--- a/etc/nxml/01800-018AF.el
+++ b/etc/nxml/01800-018AF.el
@@ -156,4 +156,3 @@
    ("MONGOLIAN LETTER ALI GALI DAGALGA" #x18A9)
    ))
-;; arch-tag: 36134d5c-514f-4042-b104-97688d5194b4
diff --git a/etc/nxml/01E00-01EFF.el b/etc/nxml/01E00-01EFF.el
index fed5cf3ca7b..2f86f039951 100644
--- a/etc/nxml/01E00-01EFF.el
+++ b/etc/nxml/01E00-01EFF.el
@@ -247,4 +247,3 @@
    ("LATIN SMALL LETTER Y WITH TILDE" #x1EF9)
    ))
-;; arch-tag: 67862606-3d2a-4063-b666-45ccd6edff6b
diff --git a/etc/nxml/01F00-01FFF.el b/etc/nxml/01F00-01FFF.el
index 5da301f019b..64e5f26c466 100644
--- a/etc/nxml/01F00-01FFF.el
+++ b/etc/nxml/01F00-01FFF.el
@@ -234,4 +234,3 @@
    ("GREEK DASIA" #x1FFE)
    ))
-;; arch-tag: ace2193e-e5be-4800-898e-efad7ba5d6da
diff --git a/etc/nxml/02000-0206F.el b/etc/nxml/02000-0206F.el
index 0a367cb1e1e..36dedde38eb 100644
--- a/etc/nxml/02000-0206F.el
+++ b/etc/nxml/02000-0206F.el
@@ -96,4 +96,3 @@
    ("NOMINAL DIGIT SHAPES" #x206F)
    ))
-;; arch-tag: 9208787e-c528-416d-a9b1-7261c9cde84e
diff --git a/etc/nxml/02070-0209F.el b/etc/nxml/02070-0209F.el
index aad7f331ccc..e7c3f215ce6 100644
--- a/etc/nxml/02070-0209F.el
+++ b/etc/nxml/02070-0209F.el
@@ -30,4 +30,3 @@
    ("SUBSCRIPT RIGHT PARENTHESIS" #x208E)
    ))
-;; arch-tag: 59e357e5-c021-440d-a923-921b485dcbb8
diff --git a/etc/nxml/020A0-020CF.el b/etc/nxml/020A0-020CF.el
index 98f334752b8..a1df8bc2042 100644
--- a/etc/nxml/020A0-020CF.el
+++ b/etc/nxml/020A0-020CF.el
@@ -19,4 +19,3 @@
    ("PESO SIGN" #x20B1)
    ))
-;; arch-tag: 2f9ece37-0ae6-4a82-b12e-dc10ac58e6ce
diff --git a/etc/nxml/020D0-020FF.el b/etc/nxml/020D0-020FF.el
index c2626c6f362..7dcc145e840 100644
--- a/etc/nxml/020D0-020FF.el
+++ b/etc/nxml/020D0-020FF.el
@@ -28,4 +28,3 @@
    ("COMBINING LEFTWARDS ARROW OVERLAY" #x20EA)
    ))
-;; arch-tag: 4b1f7ef0-287b-49a6-a9f2-910752aac517
diff --git a/etc/nxml/02100-0214F.el b/etc/nxml/02100-0214F.el
index 1c499c0c020..df92477cf64 100644
--- a/etc/nxml/02100-0214F.el
+++ b/etc/nxml/02100-0214F.el
@@ -75,4 +75,3 @@
    ("TURNED AMPERSAND" #x214B)
    ))
-;; arch-tag: 4233f761-f78d-4854-a019-2409f78514fa
diff --git a/etc/nxml/02150-0218F.el b/etc/nxml/02150-0218F.el
index ac2e7067fd1..e4b7bcbac77 100644
--- a/etc/nxml/02150-0218F.el
+++ b/etc/nxml/02150-0218F.el
@@ -50,4 +50,3 @@
    ("ROMAN NUMERAL REVERSED ONE HUNDRED" #x2183)
    ))
-;; arch-tag: 9931b436-670d-471f-8214-f4c4454ae841
diff --git a/etc/nxml/02190-021FF.el b/etc/nxml/02190-021FF.el
index 4a2851a9552..e8b6861b07d 100644
--- a/etc/nxml/02190-021FF.el
+++ b/etc/nxml/02190-021FF.el
@@ -113,4 +113,3 @@
    ("LEFT RIGHT OPEN-HEADED ARROW" #x21FF)
    ))
-;; arch-tag: de5679de-82b6-4d64-9b7c-79c35e12521d
diff --git a/etc/nxml/02200-022FF.el b/etc/nxml/02200-022FF.el
index be8278341d0..2889a1c9563 100644
--- a/etc/nxml/02200-022FF.el
+++ b/etc/nxml/02200-022FF.el
@@ -257,4 +257,3 @@
    ("Z NOTATION BAG MEMBERSHIP" #x22FF)
    ))
-;; arch-tag: 12911bcf-5cc6-4b8a-9f0e-48c0b6f85566
diff --git a/etc/nxml/02300-023FF.el b/etc/nxml/02300-023FF.el
index 58526bd98ec..2e7cd88ca6b 100644
--- a/etc/nxml/02300-023FF.el
+++ b/etc/nxml/02300-023FF.el
@@ -208,4 +208,3 @@
    ("RETURN SYMBOL" #x23CE)
    ))
-;; arch-tag: ee70bee5-f22f-4c0e-bed6-2606b27d94cf
diff --git a/etc/nxml/02400-0243F.el b/etc/nxml/02400-0243F.el
index ff6bdce8483..798a795c0c8 100644
--- a/etc/nxml/02400-0243F.el
+++ b/etc/nxml/02400-0243F.el
@@ -40,4 +40,3 @@
    ("SYMBOL FOR SUBSTITUTE FORM TWO" #x2426)
    ))
-;; arch-tag: efc349c9-065d-4033-b261-7cb961c54072
diff --git a/etc/nxml/02440-0245F.el b/etc/nxml/02440-0245F.el
index 3a484cec296..019d6baecc3 100644
--- a/etc/nxml/02440-0245F.el
+++ b/etc/nxml/02440-0245F.el
@@ -12,4 +12,3 @@
    ("OCR DOUBLE BACKSLASH" #x244A)
    ))
-;; arch-tag: e532db31-38fd-4eee-8e47-974316fb6dd5
diff --git a/etc/nxml/02460-024FF.el b/etc/nxml/02460-024FF.el
index 4cbea4a5f6f..736ff0b937e 100644
--- a/etc/nxml/02460-024FF.el
+++ b/etc/nxml/02460-024FF.el
@@ -160,4 +160,3 @@
    ("DOUBLE CIRCLED NUMBER TEN" #x24FE)
    ))
-;; arch-tag: 2ec7ede5-ce9d-48b5-a725-dd3f177060f4
diff --git a/etc/nxml/02500-0257F.el b/etc/nxml/02500-0257F.el
index 97e63df862c..a8cc739c28a 100644
--- a/etc/nxml/02500-0257F.el
+++ b/etc/nxml/02500-0257F.el
@@ -129,4 +129,3 @@
    ("BOX DRAWINGS HEAVY UP AND LIGHT DOWN" #x257F)
    ))
-;; arch-tag: 6870ad7c-84cf-42a0-82ce-f6863da1c7ad
diff --git a/etc/nxml/02580-0259F.el b/etc/nxml/02580-0259F.el
index bc4d6a12bff..0c7220971ff 100644
--- a/etc/nxml/02580-0259F.el
+++ b/etc/nxml/02580-0259F.el
@@ -33,4 +33,3 @@
    ("QUADRANT UPPER RIGHT AND LOWER LEFT AND LOWER RIGHT" #x259F)
    ))
-;; arch-tag: 51c971a7-cd90-42a5-bf18-dd9683bcab41
diff --git a/etc/nxml/025A0-025FF.el b/etc/nxml/025A0-025FF.el
index 47284d4a126..b9fbe6f95d5 100644
--- a/etc/nxml/025A0-025FF.el
+++ b/etc/nxml/025A0-025FF.el
@@ -97,4 +97,3 @@
    ("LOWER RIGHT TRIANGLE" #x25FF)
    ))
-;; arch-tag: ac97acd5-57a6-4521-bee4-8c2d0a9bd06a
diff --git a/etc/nxml/02600-026FF.el b/etc/nxml/02600-026FF.el
index c0d0a065aef..72ae5c3772b 100644
--- a/etc/nxml/02600-026FF.el
+++ b/etc/nxml/02600-026FF.el
@@ -134,4 +134,3 @@
    ("BLACK CIRCLE WITH TWO WHITE DOTS" #x2689)
    ))
-;; arch-tag: b976b52e-eefc-4aa3-b96c-7f4998429f77
diff --git a/etc/nxml/02700-027BF.el b/etc/nxml/02700-027BF.el
index 47599255870..5ca5d8fe4fa 100644
--- a/etc/nxml/02700-027BF.el
+++ b/etc/nxml/02700-027BF.el
@@ -175,4 +175,3 @@
    ("OPEN-OUTLINED RIGHTWARDS ARROW" #x27BE)
    ))
-;; arch-tag: 183adc05-e931-4f1b-8a89-abd760a8fcd5
diff --git a/etc/nxml/027C0-027EF.el b/etc/nxml/027C0-027EF.el
index e0171576a54..04e9d5c0486 100644
--- a/etc/nxml/027C0-027EF.el
+++ b/etc/nxml/027C0-027EF.el
@@ -29,4 +29,3 @@
    ("MATHEMATICAL RIGHT DOUBLE ANGLE BRACKET" #x27EB)
    ))
-;; arch-tag: f66b9857-6560-4ad9-9adb-1f3b5fb079de
diff --git a/etc/nxml/027F0-027FF.el b/etc/nxml/027F0-027FF.el
index 5da2bc2a226..dce4f7f867a 100644
--- a/etc/nxml/027F0-027FF.el
+++ b/etc/nxml/027F0-027FF.el
@@ -17,4 +17,3 @@
    ("LONG RIGHTWARDS SQUIGGLE ARROW" #x27FF)
    ))
-;; arch-tag: 64623112-13d2-4bd6-8768-5508e3a7f8a9
diff --git a/etc/nxml/02800-028FF.el b/etc/nxml/02800-028FF.el
index d936481acac..efcf8796698 100644
--- a/etc/nxml/02800-028FF.el
+++ b/etc/nxml/02800-028FF.el
@@ -257,4 +257,3 @@
    ("BRAILLE PATTERN DOTS-12345678" #x28FF)
    ))
-;; arch-tag: 461f6d3c-a4fb-404c-a107-ec8afd212bd2
diff --git a/etc/nxml/02900-0297F.el b/etc/nxml/02900-0297F.el
index d1c217b0df4..bf8c2002c8f 100644
--- a/etc/nxml/02900-0297F.el
+++ b/etc/nxml/02900-0297F.el
@@ -129,4 +129,3 @@
    ("DOWN FISH TAIL" #x297F)
    ))
-;; arch-tag: 57fdeec3-1003-4f3e-ac93-1d698f6eacd8
diff --git a/etc/nxml/02980-029FF.el b/etc/nxml/02980-029FF.el
index 11197e31c91..9751a03c36a 100644
--- a/etc/nxml/02980-029FF.el
+++ b/etc/nxml/02980-029FF.el
@@ -129,4 +129,3 @@
    ("MINY" #x29FF)
    ))
-;; arch-tag: 4ae3dcff-8f56-4f7e-b9f3-07108e543969
diff --git a/etc/nxml/02A00-02AFF.el b/etc/nxml/02A00-02AFF.el
index 3cdaa5d295c..6e7cdf2e648 100644
--- a/etc/nxml/02A00-02AFF.el
+++ b/etc/nxml/02A00-02AFF.el
@@ -257,4 +257,3 @@
    ("N-ARY WHITE VERTICAL BAR" #x2AFF)
    ))
-;; arch-tag: 672a8fbf-fb4a-4862-8b8e-2379b799484c
diff --git a/etc/nxml/02E80-02EFF.el b/etc/nxml/02E80-02EFF.el
index deb81105eab..aca68f20278 100644
--- a/etc/nxml/02E80-02EFF.el
+++ b/etc/nxml/02E80-02EFF.el
@@ -116,4 +116,3 @@
    ("CJK RADICAL C-SIMPLIFIED TURTLE" #x2EF3)
    ))
-;; arch-tag: 59a2c3dd-63ee-4cba-b427-1e8eb782634f
diff --git a/etc/nxml/02F00-02FDF.el b/etc/nxml/02F00-02FDF.el
index 1a2448aa844..63ad5b758b6 100644
--- a/etc/nxml/02F00-02FDF.el
+++ b/etc/nxml/02F00-02FDF.el
@@ -215,4 +215,3 @@
    ("KANGXI RADICAL FLUTE" #x2FD5)
    ))
-;; arch-tag: e7210935-b74b-4a42-88c6-de146c755742
diff --git a/etc/nxml/02FF0-02FFF.el b/etc/nxml/02FF0-02FFF.el
index f94bd1fe313..fc1eafb11e5 100644
--- a/etc/nxml/02FF0-02FFF.el
+++ b/etc/nxml/02FF0-02FFF.el
@@ -13,4 +13,3 @@
    ("IDEOGRAPHIC DESCRIPTION CHARACTER OVERLAID" #x2FFB)
    ))
-;; arch-tag: dd6d1436-4620-4994-8da5-9140a8a6ec5b
diff --git a/etc/nxml/03000-0303F.el b/etc/nxml/03000-0303F.el
index 997795f31dd..a2f6435cdf3 100644
--- a/etc/nxml/03000-0303F.el
+++ b/etc/nxml/03000-0303F.el
@@ -65,4 +65,3 @@
    ("IDEOGRAPHIC HALF FILL SPACE" #x303F)
    ))
-;; arch-tag: 05689acc-1d48-4a36-9b60-75d5abf8a065
diff --git a/etc/nxml/03040-0309F.el b/etc/nxml/03040-0309F.el
index 18cdaa0827b..2484d11b959 100644
--- a/etc/nxml/03040-0309F.el
+++ b/etc/nxml/03040-0309F.el
@@ -94,4 +94,3 @@
    ("HIRAGANA DIGRAPH YORI" #x309F)
    ))
-;; arch-tag: dc96b2bf-74f6-4885-adbb-4a81bd2884be
diff --git a/etc/nxml/030A0-030FF.el b/etc/nxml/030A0-030FF.el
index 24070605273..4507ed4083b 100644
--- a/etc/nxml/030A0-030FF.el
+++ b/etc/nxml/030A0-030FF.el
@@ -97,4 +97,3 @@
    ("KATAKANA DIGRAPH KOTO" #x30FF)
    ))
-;; arch-tag: 58c48b02-037a-43f3-b225-9e9bf37a7fbd
diff --git a/etc/nxml/03100-0312F.el b/etc/nxml/03100-0312F.el
index f7fa151bb67..6ab50b1dbb5 100644
--- a/etc/nxml/03100-0312F.el
+++ b/etc/nxml/03100-0312F.el
@@ -41,4 +41,3 @@
    ("BOPOMOFO LETTER GN" #x312C)
    ))
-;; arch-tag: 0aeb6bb4-ac93-4014-a836-eb793636a168
diff --git a/etc/nxml/03130-0318F.el b/etc/nxml/03130-0318F.el
index 8bf3334371a..3aabfb76cf2 100644
--- a/etc/nxml/03130-0318F.el
+++ b/etc/nxml/03130-0318F.el
@@ -95,4 +95,3 @@
    ("HANGUL LETTER ARAEAE" #x318E)
    ))
-;; arch-tag: 3ea3aa1e-8551-433b-8506-9591ed150673
diff --git a/etc/nxml/03190-0319F.el b/etc/nxml/03190-0319F.el
index 1fe8f164c63..6dce50e4695 100644
--- a/etc/nxml/03190-0319F.el
+++ b/etc/nxml/03190-0319F.el
@@ -17,4 +17,3 @@
    ("IDEOGRAPHIC ANNOTATION MAN MARK" #x319F)
    ))
-;; arch-tag: e25f7331-0993-4daf-a193-0fe56332f9fa
diff --git a/etc/nxml/031A0-031BF.el b/etc/nxml/031A0-031BF.el
index 0119b7e78d2..54d2f54b803 100644
--- a/etc/nxml/031A0-031BF.el
+++ b/etc/nxml/031A0-031BF.el
@@ -25,4 +25,3 @@
    ("BOPOMOFO FINAL LETTER H" #x31B7)
    ))
-;; arch-tag: 1821baca-d463-4e8e-bf3d-97a35af58fd4
diff --git a/etc/nxml/031F0-031FF.el b/etc/nxml/031F0-031FF.el
index 125d12d30f7..d447c3b0bec 100644
--- a/etc/nxml/031F0-031FF.el
+++ b/etc/nxml/031F0-031FF.el
@@ -17,4 +17,3 @@
    ("KATAKANA LETTER SMALL RO" #x31FF)
    ))
-;; arch-tag: 090acfb7-1a46-4b05-bebb-573bbc0d8a82
diff --git a/etc/nxml/03200-032FF.el b/etc/nxml/03200-032FF.el
index 8b8c84e07d4..eb05e9d2f35 100644
--- a/etc/nxml/03200-032FF.el
+++ b/etc/nxml/03200-032FF.el
@@ -233,4 +233,3 @@
    ("CIRCLED KATAKANA WO" #x32FE)
    ))
-;; arch-tag: 56d35bfa-c41b-4779-be54-3999fbe11265
diff --git a/etc/nxml/03300-033FF.el b/etc/nxml/03300-033FF.el
index acf2b6899b5..7d5820e08ae 100644
--- a/etc/nxml/03300-033FF.el
+++ b/etc/nxml/03300-033FF.el
@@ -250,4 +250,3 @@
    ("IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY THIRTY-ONE" #x33FE)
    ))
-;; arch-tag: 818090a1-7854-485f-80bc-97e89f733e75
diff --git a/etc/nxml/03400-04DBF.el b/etc/nxml/03400-04DBF.el
index 45d69119e80..6bae1066879 100644
--- a/etc/nxml/03400-04DBF.el
+++ b/etc/nxml/03400-04DBF.el
@@ -1,4 +1,3 @@
 (nxml-define-char-name-set 'cjk-unified-ideographs-extension-a
  '())
-;; arch-tag: 571a41a5-7cc5-47c4-b98c-e98a415723bb
diff --git a/etc/nxml/0A000-0A48F.el b/etc/nxml/0A000-0A48F.el
index 9c54d94e55d..e797cf13b0b 100644
--- a/etc/nxml/0A000-0A48F.el
+++ b/etc/nxml/0A000-0A48F.el
@@ -1166,4 +1166,3 @@
    ("YI SYLLABLE YYR" #xA48C)
    ))
-;; arch-tag: 4c900a8b-cd84-4c41-86f4-dcb47efac01b
diff --git a/etc/nxml/0A490-0A4CF.el b/etc/nxml/0A490-0A4CF.el
index 57e731ed129..3052371a12a 100644
--- a/etc/nxml/0A490-0A4CF.el
+++ b/etc/nxml/0A490-0A4CF.el
@@ -56,4 +56,3 @@
    ("YI RADICAL KE" #xA4C6)
    ))
-;; arch-tag: 2c93cdf1-e6f2-4a91-a798-3e1d7c094cf4
diff --git a/etc/nxml/0FB00-0FB4F.el b/etc/nxml/0FB00-0FB4F.el
index 52d47dd746a..20b19e19ffe 100644
--- a/etc/nxml/0FB00-0FB4F.el
+++ b/etc/nxml/0FB00-0FB4F.el
@@ -59,4 +59,3 @@
    ("HEBREW LIGATURE ALEF LAMED" #xFB4F)
    ))
-;; arch-tag: 06519b44-408f-43f4-89e6-3e5c1d2afe4d
diff --git a/etc/nxml/0FB50-0FDFF.el b/etc/nxml/0FB50-0FDFF.el
index 87b83cfff06..9feea5e918c 100644
--- a/etc/nxml/0FB50-0FDFF.el
+++ b/etc/nxml/0FB50-0FDFF.el
@@ -595,4 +595,3 @@
    ("RIAL SIGN" #xFDFC)
    ))
-;; arch-tag: 1fbfd997-096a-43c8-88a1-9d438ddabb57
diff --git a/etc/nxml/0FE00-0FE0F.el b/etc/nxml/0FE00-0FE0F.el
index 187b58d4e6b..04d855e5602 100644
--- a/etc/nxml/0FE00-0FE0F.el
+++ b/etc/nxml/0FE00-0FE0F.el
@@ -17,4 +17,3 @@
    ("VARIATION SELECTOR-16" #xFE0F)
    ))
-;; arch-tag: 591c3457-10c0-4036-8bfb-6cccd23f44dd
diff --git a/etc/nxml/0FE20-0FE2F.el b/etc/nxml/0FE20-0FE2F.el
index 358dccd061e..f2c9ae8a72f 100644
--- a/etc/nxml/0FE20-0FE2F.el
+++ b/etc/nxml/0FE20-0FE2F.el
@@ -5,4 +5,3 @@
    ("COMBINING DOUBLE TILDE RIGHT HALF" #xFE23)
    ))
-;; arch-tag: de291a34-737a-4bbb-8d97-94f878921d05
diff --git a/etc/nxml/0FE30-0FE4F.el b/etc/nxml/0FE30-0FE4F.el
index b7fe8c00d64..cef6a39c835 100644
--- a/etc/nxml/0FE30-0FE4F.el
+++ b/etc/nxml/0FE30-0FE4F.el
@@ -31,4 +31,3 @@
    ("WAVY LOW LINE" #xFE4F)
    ))
-;; arch-tag: 6d8f4c10-304f-4d0b-b830-1e37a8386015
diff --git a/etc/nxml/0FE50-0FE6F.el b/etc/nxml/0FE50-0FE6F.el
index 966d5a21c43..eda9e89630d 100644
--- a/etc/nxml/0FE50-0FE6F.el
+++ b/etc/nxml/0FE50-0FE6F.el
@@ -27,4 +27,3 @@
    ("SMALL COMMERCIAL AT" #xFE6B)
    ))
-;; arch-tag: 4facf8e4-cea2-4194-bc17-f0959c358f7f
diff --git a/etc/nxml/0FE70-0FEFF.el b/etc/nxml/0FE70-0FEFF.el
index 07b03dadc7a..4de14be73c4 100644
--- a/etc/nxml/0FE70-0FEFF.el
+++ b/etc/nxml/0FE70-0FEFF.el
@@ -142,4 +142,3 @@
    ("ZERO WIDTH NO-BREAK SPACE" #xFEFF)
    ))
-;; arch-tag: cdc72129-3cd8-4568-8366-c0deee767c17
diff --git a/etc/nxml/0FF00-0FFEF.el b/etc/nxml/0FF00-0FFEF.el
index fb8dd897f19..a2134af9ac8 100644
--- a/etc/nxml/0FF00-0FFEF.el
+++ b/etc/nxml/0FF00-0FFEF.el
@@ -226,4 +226,3 @@
    ("HALFWIDTH WHITE CIRCLE" #xFFEE)
    ))
-;; arch-tag: 8af7a95d-6e71-47da-9679-b516b6e2f01a
diff --git a/etc/nxml/0FFF0-0FFFF.el b/etc/nxml/0FFF0-0FFFF.el
index 392312be01e..e7366549d5a 100644
--- a/etc/nxml/0FFF0-0FFFF.el
+++ b/etc/nxml/0FFF0-0FFFF.el
@@ -6,4 +6,3 @@
    ("REPLACEMENT CHARACTER" #xFFFD)
    ))
-;; arch-tag: 0bef6e81-4857-4032-a18a-18784233cc81
diff --git a/etc/nxml/10300-1032F.el b/etc/nxml/10300-1032F.el
index 95d26005525..cf394b58ee6 100644
--- a/etc/nxml/10300-1032F.el
+++ b/etc/nxml/10300-1032F.el
@@ -36,4 +36,3 @@
    ("OLD ITALIC NUMERAL FIFTY" #x10323)
    ))
-;; arch-tag: 823cbcc4-a815-4f82-a1e9-348c2f5d237e
diff --git a/etc/nxml/10330-1034F.el b/etc/nxml/10330-1034F.el
index edd9de4050c..9c6dfb6eadb 100644
--- a/etc/nxml/10330-1034F.el
+++ b/etc/nxml/10330-1034F.el
@@ -28,4 +28,3 @@
    ("GOTHIC LETTER NINE HUNDRED" #x1034A)
    ))
-;; arch-tag: 29caddb6-76f0-44bc-83f9-6cef55c20600
diff --git a/etc/nxml/10400-1044F.el b/etc/nxml/10400-1044F.el
index a26005a3953..8aea9e3d72f 100644
--- a/etc/nxml/10400-1044F.el
+++ b/etc/nxml/10400-1044F.el
@@ -77,4 +77,3 @@
    ("DESERET SMALL LETTER ENG" #x1044D)
    ))
-;; arch-tag: 0fbf6586-41cf-41b2-88e9-d113db5d933e
diff --git a/etc/nxml/1D000-1D0FF.el b/etc/nxml/1D000-1D0FF.el
index 1c76fd0eff0..5d2eb237be8 100644
--- a/etc/nxml/1D000-1D0FF.el
+++ b/etc/nxml/1D000-1D0FF.el
@@ -247,4 +247,3 @@
    ("BYZANTINE MUSICAL SYMBOL GORGON NEO KATO" #x1D0F5)
    ))
-;; arch-tag: 2b360fc3-2760-43c9-9d3e-2ef3fd8452b5
diff --git a/etc/nxml/1D100-1D1FF.el b/etc/nxml/1D100-1D1FF.el
index 1bfbf2608dd..9c71f5ca78c 100644
--- a/etc/nxml/1D100-1D1FF.el
+++ b/etc/nxml/1D100-1D1FF.el
@@ -220,4 +220,3 @@
    ("MUSICAL SYMBOL PES SUBPUNCTIS" #x1D1DD)
    ))
-;; arch-tag: 4e6bd082-bedb-46a2-81be-06f86fbb74f4
diff --git a/etc/nxml/1D400-1D7FF.el b/etc/nxml/1D400-1D7FF.el
index f702765c55f..5d4f1593006 100644
--- a/etc/nxml/1D400-1D7FF.el
+++ b/etc/nxml/1D400-1D7FF.el
@@ -992,4 +992,3 @@
    ("MATHEMATICAL MONOSPACE DIGIT NINE" #x1D7FF)
    ))
-;; arch-tag: af730f58-d05e-4cd5-8a94-f914444a5351
diff --git a/etc/nxml/E0000-E007F.el b/etc/nxml/E0000-E007F.el
index 1f4da35df29..db1d8ad9a3a 100644
--- a/etc/nxml/E0000-E007F.el
+++ b/etc/nxml/E0000-E007F.el
@@ -98,4 +98,3 @@
    ("CANCEL TAG" #xE007F)
    ))
-;; arch-tag: e79cd51a-999f-4f8c-8f11-a5eeb5c2de4c
diff --git a/etc/nxml/test-invalid.xml b/etc/nxml/test-invalid.xml
index 87a0031f8e7..bdf6a2cb7ee 100644
--- a/etc/nxml/test-invalid.xml
+++ b/etc/nxml/test-invalid.xml
@@ -6,6 +6,3 @@
    <p>This XHTML document is <span class="#foo">invalid</span>.</p>
  </body>
 </html>
-<!-- arch-tag: 8127c8be-d617-46f5-bdf2-c9159a417c38
-     (do not change this comment) -->
diff --git a/etc/nxml/test-valid.xml b/etc/nxml/test-valid.xml
index c11380a0e41..56a12800faa 100644
--- a/etc/nxml/test-valid.xml
+++ b/etc/nxml/test-valid.xml
@@ -6,6 +6,3 @@
    <p>This is a valid, albeit boring, XHTML document.</p>
  </body>
 </html>
-<!-- arch-tag: 6f7701be-ec51-48d0-bb63-38ed564718d6
-     (do not change this comment) -->
diff --git a/etc/ps-prin0.ps b/etc/ps-prin0.ps
index 52e12cbd8ef..ed48807b068 100644
--- a/etc/ps-prin0.ps
+++ b/etc/ps-prin0.ps
@@ -1,8 +1,7 @@
 % === BEGIN ps-print prologue 0
 % version: 6.0
-% Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+% Copyright (C) 2000-2011  Free Software Foundation, Inc.
-%   Free Software Foundation, Inc.
 % This file is part of GNU Emacs.
diff --git a/etc/ps-prin1.ps b/etc/ps-prin1.ps
index f64ca2faa07..dbb0db846bf 100644
--- a/etc/ps-prin1.ps
+++ b/etc/ps-prin1.ps
@@ -1,8 +1,7 @@
 % === BEGIN ps-print prologue 1
 % version: 6.1
-% Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+% Copyright (C) 2000-2011  Free Software Foundation, Inc.
-%   Free Software Foundation, Inc.
 % This file is part of GNU Emacs.
diff --git a/etc/refcards/Makefile b/etc/refcards/Makefile
index c1bddd124d7..115b0ca084a 100644
--- a/etc/refcards/Makefile
+++ b/etc/refcards/Makefile
@@ -1,7 +1,6 @@
 ### Makefile for Emacs refcards
-## Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+## Copyright (C) 1993-1994, 2001-2011  Free Software Foundation, Inc.
-##   2008, 2009, 2010  Free Software Foundation, Inc.
 ## This file is part of GNU Emacs.
 #
@@ -29,24 +28,24 @@ REFCARDS_PDF = refcard.pdf cs-refcard.pdf de-refcard.pdf fr-refcard.pdf \
 refcards_pdf: ${REFCARDS_PDF}
 refcards_ps: ${REFCARDS_PDF:.pdf=.ps}
-DIRED-REFCARDS_PDF = dired-ref.pdf cs-dired-ref.pdf fr-dired-ref.pdf \
+DIRED_REFCARDS_PDF = dired-ref.pdf cs-dired-ref.pdf fr-dired-ref.pdf \
                sk-dired-ref.pdf
-dired-refcards_pdf: ${DIRED-REFCARDS_PDF}
+dired-refcards_pdf: ${DIRED_REFCARDS_PDF}
-dired-refcards_ps: ${DIRED-REFCARDS_PDF:.pdf=.ps}
+dired-refcards_ps: ${DIRED_REFCARDS_PDF:.pdf=.ps}
-MISC-REFCARDS_PDF = calccard.pdf gnus-booklet.pdf gnus-refcard.pdf orgcard.pdf
+MISC_REFCARDS_PDF = calccard.pdf gnus-booklet.pdf gnus-refcard.pdf orgcard.pdf
-misc-refcards_pdf: ${MISC-REFCARDS_PDF}
+misc-refcards_pdf: ${MISC_REFCARDS_PDF}
-misc-refcards_ps: ${MISC-REFCARDS_PDF:.pdf=.ps}
+misc-refcards_ps: ${MISC_REFCARDS_PDF:.pdf=.ps}
 ## The following files are not included with Emacs.
-SURVIVAL-CARDS_PDF = survival.pdf cs-survival.pdf sk-survival.pdf
+SURVIVAL_CARDS_PDF = survival.pdf cs-survival.pdf sk-survival.pdf
-survival-cards_pdf: ${SURVIVAL-CARDS_PDF}
+survival-cards_pdf: ${SURVIVAL_CARDS_PDF}
-survival-cards_ps: ${SURVIVAL-CARDS_PDF:.pdf=.ps}
+survival-cards_ps: ${SURVIVAL_CARDS_PDF:.pdf=.ps}
-VIPER-CARDS_PDF = vipcard.pdf viperCard.pdf
+VIPER_CARDS_PDF = vipcard.pdf viperCard.pdf
-viper-cards_pdf: ${VIPER-CARDS_PDF}
+viper-cards_pdf: ${VIPER_CARDS_PDF}
-viper-cards_ps: ${VIPER-CARDS_PDF:.pdf=.ps}
+viper-cards_ps: ${VIPER_CARDS_PDF:.pdf=.ps}
 ## PDF files.
@@ -75,7 +74,7 @@ ru-refcard.pdf: %.pdf: %.tex
 #gnus-logo.pdf: %.pdf: %.eps
 #       ps2pdf $<
-gnus-refcard.pdf: %.pdf: %.tex gnus-logo.pdf 
+gnus-refcard.pdf: %.pdf: %.tex gnus-logo.pdf
        pdflatex $<
 gnus-booklet.pdf: gnus-refcard.tex gnus-logo.pdf
diff --git a/etc/refcards/README b/etc/refcards/README
index 7a0d3f4e2ad..fa5ae9258eb 100644
--- a/etc/refcards/README
+++ b/etc/refcards/README
@@ -12,6 +12,5 @@ it is reproduced here for convenience.
 File: gnus-logo.eps, gnus-logo.pdf
  Author: Luis Fernandes <elf@ee.ryerson.ca>
-  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+  Copyright (C) 2001-2011  Free Software Foundation, Inc.
-    Free Software Foundation, Inc.
  License: GNU General Public License version 3 or later (see COPYING)
diff --git a/etc/refcards/calccard.tex b/etc/refcards/calccard.tex
index 3684d767a73..f60be117ad5 100644
--- a/etc/refcards/calccard.tex
+++ b/etc/refcards/calccard.tex
@@ -20,8 +20,7 @@
 % Typical command to format:  tex calccard.tex
 % Typical command to print (3 cols):  dvips -t landscape calccard.dvi
-% Copyright (C) 1987, 1992, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+% Copyright (C) 1987, 1992, 2001-2011  Free Software Foundation, Inc.
-%   2008, 2009, 2010  Free Software Foundation, Inc.
 % This file is part of GNU Emacs.
@@ -65,7 +64,7 @@
 %  Internet: gildea@stop.mail-abuse.org
 \def\emacsversionnumber{23}
-\def\year{2010}                 % latest copyright year
+\def\year{2011}                 % latest copyright year
 \def\shortcopyrightnotice{\vskip 1ex plus 2 fill
  \centerline{\small \copyright\ \year\ Free Software Foundation, Inc.
@@ -674,4 +673,3 @@ Variable names are single digits or whole words.
 % compile-command: "pdftex calccard"
 % End:
-% arch-tag: a2764f34-ec23-4083-bd5c-53f9e70a5da9
diff --git a/etc/refcards/cs-dired-ref.tex b/etc/refcards/cs-dired-ref.tex
index e531829f064..63239b55c10 100644
--- a/etc/refcards/cs-dired-ref.tex
+++ b/etc/refcards/cs-dired-ref.tex
@@ -1,7 +1,6 @@
 % Reference Card for Dired
-% Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+% Copyright (C) 2000-2011  Free Software Foundation, Inc.
-%   2009, 2010  Free Software Foundation, Inc.
 % Author: Evgeny Roubinchtein <eroubinc@u.washington.edu>
 % Czech translation: Pavel Jan�k <Pavel@Janik.cz>, March 2001
@@ -43,7 +42,7 @@
 \pdflayout=(0)
 \def\versionemacs{23}           % version of Emacs this is for
-\def\year{2010}                 % latest copyright year
+\def\year{2011}                 % latest copyright year
 % Nothing else needs to be changed.
@@ -399,4 +398,3 @@ For copies of the GNU Emacs manual, see:
 \bye
-% arch-tag: dd78e947-5b89-4e5b-8bab-b6003719dce5
diff --git a/etc/refcards/cs-refcard.tex b/etc/refcards/cs-refcard.tex
index 6f902aefae6..8b9456b4a63 100644
--- a/etc/refcards/cs-refcard.tex
+++ b/etc/refcards/cs-refcard.tex
@@ -1,7 +1,7 @@
 % Reference Card for GNU Emacs
-% Copyright (C) 1987, 1993, 1996, 1997, 2001, 2002, 2003, 2004, 2005,
+% Copyright (C) 1987, 1993, 1996-1997, 2001-2011
-%   2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+%   Free Software Foundation, Inc.
 % Author: Stephen Gildea <gildea@stop.mail-abuse.org>
 % Czech translation: Jan Buchal <buchal@brailcom.cz>, January 1999
@@ -60,7 +60,7 @@
 \pdflayout=(0)
 \def\versionemacs{23}           % version of Emacs this is for
-\def\year{2010}                 % latest copyright year
+\def\year{2011}                 % latest copyright year
 % Nothing else needs to be changed.
@@ -664,4 +664,3 @@ V�ce se dozv�te po proveden� \kbd{C-h f interactive}.
 % compile-command: "csplain cs-refcard"
 % End:
-% arch-tag: 24ab5519-539c-4941-9a95-4ed9d819030f
diff --git a/etc/refcards/cs-survival.tex b/etc/refcards/cs-survival.tex
index d6d7cea56c3..d20d6a08364 100644
--- a/etc/refcards/cs-survival.tex
+++ b/etc/refcards/cs-survival.tex
@@ -1,7 +1,6 @@
 % Title:  GNU Emacs Survival Card
-% Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+% Copyright (C) 2000-2011  Free Software Foundation, Inc.
-%   2009, 2010  Free Software Foundation, Inc.
 % Author: Wlodek Bzyl <matwb@univ.gda.pl>
 % Czech translation: Pavel Jan�k <Pavel@Janik.cz>, March 2001
@@ -56,7 +55,7 @@
 \chyph
 \def\versionemacs{23}           % version of Emacs this is for
-\def\year{2010}                 % latest copyright year
+\def\year{2011}                 % latest copyright year
 \def\copyrightnotice{\penalty-1\vfill
  \vbox{\smallfont\baselineskip=0.8\baselineskip\raggedcenter
@@ -416,4 +415,3 @@ m�d� v z�vork�ch.
 % compile-command: "csplain survival"
 % End:
-% arch-tag: 86b21d3f-d8b6-412d-8d77-e6e8728f590e
diff --git a/etc/refcards/de-refcard.tex b/etc/refcards/de-refcard.tex
index b37c52b6692..58527be9d76 100644
--- a/etc/refcards/de-refcard.tex
+++ b/etc/refcards/de-refcard.tex
@@ -1,7 +1,6 @@
 % Reference Card for GNU Emacs
-% Copyright (C) 1987, 1993, 1996, 2000, 2001, 2002, 2003, 2004, 2005,
+% Copyright (C) 1987, 1993, 1996, 2000-2011  Free Software Foundation, Inc.
-%   2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
 % Author: Stephen Gildea <gildea@stop.mail-abuse.org>
 % German translation: Sven Joachim <svenjoac@gmx.de>
@@ -62,7 +61,7 @@
 \mdqoff               % deactivates the "-char
 \def\versionemacs{23}           % version of Emacs this is for
-\def\year{2010}                 % latest copyright year
+\def\year{2011}                 % latest copyright year
 % Nothing else needs to be changed below this line.
@@ -680,4 +679,3 @@ wird. F\"ur n\"ahere Details geben Sie \kbd{C-h f interactive} ein.
 % compile-command: "pdftex de-refcard"
 % End:
-% arch-tag: af0a2666-f289-49f1-a9cc-cedab9783314
diff --git a/etc/refcards/dired-ref.tex b/etc/refcards/dired-ref.tex
index 951154da16a..f1fd6808cde 100644
--- a/etc/refcards/dired-ref.tex
+++ b/etc/refcards/dired-ref.tex
@@ -1,7 +1,6 @@
 % Reference Card for Dired
-% Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+% Copyright (C) 2000-2011  Free Software Foundation, Inc.
-%   2009, 2010  Free Software Foundation, Inc.
 % Author: Evgeny Roubinchtein <eroubinc@u.washington.edu>
@@ -45,7 +44,7 @@
 \pdflayout=(1)
 \def\versionemacs{23}           % version of Emacs this is for
-\def\year{2010}                 % latest copyright year
+\def\year{2011}                 % latest copyright year
 % Nothing else needs to be changed.
@@ -408,4 +407,3 @@ For copies of the GNU Emacs manual, see:
 \bye
-% arch-tag: 483e7bb4-4576-4733-9fca-0eae1c861484
diff --git a/etc/refcards/fr-dired-ref.tex b/etc/refcards/fr-dired-ref.tex
index 66c90306a60..01afe76ff30 100644
--- a/etc/refcards/fr-dired-ref.tex
+++ b/etc/refcards/fr-dired-ref.tex
@@ -1,7 +1,6 @@
 % Reference Card for Dired
-% Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+% Copyright (C) 2000-2011  Free Software Foundation, Inc.
-%   2009, 2010  Free Software Foundation, Inc.
 % Author: Evgeny Roubinchtein <eroubinc@u.washington.edu>
 % French translation: Eric Jacoboni
@@ -37,7 +36,7 @@
 \pdflayout=(0)
 \def\versionemacs{23}           % version of Emacs this is for
-\def\year{2010}                 % latest copyright year
+\def\year{2011}                 % latest copyright year
 % Nothing else needs to be changed.
@@ -413,4 +412,3 @@ Pour obtenir des copies du manuel de GNU Emacs:
 \bye
-% arch-tag: ffe6a489-24a2-4083-b8c3-5d03b621689d
diff --git a/etc/refcards/fr-refcard.tex b/etc/refcards/fr-refcard.tex
index f356c229ac4..61caccbea8e 100644
--- a/etc/refcards/fr-refcard.tex
+++ b/etc/refcards/fr-refcard.tex
@@ -1,7 +1,7 @@
 % Reference Card for GNU Emacs
-% Copyright (C) 1987, 1993, 1996, 1997, 2001, 2002, 2003, 2004, 2005,
+% Copyright (C) 1987, 1993, 1996-1997, 2001-2011
-%   2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+%   Free Software Foundation, Inc.
 % Author: Stephen Gildea <gildea@stop.mail-abuse.org>
 % French translation: Eric Jacoboni
@@ -57,7 +57,7 @@
 \pdflayout=(0l)
 \def\versionemacs{23}           % version of Emacs this is for
-\def\year{2010}                 % latest copyright year
+\def\year{2011}                 % latest copyright year
 % Nothing else needs to be changed below this line.
@@ -676,4 +676,3 @@ plus de pr\'ecisions.
 % compile-command: "pdftex fr-refcard"
 % End:
-% arch-tag: 39d6dc6e-1a4a-4071-84db-4719d4e9e40d
diff --git a/etc/refcards/fr-survival.tex b/etc/refcards/fr-survival.tex
index 168026c79f2..b9c84ac680a 100644
--- a/etc/refcards/fr-survival.tex
+++ b/etc/refcards/fr-survival.tex
@@ -1,8 +1,7 @@
 %&tex
 % Title:  GNU Emacs Survival Card
-% Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+% Copyright (C) 2000-2011  Free Software Foundation, Inc.
-%   2009, 2010  Free Software Foundation, Inc.
 % Author: Wlodek Bzyl <matwb@univ.gda.pl>
 % French translation:  \'Eric Jacoboni <jaco@teaser.fr>, November 2001
@@ -51,7 +50,7 @@
 \pdflayout=(0)
 \def\versionemacs{23}           % version of Emacs this is for
-\def\year{2010}                 % latest copyright year
+\def\year{2011}                 % latest copyright year
 \def\copyrightnotice{\penalty-1\vfill
  \vbox{\smallfont\baselineskip=0.8\baselineskip\raggedcenter
@@ -420,4 +419,3 @@ contient entre parenth\`eses le nom des modes en cours.
 % compile-command: "pdftex survival"
 % End:
-% arch-tag: 2fb4e93f-8bfa-4ab4-bc6d-b475131d766a
diff --git a/etc/refcards/gnus-logo.eps b/etc/refcards/gnus-logo.eps
index ea4eebbaf4e..36659ebfb4b 100644
--- a/etc/refcards/gnus-logo.eps
+++ b/etc/refcards/gnus-logo.eps
@@ -1,6 +1,5 @@
 %!PS-Adobe-2.0 EPSF-2.0
-% Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+% Copyright (C) 2000-2011  Free Software Foundation, Inc.
-%   Free Software Foundation, Inc.
 %
 % Author: Luis Fernandes <elf@ee.ryerson.ca>
 %
diff --git a/etc/refcards/gnus-refcard.tex b/etc/refcards/gnus-refcard.tex
index 1b23188cd93..b164a28842e 100644
--- a/etc/refcards/gnus-refcard.tex
+++ b/etc/refcards/gnus-refcard.tex
@@ -120,8 +120,7 @@
 %% Gnus logo by Luis Fernandes.
 \newcommand{\Copyright}{%
  \begin{center}
-    Copyright \copyright\ 1995, 2000, 2002, 2003, 2004,
+    Copyright \copyright\ 1995, 2000, 2002-2011  Free Software Foundation, Inc.\\*
-       2005, 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.\\*
  \end{center}
  Permission is granted to make and distribute copies of this reference
diff --git a/etc/refcards/orgcard.tex b/etc/refcards/orgcard.tex
index c55c55dcf99..f35ed209149 100644
--- a/etc/refcards/orgcard.tex
+++ b/etc/refcards/orgcard.tex
@@ -1,7 +1,7 @@
 % Reference Card for Org Mode
 \def\orgversionnumber{7.4}
 \def\versionyear{2010}          % latest update
-\def\year{2010}                 % latest copyright year
+\def\year{2011}                 % latest copyright year
 %**start of header
 \newcount\columnsperpage
@@ -17,8 +17,8 @@
 \pdflayout=(0l)
 % Nothing else needs to be changed below this line.
-% Copyright (C) 1987, 1993, 1996, 1997, 2001, 2002, 2003, 2004, 2005,
+% Copyright (C) 1987, 1993, 1996-1997, 2001-2011
-%   2006, 2007, 2008, 2009  Free Software Foundation, Inc.
+%   Free Software Foundation, Inc.
 % This file is part of GNU Emacs.
@@ -683,4 +683,3 @@ your own key as shown under INSTALLATION.
 % compile-command: "tex refcard"
 % End:
-% arch-tag: 139f6750-5cfc-49ca-92b5-237fe5795290
diff --git a/etc/refcards/pdflayout.sty b/etc/refcards/pdflayout.sty
index c9f5ae15ab4..c7eb1913a09 100644
--- a/etc/refcards/pdflayout.sty
+++ b/etc/refcards/pdflayout.sty
@@ -1,4 +1,4 @@
-% Copyright (C) 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+% Copyright (C) 2007-2011  Free Software Foundation, Inc.
 % This file is part of GNU Emacs.
@@ -41,7 +41,3 @@
 \else
  \def\pdflayout=(#1#2){}
 \fi
-% archtag: 63c938a5-cc78-4964-962d-603c90d34afc
-% arch-tag: 3464d27c-1439-473a-bc47-a7c501e8c156
diff --git a/etc/refcards/pl-refcard.tex b/etc/refcards/pl-refcard.tex
index cded3166524..23624116709 100644
--- a/etc/refcards/pl-refcard.tex
+++ b/etc/refcards/pl-refcard.tex
@@ -1,8 +1,7 @@
 %&mex
 % Reference Card for GNU Emacs
-% Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+% Copyright (C) 1999, 2001-2011  Free Software Foundation, Inc.
-%   2009, 2010  Free Software Foundation, Inc.
 % Author: Stephen Gildea <gildea@stop.mail-abuse.org>
 % Polish translation: W{\l}odek Bzyl <matwb@univ.gda.pl>
@@ -71,7 +70,7 @@
 \pdflayout=(0)
 \def\versionemacs{23}           % version of Emacs this is for
-\def\year{2010}                 % latest copyright year
+\def\year{2011}                 % latest copyright year
 % Nothing else needs to be changed.
@@ -994,4 +993,3 @@ przez wywo/lanie \kbd{C-h f interactive}.
 % compile-command: "pdftex pl-refcard"
 % End:
-% arch-tag: 19d15a16-70be-40c8-ad91-88899aac32a9
diff --git a/etc/refcards/pt-br-refcard.tex b/etc/refcards/pt-br-refcard.tex
index c242ac2814c..4091f59d1f6 100644
--- a/etc/refcards/pt-br-refcard.tex
+++ b/etc/refcards/pt-br-refcard.tex
@@ -1,7 +1,7 @@
 % Reference Card for GNU Emacs
-% Copyright (C) 1987, 1993, 1996, 1997, 2002, 2003, 2004, 2006, 2007,
+% Copyright (C) 1987, 1993, 1996-1997, 2002-2004, 2006-2011
-%   2008, 2009, 2010  Free Software Foundation, Inc.
+%   Free Software Foundation, Inc.
 % Author: Stephen Gildea <gildea@stop.mail-abuse.org>
 % Portuguese translation: Rodrigo Real <rreal@ucpel.tche.br>
@@ -63,7 +63,7 @@
 \pdflayout=(0l)
 \def\versionemacs{23}           % version of Emacs this is for
-\def\year{2010}                 % latest copyright year
+\def\year{2011}                 % latest copyright year
 % Nothing else needs to be changed below this line.
@@ -680,4 +680,3 @@ detalhes.
 % coding: iso-latin-1
 % End:
-% arch-tag: 56bf248c-a1f3-443d-93f7-02d7aea67d94
diff --git a/etc/refcards/refcard.tex b/etc/refcards/refcard.tex
index 735639b08ee..52b9348db26 100644
--- a/etc/refcards/refcard.tex
+++ b/etc/refcards/refcard.tex
@@ -1,7 +1,7 @@
 % Reference Card for GNU Emacs
-% Copyright (C) 1987, 1993, 1996, 1997, 2001, 2002, 2003, 2004, 2005,
+% Copyright (C) 1987, 1993, 1996-1997, 2001-2011
-%   2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+%   Free Software Foundation, Inc.
 % Author: Stephen Gildea <gildea@stop.mail-abuse.org>
@@ -64,7 +64,7 @@
 % Nothing else needs to be changed below this line.
 \def\versionemacs{23}           % version of Emacs this is for
-\def\year{2010}                 % copyright year
+\def\year{2011}                 % copyright year
 \def\shortcopyrightnotice{\vskip 1ex plus 2 fill
  \centerline{\small \copyright\ \year\ Free Software Foundation, Inc.
@@ -674,4 +674,3 @@ Type \kbd{C-h f interactive} for more details.
 % compile-command: "pdftex refcard"
 % End:
-% arch-tag: d67bdf5d-b77c-44eb-a22e-f4f7d25174d2
diff --git a/etc/refcards/ru-refcard.tex b/etc/refcards/ru-refcard.tex
index 4b314726e1f..f2b47acc809 100644
--- a/etc/refcards/ru-refcard.tex
+++ b/etc/refcards/ru-refcard.tex
@@ -1,5 +1,4 @@
-% Copyright (C) 1997, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+% Copyright (C) 1997, 2002-2011  Free Software Foundation, Inc.
-%   2009, 2010  Free Software Foundation, Inc.
 % Author: Stephen Gildea <gildea@stop.mail-abuse.org>
 % Russian translation: Alex Ott <alexott@gmail.com>
@@ -23,7 +22,7 @@
 \setlength{\ColThreeWidth}{25mm}
 \newcommand{\versionemacs}[0]{23} % version of Emacs this is for
-\newcommand{\cyear}[0]{2010}       % copyright year
+\newcommand{\cyear}[0]{2011}       % copyright year
 \newcommand\shortcopyrightnotice[0]{\vskip 1ex plus 2 fill
  \centerline{\footnotesize \copyright\ \cyear\ Free Software Foundation, Inc.
@@ -524,4 +523,3 @@ With ARG, put point on line ARG."
 % coding: cyrillic-koi8
 % End:
-% arch-tag: 868a12f6-4339-4a14-a56e-4a3937277a9e
diff --git a/etc/refcards/sk-dired-ref.tex b/etc/refcards/sk-dired-ref.tex
index 5a2d04123db..12d66ce9554 100644
--- a/etc/refcards/sk-dired-ref.tex
+++ b/etc/refcards/sk-dired-ref.tex
@@ -1,7 +1,6 @@
 % Reference Card for Dired
-% Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+% Copyright (C) 2000-2011  Free Software Foundation, Inc.
-%   2009, 2010  Free Software Foundation, Inc.
 % Author: Evgeny Roubinchtein <eroubinc@u.washington.edu>
 % Czech translation: Pavel Jan�k <Pavel@Janik.cz>, March 2001
@@ -44,7 +43,7 @@
 \pdflayout=(0)
 \def\versionemacs{23}           % version of Emacs this is for
-\def\year{2010}                 % latest copyright year
+\def\year{2011}                 % latest copyright year
 % Nothing else needs to be changed.
@@ -407,4 +406,3 @@ For copies of the GNU Emacs manual, see:
 % compile-command: "csplain sk-dired-ref"
 % End:
-% arch-tag: d5b57e24-16ec-4981-9315-14d3d16d3062
diff --git a/etc/refcards/sk-refcard.tex b/etc/refcards/sk-refcard.tex
index 7fd7b0d062b..789bbaea92f 100644
--- a/etc/refcards/sk-refcard.tex
+++ b/etc/refcards/sk-refcard.tex
@@ -1,7 +1,7 @@
 % Reference Card for GNU Emacs
-% Copyright (C) 1987, 1993, 1996, 1997, 2001, 2002, 2003, 2004, 2005,
+% Copyright (C) 1987, 1993, 1996-1997, 2001-2011
-%   2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+%   Free Software Foundation, Inc.
 % Author: Stephen Gildea <gildea@stop.mail-abuse.org>
 % Czech translation: Jan Buchal <buchal@brailcom.cz>, January 1999
@@ -665,4 +665,3 @@ Viac sa dozviete po vykonan� \kbd{C-h f interactive}.
 % coding: iso-latin-2
 % End:
-% arch-tag: 9f8eacf2-daf9-4162-bc8d-4af7b269f3d3
diff --git a/etc/refcards/sk-survival.tex b/etc/refcards/sk-survival.tex
index ce499d4f529..f496ac1af0f 100644
--- a/etc/refcards/sk-survival.tex
+++ b/etc/refcards/sk-survival.tex
@@ -1,7 +1,6 @@
 % Title:  GNU Emacs Survival Card
-% Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+% Copyright (C) 2000-2011  Free Software Foundation, Inc.
-%   2009, 2010  Free Software Foundation, Inc.
 % Author: Wlodek Bzyl <matwb@univ.gda.pl>
 % Czech translation: Pavel Jan�k <Pavel@Janik.cz>, March 2001
@@ -57,7 +56,7 @@
 \shyph
 \def\versionemacs{23}           % version of Emacs this is for
-\def\year{2010}                 % latest copyright year
+\def\year{2011}                 % latest copyright year
 \def\copyrightnotice{\penalty-1\vfill
  \vbox{\smallfont\baselineskip=0.8\baselineskip\raggedcenter
@@ -419,4 +418,3 @@ m�dov v z�tvork�ch.
 % compile-command: "csplain sk-survival"
 % End:
-% arch-tag: 126389ad-40b2-4bf9-ac1d-e5105d0986b9
diff --git a/etc/refcards/survival.tex b/etc/refcards/survival.tex
index d92b414decc..845bc38bc47 100644
--- a/etc/refcards/survival.tex
+++ b/etc/refcards/survival.tex
@@ -1,8 +1,7 @@
 %&tex
 % Title:  GNU Emacs Survival Card
-% Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+% Copyright (C) 2000-2011  Free Software Foundation, Inc.
-%   2009, 2010  Free Software Foundation, Inc.
 % Author: Wlodek Bzyl <matwb@univ.gda.pl>
@@ -46,7 +45,7 @@
 \pdflayout=(1)
 \def\versionemacs{23}           % version of Emacs this is for
-\def\year{2010}                 % latest copyright year
+\def\year{2011}                 % latest copyright year
 \def\copyrightnotice{\penalty-1\vfill
  \vbox{\smallfont\baselineskip=0.8\baselineskip\raggedcenter
@@ -412,4 +411,3 @@ contains names of the current modes, in parentheses.
 % compile-command: "pdftex survival"
 % End:
-% arch-tag: 4f9a0562-617b-4843-aee1-450c41d6b22c
diff --git a/etc/refcards/vipcard.tex b/etc/refcards/vipcard.tex
index 742ef3e01bb..47decbb9f74 100644
--- a/etc/refcards/vipcard.tex
+++ b/etc/refcards/vipcard.tex
@@ -1,7 +1,6 @@
 % Quick Reference Card for VIP
-% Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+% Copyright (C) 1987, 2001-2011  Free Software Foundation, Inc.
-%   2009, 2010  Free Software Foundation, Inc.
 % Author: Masahiko Sato <ms@sail.stanford.edu>, <masahiko@sato.riec.tohoku.junet>
@@ -51,7 +50,7 @@
 \pdflayout=(1)
 \def\versionemacs{18}           % version of Emacs this is for
-\def\year{2010}                 % latest copyright year
+\def\year{2011}                 % latest copyright year
 \def\versionvip{3.5}
 % Nothing else needs to be changed.
@@ -680,4 +679,3 @@ moves 11 lines below current line to the end of buffer.
 % compile-command: "pdftex vipcard"
 % End:
-% arch-tag: 342a9548-4de4-499d-b864-74fb426b6729
diff --git a/etc/refcards/viperCard.tex b/etc/refcards/viperCard.tex
index 8144fb14cb1..594137744fe 100644
--- a/etc/refcards/viperCard.tex
+++ b/etc/refcards/viperCard.tex
@@ -1,7 +1,6 @@
 % ViperCard -- The Reference Card for Viper under GNU Emacs and XEmacs
-% Copyright (C) 1995, 1996, 1997, 2001, 2002, 2003, 2004, 2005, 2006,
+% Copyright (C) 1995-1997, 2001-2011  Free Software Foundation, Inc.
-%   2007, 2008, 2009, 2010  Free Software Foundation, Inc.
 % Author: Michael Kifer <kifer@cs.sunysb.edu> (Viper)
 %       Aamod Sane <sane@cs.uiuc.edu> (VIP 4.3)
@@ -54,7 +53,7 @@
 \pdflayout=(1)
 \def\versionemacs{21}           % version of Emacs this is for
-\def\year{2010}                 % latest copyright year
+\def\year{2011}                 % latest copyright year
 \def\versionxemacs{20}          % version of XEmacs this is for
 \def\versionviper{3.0}          % version of Viper this is for
@@ -741,4 +740,3 @@ Ex commands can be made to have history. See the manual for details.
 % compile-command: "pdftex viperCard"
 % End:
-% arch-tag: e287b45c-4c5e-4bf9-ae28-ead4cd9f68e3
diff --git a/etc/schema/locate.rnc b/etc/schema/locate.rnc
index 291c8bfb984..bab527107e9 100644
--- a/etc/schema/locate.rnc
+++ b/etc/schema/locate.rnc
@@ -1,4 +1,4 @@
-# Copyright (C) 2003, 2004, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+# Copyright (C) 2003-2004, 2007-2011  Free Software Foundation, Inc.
 # This file is part of GNU Emacs.
diff --git a/etc/schema/relaxng.rnc b/etc/schema/relaxng.rnc
index c0d598f08fb..15b836c7500 100644
--- a/etc/schema/relaxng.rnc
+++ b/etc/schema/relaxng.rnc
@@ -1,6 +1,6 @@
 # RELAX NG XML syntax expressed in RELAX NG Compact syntax.
-# Copyright (C) 2003, 2004, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+# Copyright (C) 2003-2004, 2007-2011  Free Software Foundation, Inc.
 # This file is part of GNU Emacs.
diff --git a/etc/schema/schemas.xml b/etc/schema/schemas.xml
index 314bdf1145f..36c5fd873d8 100644
--- a/etc/schema/schemas.xml
+++ b/etc/schema/schemas.xml
@@ -1,4 +1,4 @@
-<!-- Copyright (C) 2003, 2004, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+<!-- Copyright (C) 2003-2004, 2007-2011  Free Software Foundation, Inc.
 This file is part of GNU Emacs.
@@ -22,6 +22,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>. -->
  <uri pattern="*.html" typeId="XHTML"/>
  <uri pattern="*.rng" typeId="RELAX NG"/>
  <uri pattern="*.rdf" typeId="RDF"/>
+  <uri pattern="*.dbk" typeId="DocBook"/>
  <namespace ns="http://www.w3.org/1999/XSL/Transform" typeId="XSLT"/>
  <namespace ns="http://www.w3.org/1999/02/22-rdf-syntax-ns#" typeId="RDF"/>
@@ -55,6 +56,3 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>. -->
  <typeId id="DocBook" uri="docbook.rnc"/>
  <typeId id="RDF" uri="rdfxml.rnc"/>
 </locatingRules>
-<!-- arch-tag: 1fde96fa-b401-4033-8514-c4990b1e18a5
-     (do not change this comment) -->
diff --git a/etc/ses-example.ses b/etc/ses-example.ses
index d88cedcd70f..842d0ad9477 100644
--- a/etc/ses-example.ses
+++ b/etc/ses-example.ses
@@ -205,8 +205,7 @@ Sales summary - Acme fundraising
 ;;; ses--symbolic-formulas: (("Eastern area") ("West-district") ("North&South") ("Other"))
 ;;; End:
-;;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+;;; Copyright (C) 2002-2011  Free Software Foundation, Inc.
-;;; Free Software Foundation, Inc.
 ;;; COPYING PERMISSIONS:
 ;;; 
@@ -222,5 +221,3 @@ Sales summary - Acme fundraising
 ;;;
 ;;;   You should have received a copy of the GNU General Public License
 ;;;   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-;;; arch-tag: 4fcb0843-e3f9-4270-b8fb-998129190765
diff --git a/etc/srecode/cpp.srt b/etc/srecode/cpp.srt
index 85d304ee844..0b042efce69 100644
--- a/etc/srecode/cpp.srt
+++ b/etc/srecode/cpp.srt
@@ -1,6 +1,6 @@
 ;;; cpp.srt --- SRecode templates for c++-mode
-;; Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2011 Free Software Foundation, Inc.
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
diff --git a/etc/srecode/default.srt b/etc/srecode/default.srt
index b42de2f7835..91a76321193 100644
--- a/etc/srecode/default.srt
+++ b/etc/srecode/default.srt
@@ -1,6 +1,6 @@
 ;;; default.srt --- SRecode templates for srecode-template-mode
-;; Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2011 Free Software Foundation, Inc.
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
diff --git a/etc/srecode/doc-cpp.srt b/etc/srecode/doc-cpp.srt
index 2abe572e396..957986e8eda 100644
--- a/etc/srecode/doc-cpp.srt
+++ b/etc/srecode/doc-cpp.srt
@@ -1,6 +1,6 @@
 ;; doc-c.srt --- SRecode templates for "document" applications
-;; Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2011 Free Software Foundation, Inc.
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
diff --git a/etc/srecode/doc-default.srt b/etc/srecode/doc-default.srt
index 2d3094df60d..24741fa7741 100644
--- a/etc/srecode/doc-default.srt
+++ b/etc/srecode/doc-default.srt
@@ -1,6 +1,6 @@
 ;; doc-default.srt --- SRecode templates for "document" applications
-;; Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011 Free Software Foundation, Inc.
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
diff --git a/etc/srecode/doc-java.srt b/etc/srecode/doc-java.srt
index f6ef6c9aea3..c6d2ef1fd54 100644
--- a/etc/srecode/doc-java.srt
+++ b/etc/srecode/doc-java.srt
@@ -1,6 +1,6 @@
 ;; doc-java.srt --- SRecode templates for "document" applications
-;; Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011 Free Software Foundation, Inc.
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
diff --git a/etc/srecode/ede-make.srt b/etc/srecode/ede-make.srt
index 09551b4f539..48c5aae5a68 100644
--- a/etc/srecode/ede-make.srt
+++ b/etc/srecode/ede-make.srt
@@ -1,6 +1,6 @@
 ;; ede-make.srt --- SRecode templates for Makefiles used by EDE.
-;; Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2011 Free Software Foundation, Inc.
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
diff --git a/etc/srecode/el.srt b/etc/srecode/el.srt
index 9ef258ca85a..b63d560582c 100644
--- a/etc/srecode/el.srt
+++ b/etc/srecode/el.srt
@@ -1,6 +1,6 @@
 ;;; el.srt --- SRecode templates for Emacs Lisp mode
-;; Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2011 Free Software Foundation, Inc.
 ;; Author: Eric Ludlam <zappo@gnu.org>
diff --git a/etc/srecode/getset-cpp.srt b/etc/srecode/getset-cpp.srt
index 3fb15f5f9da..ebca17098d5 100644
--- a/etc/srecode/getset-cpp.srt
+++ b/etc/srecode/getset-cpp.srt
@@ -1,6 +1,6 @@
 ;;; getset-cpp.srt --- SRecode templates for C++ class getter/setters.
-;; Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2011 Free Software Foundation, Inc.
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
diff --git a/etc/srecode/java.srt b/etc/srecode/java.srt
index d4cc986a323..3059afad601 100644
--- a/etc/srecode/java.srt
+++ b/etc/srecode/java.srt
@@ -1,6 +1,6 @@
 ;; java.srt
-;; Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011 Free Software Foundation, Inc.
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
diff --git a/etc/srecode/make.srt b/etc/srecode/make.srt
index 81ce50ed464..d07d211a984 100644
--- a/etc/srecode/make.srt
+++ b/etc/srecode/make.srt
@@ -1,6 +1,6 @@
 ;; make.srt
-;; Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011 Free Software Foundation, Inc.
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
diff --git a/etc/srecode/template.srt b/etc/srecode/template.srt
index dd2dce0d947..3c9aff7ff0d 100644
--- a/etc/srecode/template.srt
+++ b/etc/srecode/template.srt
@@ -1,6 +1,6 @@
 ;;; template.srt --- Templates for Semantic Recoders
-;; Copyright (C) 2005, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2005, 2007-2011 Free Software Foundation, Inc.
 ;; Author: Eric Ludlam <zappo@gnu.org>
diff --git a/etc/srecode/test.srt b/etc/srecode/test.srt
index 8ae5aedaeee..b296f9dc515 100644
--- a/etc/srecode/test.srt
+++ b/etc/srecode/test.srt
@@ -1,6 +1,6 @@
 ;; test.srt --- SRecode templates for testing
-;; Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2011 Free Software Foundation, Inc.
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
diff --git a/etc/srecode/texi.srt b/etc/srecode/texi.srt
index 4d6a05942cf..abf086c7281 100644
--- a/etc/srecode/texi.srt
+++ b/etc/srecode/texi.srt
@@ -1,6 +1,6 @@
 ;; texi.srt --- SRecode templates for Texinfo
-;; Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2011 Free Software Foundation, Inc.
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
diff --git a/etc/srecode/wisent.srt b/etc/srecode/wisent.srt
index 5fe5d69e110..d45392e93dd 100644
--- a/etc/srecode/wisent.srt
+++ b/etc/srecode/wisent.srt
@@ -1,6 +1,6 @@
 ;; wisent.srt --- SRecode templates for Emacs/WISENT grammar files.
-;; Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2011 Free Software Foundation, Inc.
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
diff --git a/etc/themes/tango-dark-theme.el b/etc/themes/tango-dark-theme.el
index f63440b4ea7..613c98f505a 100644
--- a/etc/themes/tango-dark-theme.el
+++ b/etc/themes/tango-dark-theme.el
@@ -1,6 +1,9 @@
 ;;; tango-dark-theme.el --- Tango-based custom theme for faces
-;; Copyright (C) 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2011 Free Software Foundation, Inc.
+;; Authors: Chong Yidong <cyd@stupidchicken>
+;;          Jan Moringen <jan.moringen@uni-bielefeld.de>
 ;; This file is part of GNU Emacs.
@@ -25,63 +28,124 @@
 ;;; Code:
 (deftheme tango-dark
-  "Theme for faces, based on the Tango palette on a dark background.
+  "Theme for faces, based on the Tango palette with a dark background.
-Basic, Font Lock, Isearch, Gnus, and Message faces are included.")
+Basic, Font Lock, Isearch, Gnus, Message, Ediff, Flyspell,
+Semantic, and Ansi-Color faces are included.")
-(custom-theme-set-faces
- 'tango-dark
+(let ((class '((class color) (min-colors 89)))
- '(default ((t (:foreground "#eeeeec" :background "#2e3436"))))
+      ;; Tango palette colors.
- '(cursor ((t (:foreground "#2e3436" :background "#fce94f"))))
+      (butter-1 "#fce94f") (butter-2 "#edd400") (butter-3 "#c4a000")
- '(highlight ((t (:foreground "#2e3436" :background "#edd400"))))
+      (orange-1 "#fcaf3e") (orange-2 "#f57900") (orange-3 "#ce5c00")
- '(region ((t (:background "#555753"))))
+      (choc-1 "#e9b96e") (choc-2 "#c17d11") (choc-3 "#8f5902")
- '(font-lock-builtin-face ((t (:foreground "#ad7fa8"))))
+      (cham-1 "#8ae234") (cham-2 "#73d216") (cham-3 "#4e9a06")
- '(font-lock-comment-face ((t (:foreground "#73d216"))))
+      (blue-1 "#729fcf") (blue-2 "#3465a4") (blue-3 "#204a87")
- '(font-lock-constant-face ((t (:foreground "#e6a8df"))))
+      (plum-1 "#ad7fa8") (plum-2 "#75507b") (plum-3 "#5c3566")
- '(font-lock-function-name-face ((t (:foreground "#fce94f"))))
+      (red-1 "#ef2929")  (red-2 "#cc0000")  (red-3 "#a40000")
- '(font-lock-keyword-face ((t (:foreground "#8cc4ff"))))
+      (alum-1 "#eeeeec") (alum-2 "#d3d7cf") (alum-3 "#babdb6")
- '(font-lock-string-face ((t (:foreground "#e9b96e"))))
+      (alum-4 "#888a85") (alum-5 "#555753") (alum-6 "#2e3436")
- '(font-lock-type-face ((t (:foreground "#a5ff4d"))))
+      ;; Not in Tango palette; used for better contrast.
- '(font-lock-variable-name-face ((t (:foreground "#fcaf3e"))))
+      (cham-0 "#b4fa70") (blue-0 "#8cc4ff") (plum-0 "#e6a8df")
- '(font-lock-warning-face ((t (:foreground "#ef2929"))))
+      (red-0 "#ff4b4b")  (alum-5.5 "#41423f") (alum-7 "#212526"))
- '(button ((t (:underline t :foreground "#729fcf"))))
- '(link ((t (:underline t :foreground "#729fcf"))))
+  (custom-theme-set-faces
- '(link-visited ((t (:underline t :foreground "#3465a4"))))
+   'tango-dark
- '(mode-line ((t (:box (:line-width -1 :style released-button)
+   `(default ((,class (:foreground ,alum-1 :background ,alum-6))))
-                       :background "#d3d7cf" :foreground "black"))))
+   `(cursor ((,class (:foreground ,alum-6 :background ,butter-1))))
- '(mode-line-inactive ((t (:box (:line-width -1 :style released-button)
+   ;; Highlighting faces
-                                :background "#555753" :foreground "white"))))
+   `(fringe ((,class (:background ,alum-7))))
- '(isearch ((t (:foreground "#ffffff" :background "#ce5c00"))))
+   `(highlight ((,class (:foreground ,alum-6 :background ,butter-2))))
- '(lazy-highlight ((t (:background "#8f5902"))))
+   `(region ((,class (:background ,alum-5))))
- '(gnus-group-news-1 ((t (:foreground "#ad7fa8"))))
+   `(secondary-selection ((,class (:background ,blue-3))))
- '(gnus-group-news-1-low ((t (:foreground "#75507b"))))
+   `(isearch ((,class (:foreground ,alum-1 :background ,orange-3))))
- '(gnus-group-news-2 ((t (:foreground "#729fcf"))))
+   `(lazy-highlight ((,class (:background ,choc-3))))
- '(gnus-group-news-2-low ((t (:foreground "#3465a4"))))
+   `(trailing-whitespace ((,class (:background ,red-3))))
- '(gnus-group-news-3 ((t (:foreground "#8ae234"))))
+   ;; Mode line faces
- '(gnus-group-news-3-low ((t (:foreground "#73d216"))))
+   `(mode-line ((,class
- '(gnus-group-news-4 ((t (:foreground "#e9b9e6"))))
+                 (:box (:line-width -1 :style released-button)
- '(gnus-group-news-4-low ((t (:foreground "#c17d11"))))
+                  :background ,alum-2 :foreground ,alum-6))))
- '(gnus-group-news-5 ((t (:foreground "#fcaf3e"))))
+   `(mode-line-inactive ((,class
- '(gnus-group-news-5-low ((t (:foreground "#f57900"))))
+                          (:box (:line-width -1 :style released-button)
- '(gnus-group-news-low ((t (:foreground "#edd400"))))
+                           :background ,alum-5 :foreground ,alum-1))))
- '(gnus-group-mail-1 ((t (:foreground "#ad7fa8"))))
+   ;; Escape and prompt faces
- '(gnus-group-mail-1-low ((t (:foreground "#75507b"))))
+   `(minibuffer-prompt ((,class (:foreground ,cham-0))))
- '(gnus-group-mail-2 ((t (:foreground "#729fcf"))))
+   `(escape-glyph ((,class (:foreground ,butter-3))))
- '(gnus-group-mail-2-low ((t (:foreground "#3465a4"))))
+   ;; Font lock faces
- '(gnus-group-mail-3 ((t (:foreground "#8ae234"))))
+   `(font-lock-builtin-face ((,class (:foreground ,plum-1))))
- '(gnus-group-mail-3-low ((t (:foreground "#73d216"))))
+   `(font-lock-comment-face ((,class (:foreground ,cham-2))))
- '(gnus-group-mail-low ((t (:foreground "#edd400"))))
+   `(font-lock-constant-face ((,class (:foreground ,plum-0))))
- '(gnus-header-content ((t (:weight normal :foreground "#c4a000"))))
+   `(font-lock-function-name-face ((,class (:foreground ,butter-1))))
- '(gnus-header-from ((t (:foreground "#edd400"))))
+   `(font-lock-keyword-face ((,class (:foreground ,cham-0))))
- '(gnus-header-subject ((t (:foreground "#8ae234"))))
+   `(font-lock-string-face ((,class (:foreground ,choc-1))))
- '(gnus-header-name ((t (:foreground "#729fcf"))))
+   `(font-lock-type-face ((,class (:foreground ,blue-0))))
- '(gnus-header-newsgroups ((t (:foreground "#c17d11"))))
+   `(font-lock-variable-name-face ((,class (:foreground ,orange-1))))
- '(message-header-name ((t (:foreground "#729fcf"))))
+   `(font-lock-warning-face ((,class (:foreground ,red-0))))
- '(message-header-cc ((t (:foreground "#c4a000"))))
+   ;; Button and link faces
- '(message-header-other ((t (:foreground "#c17d11"))))
+   `(button ((,class (:underline t :foreground ,blue-1))))
- '(message-header-subject ((t (:foreground "#8ae234"))))
+   `(link ((,class (:underline t :foreground ,blue-1))))
- '(message-header-to ((t (:foreground "#edd400"))))
+   `(link-visited ((,class (:underline t :foreground ,blue-2))))
- '(message-cited-text ((t (:foreground "#8ae234"))))
+   ;; Gnus faces
- '(message-separator ((t (:foreground "#ad7fa8")))))
+   `(gnus-group-news-1 ((,class (:foreground ,plum-1))))
+   `(gnus-group-news-1-low ((,class (:foreground ,plum-2))))
+   `(gnus-group-news-2 ((,class (:foreground ,blue-1))))
+   `(gnus-group-news-2-low ((,class (:foreground ,blue-2))))
+   `(gnus-group-news-3 ((,class (:foreground ,cham-1))))
+   `(gnus-group-news-3-low ((,class (:foreground ,cham-2))))
+   `(gnus-group-news-4 ((,class (:foreground ,plum-0))))
+   `(gnus-group-news-4-low ((,class (:foreground ,choc-2))))
+   `(gnus-group-news-5 ((,class (:foreground ,orange-1))))
+   `(gnus-group-news-5-low ((,class (:foreground ,orange-2))))
+   `(gnus-group-news-low ((,class (:foreground ,butter-2))))
+   `(gnus-group-mail-1 ((,class (:foreground ,plum-1))))
+   `(gnus-group-mail-1-low ((,class (:foreground ,plum-2))))
+   `(gnus-group-mail-2 ((,class (:foreground ,blue-1))))
+   `(gnus-group-mail-2-low ((,class (:foreground ,blue-2))))
+   `(gnus-group-mail-3 ((,class (:foreground ,cham-1))))
+   `(gnus-group-mail-3-low ((,class (:foreground ,cham-2))))
+   `(gnus-group-mail-low ((,class (:foreground ,butter-2))))
+   `(gnus-header-content ((,class (:weight normal :foreground ,butter-3))))
+   `(gnus-header-from ((,class (:foreground ,butter-2))))
+   `(gnus-header-subject ((,class (:foreground ,cham-1))))
+   `(gnus-header-name ((,class (:foreground ,blue-1))))
+   `(gnus-header-newsgroups ((,class (:foreground ,choc-2))))
+   ;; Message faces
+   `(message-header-name ((,class (:foreground ,blue-1))))
+   `(message-header-cc ((,class (:foreground ,butter-3))))
+   `(message-header-other ((,class (:foreground ,choc-2))))
+   `(message-header-subject ((,class (:foreground ,cham-1))))
+   `(message-header-to ((,class (:foreground ,butter-2))))
+   `(message-cited-text ((,class (:foreground ,cham-1))))
+   `(message-separator ((,class (:foreground ,plum-1))))
+   ;; SMerge faces
+   `(smerge-refined-change ((,class (:background ,blue-3))))
+   ;; Ediff faces
+   `(ediff-current-diff-A ((,class (:background ,alum-5))))
+   `(ediff-fine-diff-A ((,class (:background ,blue-3))))
+   `(ediff-even-diff-A ((,class (:background ,alum-5.5))))
+   `(ediff-odd-diff-A ((,class (:background ,alum-5.5))))
+   `(ediff-current-diff-B ((,class (:background ,alum-5))))
+   `(ediff-fine-diff-B ((,class (:background ,choc-3))))
+   `(ediff-even-diff-B ((,class (:background ,alum-5.5))))
+   `(ediff-odd-diff-B ((,class (:background ,alum-5.5))))
+   ;; Flyspell faces
+   `(flyspell-duplicate ((,class (:underline ,orange-1))))
+   `(flyspell-incorrect ((,class (:underline ,red-1))))
+   ;; Semantic faces
+   `(semantic-decoration-on-includes ((,class (:underline ,alum-4))))
+   `(semantic-decoration-on-private-members-face
+     ((,class (:background ,plum-3))))
+   `(semantic-decoration-on-protected-members-face
+     ((,class (:background ,choc-3))))
+   `(semantic-decoration-on-unknown-includes
+     ((,class (:background ,red-3))))
+   `(semantic-decoration-on-unparsed-includes
+     ((,class (:background ,alum-5.5))))
+   `(semantic-tag-boundary-face ((,class (:overline ,blue-1))))
+   `(semantic-unmatched-syntax-face ((,class (:underline ,red-1)))))
+  (custom-theme-set-variables
+   'tango-dark
+   `(ansi-color-names-vector [,alum-7 ,red-0 ,cham-0 ,butter-1
+                              ,blue-1 ,plum-1 ,blue-0 ,alum-1])))
 (provide-theme 'tango-dark)
diff --git a/etc/themes/tango-theme.el b/etc/themes/tango-theme.el
index f0492c048af..314b3986f21 100644
--- a/etc/themes/tango-theme.el
+++ b/etc/themes/tango-theme.el
@@ -1,6 +1,9 @@
 ;;; tango-theme.el --- Tango-based custom theme for faces
-;; Copyright (C) 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2011 Free Software Foundation, Inc.
+;; Authors: Chong Yidong <cyd@stupidchicken>
+;;          Jan Moringen <jan.moringen@uni-bielefeld.de>
 ;; This file is part of GNU Emacs.
@@ -25,63 +28,117 @@
 ;;; Code:
 (deftheme tango
-  "Theme for faces, based on the Tango palette on a light background.
+  "Theme for faces, based on the Tango palette with a light background.
-Basic, Font Lock, Isearch, Gnus, and Message faces are included.")
+Basic, Font Lock, Isearch, Gnus, Message, Ediff, Flyspell,
+Semantic, and Ansi-Color faces are included.")
-(custom-theme-set-faces
- 'tango
+(let ((class '((class color) (min-colors 89)))
- '(default ((t (:foreground "#16191a" :background "#eeeeec"))))
+      ;; Tango palette colors.
- '(cursor ((t (:foreground "#eeeeec" :background "#204a87"))))
+      (butter-1 "#fce94f") (butter-2 "#edd400") (butter-3 "#c4a000")
- '(highlight ((t (:background "#babdb6"))))
+      (orange-1 "#fcaf3e") (orange-2 "#f57900") (orange-3 "#ce5c00")
- '(region ((t (:background "#babdb6"))))
+      (choc-1 "#e9b96e") (choc-2 "#c17d11") (choc-3 "#8f5902")
- '(font-lock-builtin-face ((t (:weight bold :foreground "#204a87"))))
+      (cham-1 "#8ae234") (cham-2 "#73d216") (cham-3 "#4e9a06")
- '(font-lock-comment-face ((t (:foreground "#204a87"))))
+      (blue-1 "#729fcf") (blue-2 "#3465a4") (blue-3 "#204a87")
- '(font-lock-constant-face ((t (:weight bold :foreground "#5c3566"))))
+      (plum-1 "#ad7fa8") (plum-2 "#75507b") (plum-3 "#5c3566")
- '(font-lock-function-name-face ((t (:weight bold :foreground "#ce5c00"))))
+      (red-1 "#ef2929")  (red-2 "#cc0000")  (red-3 "#a40000")
- '(font-lock-keyword-face ((t (:foreground "#a40000"))))
+      (alum-1 "#eeeeec") (alum-2 "#d3d7cf") (alum-3 "#babdb6")
- '(font-lock-string-face ((t (:foreground "#5c3566"))))
+      (alum-4 "#888a85") (alum-5 "#555753") (alum-6 "#2e3436")
- '(font-lock-type-face ((t (:weight bold :foreground "#4e9a06"))))
+      ;; Not in Tango palette; used for better contrast.
- '(font-lock-variable-name-face ((t (:weight bold :foreground "#c17d11"))))
+      (cham-4 "#346604") (blue-0 "#8cc4ff"))
- '(font-lock-warning-face ((t (:foreground "#cc0000"))))
- '(button ((t (:underline t :foreground "#204a87"))))
+  (custom-theme-set-faces
- '(link ((t (:underline t :foreground "#204a87"))))
+   'tango
- '(link-visited ((t (:underline t :foreground "#3465a4"))))
+   `(default ((,class (:foreground ,"#16191a" :background ,alum-1))))
- '(mode-line ((t (:box (:line-width -1 :style released-button)
+   `(cursor ((,class (:foreground ,alum-1 :background ,blue-3))))
-                       :background "#d3d7cf" :foreground "black"))))
+   ;; Highlighting faces
- '(mode-line-inactive ((t (:box (:line-width -1 :style released-button)
+   `(fringe ((,class (:background ,alum-2))))
-                                :background "#babdb6" :foreground "black"))))
+   `(highlight ((,class (:background ,alum-3))))
- '(isearch ((t (:foreground "#ffffff" :background "#ce5c00"))))
+   `(region ((,class (:background ,alum-3))))
- '(lazy-highlight ((t (:background "#e9b96e"))))
+   `(secondary-selection ((,class (:background ,blue-0))))
- '(gnus-group-news-1 ((t (:weight bold :foreground "#5c3566"))))
+   `(isearch ((,class (:foreground ,"#ffffff" :background ,orange-3))))
- '(gnus-group-news-1-low ((t (:foreground "#5c3566"))))
+   `(lazy-highlight ((,class (:background ,choc-1))))
- '(gnus-group-news-2 ((t (:weight bold :foreground "#204a87"))))
+   `(trailing-whitespace ((,class (:background ,red-1))))
- '(gnus-group-news-2-low ((t (:foreground "#204a87"))))
+   ;; Mode line faces
- '(gnus-group-news-3 ((t (:weight bold :foreground "#4e0a06"))))
+   `(mode-line ((,class (:box (:line-width -1 :style released-button)
- '(gnus-group-news-3-low ((t (:foreground "#4e0a06"))))
+                         :background ,alum-2 :foreground ,alum-6))))
- '(gnus-group-news-4 ((t (:weight bold :foreground "#7a4c02"))))
+   `(mode-line-inactive ((,class (:box (:line-width -1 :style released-button)
- '(gnus-group-news-4-low ((t (:foreground "#7a4c02"))))
+                                  :background ,alum-4 :foreground ,alum-6))))
- '(gnus-group-news-5 ((t (:weight bold :foreground "#ce5c00"))))
+   ;; Escape and prompt faces
- '(gnus-group-news-5-low ((t (:foreground "#ce5c00"))))
+   `(minibuffer-prompt ((,class (:weight bold :foreground ,blue-3))))
- '(gnus-group-news-low ((t (:foreground "#888a85"))))
+   `(escape-glyph ((,class (:foreground ,red-3))))
- '(gnus-group-mail-1 ((t (:weight bold :foreground "#5c3566"))))
+   ;; Font lock faces
- '(gnus-group-mail-1-low ((t (:foreground "#5c3566"))))
+   `(font-lock-builtin-face ((,class (:weight bold :foreground ,plum-3))))
- '(gnus-group-mail-2 ((t (:weight bold :foreground "#204a87"))))
+   `(font-lock-comment-face ((,class (:foreground ,cham-4))))
- '(gnus-group-mail-2-low ((t (:foreground "#204a87"))))
+   `(font-lock-constant-face ((,class (:weight bold :foreground ,blue-3))))
- '(gnus-group-mail-3 ((t (:weight bold :foreground "#4e0a06"))))
+   `(font-lock-function-name-face ((,class (:foreground ,red-3))))
- '(gnus-group-mail-3-low ((t (:foreground "#4e0a06"))))
+   `(font-lock-keyword-face ((,class (:weight bold :foreground ,choc-2))))
- '(gnus-group-mail-low ((t (:foreground "#888a85"))))
+   `(font-lock-string-face ((,class (:foreground ,plum-3))))
- '(gnus-header-content ((t (:foreground "#4e9a06"))))
+   `(font-lock-type-face ((,class (:foreground ,blue-3))))
- '(gnus-header-from ((t (:weight bold :foreground "#c4a000"))))
+   `(font-lock-variable-name-face ((,class (:weight bold :foreground ,orange-3))))
- '(gnus-header-subject ((t (:foreground "#4e0a06"))))
+   `(font-lock-warning-face ((,class (:foreground ,red-2))))
- '(gnus-header-name ((t (:foreground "#204a87"))))
+   ;; Button and link faces
- '(gnus-header-newsgroups ((t (:foreground "#888a85"))))
+   `(button ((,class (:underline t :foreground ,blue-3))))
- '(message-header-name ((t (:foreground "#204a87"))))
+   `(link ((,class (:underline t :foreground ,blue-3))))
- '(message-header-cc ((t (:foreground "#c4a000"))))
+   `(link-visited ((,class (:underline t :foreground ,blue-2))))
- '(message-header-other ((t (:foreground "#c17d11"))))
+   ;; Gnus faces
- '(message-header-subject ((t (:foreground "#4e0a06"))))
+   `(gnus-group-news-1 ((,class (:weight bold :foreground ,plum-3))))
- '(message-header-to ((t (:weight bold :foreground "#c4a000"))))
+   `(gnus-group-news-1-low ((,class (:foreground ,plum-3))))
- '(message-cited-text ((t (:foreground "#888a85"))))
+   `(gnus-group-news-2 ((,class (:weight bold :foreground ,blue-3))))
- '(message-separator ((t (:weight bold :foreground "#4e9a06")))))
+   `(gnus-group-news-2-low ((,class (:foreground ,blue-3))))
+   `(gnus-group-news-3 ((,class (:weight bold :foreground ,"#4e0a06"))))
+   `(gnus-group-news-3-low ((,class (:foreground ,"#4e0a06"))))
+   `(gnus-group-news-4 ((,class (:weight bold :foreground ,"#7a4c02"))))
+   `(gnus-group-news-4-low ((,class (:foreground ,"#7a4c02"))))
+   `(gnus-group-news-5 ((,class (:weight bold :foreground ,orange-3))))
+   `(gnus-group-news-5-low ((,class (:foreground ,orange-3))))
+   `(gnus-group-news-low ((,class (:foreground ,"#888a85"))))
+   `(gnus-group-mail-1 ((,class (:weight bold :foreground ,plum-3))))
+   `(gnus-group-mail-1-low ((,class (:foreground ,plum-3))))
+   `(gnus-group-mail-2 ((,class (:weight bold :foreground ,blue-3))))
+   `(gnus-group-mail-2-low ((,class (:foreground ,blue-3))))
+   `(gnus-group-mail-3 ((,class (:weight bold :foreground ,"#4e0a06"))))
+   `(gnus-group-mail-3-low ((,class (:foreground ,"#4e0a06"))))
+   `(gnus-group-mail-low ((,class (:foreground ,"#888a85"))))
+   `(gnus-header-content ((,class (:foreground ,cham-3))))
+   `(gnus-header-from ((,class (:weight bold :foreground ,butter-3))))
+   `(gnus-header-subject ((,class (:foreground ,"#4e0a06"))))
+   `(gnus-header-name ((,class (:foreground ,blue-3))))
+   `(gnus-header-newsgroups ((,class (:foreground ,"#888a85"))))
+   ;; Message faces
+   `(message-header-name ((,class (:foreground ,blue-3))))
+   `(message-header-cc ((,class (:foreground ,butter-3))))
+   `(message-header-other ((,class (:foreground ,choc-2))))
+   `(message-header-subject ((,class (:foreground ,"#4e0a06"))))
+   `(message-header-to ((,class (:weight bold :foreground ,butter-3))))
+   `(message-cited-text ((,class (:foreground ,"#888a85"))))
+   `(message-separator ((,class (:weight bold :foreground ,cham-3))))
+   ;; SMerge
+   `(smerge-refined-change ((,class (:background ,plum-1))))
+   ;; Ediff
+   `(ediff-current-diff-A ((,class (:background ,blue-1))))
+   `(ediff-fine-diff-A ((,class (:background ,plum-1))))
+   `(ediff-current-diff-B ((,class (:background ,butter-1))))
+   `(ediff-fine-diff-B ((,class (:background ,orange-1))))
+   ;; Flyspell
+   `(flyspell-duplicate ((,class (:underline ,orange-1))))
+   `(flyspell-incorrect ((,class (:underline ,red-1))))
+   ;; Semantic faces
+   `(semantic-decoration-on-includes ((,class (:underline  ,cham-4))))
+   `(semantic-decoration-on-private-members-face
+     ((,class (:background ,alum-2))))
+   `(semantic-decoration-on-protected-members-face
+     ((,class (:background ,alum-2))))
+   `(semantic-decoration-on-unknown-includes
+     ((,class (:background ,choc-3))))
+   `(semantic-decoration-on-unparsed-includes
+     ((,class (:underline  ,orange-3))))
+   `(semantic-tag-boundary-face ((,class (:overline   ,blue-1))))
+   `(semantic-unmatched-syntax-face ((,class (:underline  ,red-1)))))
+  (custom-theme-set-variables
+   'tango
+   `(ansi-color-names-vector [,alum-6 ,red-3 ,cham-3 ,butter-3
+                                      ,blue-3 ,plum-3 ,blue-1 ,alum-1])))
 (provide-theme 'tango)
diff --git a/etc/themes/tsdh-dark-theme.el b/etc/themes/tsdh-dark-theme.el
new file mode 100644
index 00000000000..d15677114aa
--- /dev/null
+++ b/etc/themes/tsdh-dark-theme.el
@@ -0,0 +1,60 @@
+;;; tsdh-dark-theme.el --- Tassilo's dark custom theme
+;; Copyright (C) 2011 Free Software Foundation, Inc.
+;; This file is part of GNU Emacs.
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;;; Code:
+(deftheme tsdh-dark
+  "Theme with dark background used and created by Tassilo Horn.")
+(custom-theme-set-faces
+ 'tsdh-dark
+ '(default ((t (:background "gray20" :foreground "white smoke"))))
+ '(diff-added ((t (:inherit diff-changed :background "dark green"))))
+ '(diff-changed ((t (:background "midnight blue"))))
+ '(diff-indicator-added ((t (:inherit diff-indicator-changed))))
+ '(diff-indicator-changed ((t (:weight bold))))
+ '(diff-indicator-removed ((t (:inherit diff-indicator-changed))))
+ '(diff-removed ((t (:inherit diff-changed :background "dark red"))))
+ '(dired-directory ((t (:inherit font-lock-function-name-face :weight bold))))
+ '(header-line ((t (:inherit mode-line :inverse-video t))))
+ '(hl-line ((t (:background "grey28"))))
+ '(message-header-subject ((t (:foreground "SkyBlue"))))
+ '(minibuffer-prompt ((t (:background "yellow" :foreground "medium blue" :box (:line-width -1 :color "red" :style released-button) :weight bold))))
+ '(mode-line ((t (:box (:line-width -1 :color "red" :style released-button) :family "DejaVu Sans"))))
+ '(mode-line-inactive ((t (:inherit mode-line :foreground "dim gray"))))
+ '(org-agenda-date ((t (:inherit org-agenda-structure))))
+ '(org-agenda-date-today ((t (:inherit org-agenda-date :underline t))))
+ '(org-agenda-date-weekend ((t (:inherit org-agenda-date :foreground "dark green"))))
+ '(org-agenda-structure ((t (:foreground "SkyBlue" :weight bold))))
+ '(org-hide ((t (:foreground "gray30"))))
+ '(org-tag ((t (:weight bold))))
+ '(outline-1 ((t (:inherit font-lock-function-name-face :weight bold))))
+ '(outline-2 ((t (:inherit font-lock-variable-name-face :weight bold))))
+ '(outline-3 ((t (:inherit font-lock-keyword-face :weight bold))))
+ '(outline-4 ((t (:inherit font-lock-comment-face :weight bold))))
+ '(outline-5 ((t (:inherit font-lock-type-face :weight bold))))
+ '(outline-6 ((t (:inherit font-lock-constant-face :weight bold))))
+ '(outline-7 ((t (:inherit font-lock-builtin-face :weight bold))))
+ '(outline-8 ((t (:inherit font-lock-string-face :weight bold))))
+ '(region ((t (:background "SteelBlue4"))))
+ '(show-paren-match ((t (:background "DarkGreen"))))
+ '(show-paren-mismatch ((t (:background "deep pink"))))
+ '(window-number-face ((t (:foreground "red" :weight bold)))))
+(provide-theme 'tsdh-dark)
diff --git a/etc/themes/tsdh-light-theme.el b/etc/themes/tsdh-light-theme.el
new file mode 100644
index 00000000000..9fac27fda1e
--- /dev/null
+++ b/etc/themes/tsdh-light-theme.el
@@ -0,0 +1,59 @@
+;;; tsdh-light-theme.el --- Tassilo's light custom theme
+;; Copyright (C) 2011 Free Software Foundation, Inc.
+;; This file is part of GNU Emacs.
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;;; Code:
+(deftheme tsdh-light
+  "Black on white theme used and created by Tassilo Horn.")
+(custom-theme-set-faces
+ 'tsdh-light
+ '(default ((t (:background "white" :foreground "black"))))
+ '(diff-added ((t (:inherit diff-changed :background "light green"))))
+ '(diff-changed ((t (:background "light steel blue"))))
+ '(diff-indicator-added ((t (:inherit diff-indicator-changed))))
+ '(diff-indicator-changed ((t (:weight bold))))
+ '(diff-indicator-removed ((t (:inherit diff-indicator-changed))))
+ '(diff-removed ((t (:inherit diff-changed :background "sandy brown"))))
+ '(dired-directory ((t (:inherit font-lock-function-name-face :weight bold))))
+ '(header-line ((t (:inherit mode-line :inverse-video t))))
+ '(hl-line ((t (:background "grey95"))))
+ '(minibuffer-prompt ((t (:background "yellow" :foreground "medium blue" :box (:line-width -1 :color "red" :style released-button) :weight bold))))
+ '(mode-line ((t (:box (:line-width -1 :color "red" :style released-button) :family "DejaVu Sans"))))
+ '(mode-line-inactive ((t (:inherit mode-line :foreground "dim gray"))))
+ '(org-agenda-date ((t (:inherit org-agenda-structure))))
+ '(org-agenda-date-today ((t (:inherit org-agenda-date :underline t))))
+ '(org-agenda-date-weekend ((t (:inherit org-agenda-date :foreground "dark green"))))
+ '(org-agenda-structure ((t (:foreground "Blue1" :weight bold :height 1.1 :family "DeJaVu Sans"))))
+ '(org-hide ((t (:foreground "white"))))
+ '(org-tag ((t (:weight bold))))
+ '(outline-1 ((t (:inherit font-lock-function-name-face :weight bold))))
+ '(outline-2 ((t (:inherit font-lock-variable-name-face :weight bold))))
+ '(outline-3 ((t (:inherit font-lock-keyword-face :weight bold))))
+ '(outline-4 ((t (:inherit font-lock-comment-face :weight bold))))
+ '(outline-5 ((t (:inherit font-lock-type-face :weight bold))))
+ '(outline-6 ((t (:inherit font-lock-constant-face :weight bold))))
+ '(outline-7 ((t (:inherit font-lock-builtin-face :weight bold))))
+ '(outline-8 ((t (:inherit font-lock-string-face :weight bold))))
+ '(region ((t (:background "lightgoldenrod1"))))
+ '(show-paren-match ((t (:background "LightCyan2"))))
+ '(show-paren-mismatch ((t (:background "deep pink"))))
+ '(window-number-face ((t (:foreground "red" :weight bold)))))
+(provide-theme 'tsdh-light)
diff --git a/etc/themes/wheatgrass-theme.el b/etc/themes/wheatgrass-theme.el
index 848e5e95073..0b22fd25d53 100644
--- a/etc/themes/wheatgrass-theme.el
+++ b/etc/themes/wheatgrass-theme.el
@@ -1,6 +1,6 @@
 ;;; wheatgrass-theme.el --- custom theme for faces
-;; 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/etc/tutorials/TUTORIAL b/etc/tutorials/TUTORIAL
index f566df9735d..ae4cfb93edc 100644
--- a/etc/tutorials/TUTORIAL
+++ b/etc/tutorials/TUTORIAL
@@ -1121,8 +1121,7 @@ starting with the one written by Stuart Cracraft for the original Emacs.
 This version of the tutorial is a part of GNU Emacs.  It is copyrighted
 and comes with permission to distribute copies on certain conditions:
-  Copyright (C) 1985, 1996, 1998, 2001, 2002, 2003, 2004, 2005, 2006,
+  Copyright (C) 1985, 1996, 1998, 2001-2011 Free Software Foundation, Inc.
-    2007, 2008, 2009, 2010 Free Software Foundation, Inc.
  This file is part of GNU Emacs.
@@ -1143,4 +1142,3 @@ Please read the file COPYING and then do give copies of GNU Emacs to
 your friends.  Help stamp out software obstructionism ("ownership") by
 using, writing, and sharing free software!
-;;; arch-tag: a0f84628-777f-4238-8865-451a73167f55
diff --git a/etc/tutorials/TUTORIAL.bg b/etc/tutorials/TUTORIAL.bg
index e8300d26653..cbbc27bd9c4 100644
--- a/etc/tutorials/TUTORIAL.bg
+++ b/etc/tutorials/TUTORIAL.bg
@@ -1160,8 +1160,7 @@ Dired �� ��������� �� ������� ������� �� ������� � ���������� (� ����
 This version of the tutorial, like GNU Emacs, is copyrighted, and
 comes with permission to distribute copies on certain conditions:
-Copyright (C) 1985, 1996, 1998, 2001, 2002, 2003, 2004,
+Copyright (C) 1985, 1996, 1998, 2001-2011  Free Software Foundation, Inc.
-   2005, 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
   Permission is granted to anyone to make or distribute verbatim copies
   of this document as received, in any medium, provided that the
@@ -1185,4 +1184,3 @@ Copyright (C) 1985, 1996, 1998, 2001, 2002, 2003, 2004,
 ;;; Local Variables:
 ;;;   coding: windows-1251
 ;;; End:
-;;; arch-tag: 70cf6ad7-c2e4-41fe-8199-74aa52683b0e
diff --git a/etc/tutorials/TUTORIAL.cn b/etc/tutorials/TUTORIAL.cn
index e24b3c25093..6a605f6e791 100644
--- a/etc/tutorials/TUTORIAL.cn
+++ b/etc/tutorials/TUTORIAL.cn
@@ -980,8 +980,7 @@ starting with the one written by Stuart Cracraft for the original Emacs.
 This version of the tutorial, like GNU Emacs, is copyrighted, and
 comes with permission to distribute copies on certain conditions:
-Copyright (C) 1985, 1996, 1998, 2001, 2002, 2003, 2004,
+Copyright (C) 1985, 1996, 1998, 2001-2011  Free Software Foundation, Inc.
-   2005, 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
   Permission is granted to anyone to make or distribute verbatim copies
   of this document as received, in any medium, provided that the
@@ -1006,8 +1005,7 @@ GNU Emacs to your friends.  Help stamp out software obstructionism
 ��ƪ�ĵ��� GNU Emacs һ��ӵ�а�Ȩ��������������������Լ���·����俽����
-   Copyright (C) 1985, 1996, 1998, 2001, 2002, 2003, 2004, 2005, 2006,
+   Copyright (C) 1985, 1996, 1998, 2001-2011  Free Software Foundation, Inc.
-   2007, 2008, 2009, 2010  Free Software Foundation, Inc.
   ���ĵ������ڲ�����ĵ����ݵ���������κ��˷������κ�ý���ϣ�ͬʱ����
   ����������Ȩ������������������������뷢������ȫ��ͬ�ġ��籾��������
@@ -1024,4 +1022,3 @@ Emacs �����İ�Ȩ������ȱ��ĵ�Ҫ����һЩ����Ҳ������ͬ�ľ��񡣾����Ķ���
 ;;; coding: chinese-iso-8bit
 ;;; End:
-;;; arch-tag: 46a53d82-a85a-46b6-bdc7-583aca063578
diff --git a/etc/tutorials/TUTORIAL.cs b/etc/tutorials/TUTORIAL.cs
index 628c3d7d8d1..98dcf473aef 100644
--- a/etc/tutorials/TUTORIAL.cs
+++ b/etc/tutorials/TUTORIAL.cs
@@ -1015,8 +1015,7 @@ tutori�lem napsan�m Stuartem Cracraftem pro p�vodn� Emacs.
 Tato verze tutori�lu je, podobn� jako GNU Emacs, chr�n�na copyrightem a
 je ���ena se svolen�m distribuovat kopie za jist�ch podm�nek:
-Copyright (C) 1985, 1996, 1998, 2001, 2002, 2003, 2004,
+Copyright (C) 1985, 1996, 1998, 2001-2011  Free Software Foundation, Inc.
-   2005, 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
   Ka�d�mu je zaru�eno pr�vo vytv��et a distribuovat p�esn� kopie tohoto
   dokumentu tak, jak jej obdr�el, na jak�mkoliv m�diu, s t�m, �e bude
@@ -1037,4 +1036,3 @@ GNU Emacsu sv�m p��tel�m.  Pom�hejte pot�rat softwarovou obstrukci
 ;;; coding: iso-latin-2
 ;;; End:
-;;; arch-tag: 479ef577-3d4d-4384-aeea-9fe79d5e89ca
diff --git a/etc/tutorials/TUTORIAL.de b/etc/tutorials/TUTORIAL.de
index 4b97aa60b47..ad0b765b55b 100644
--- a/etc/tutorials/TUTORIAL.de
+++ b/etc/tutorials/TUTORIAL.de
@@ -1477,8 +1477,7 @@ Beachten Sie bitte, dass im Zweifelsfalle das englische Original
 dieser Urheberrechtsnotiz g�ltig ist (zu finden in der Datei
 TUTORIAL).
-   Copyright (C) 1985, 1996, 1997, 2001, 2002, 2003, 2004, 2005, 2006,
+   Copyright (C) 1985, 1996-1997, 2001-2011 Free Software Foundation, Inc.
-     2007, 2008, 2009, 2010 Free Software Foundation, Inc.
   Diese Datei ist ein Bestandteil von GNU Emacs.
@@ -1506,4 +1505,3 @@ freie Software verwenden, verteilen, oder sogar selber schreiben.
 ;;;   coding: latin-1
 ;;; End:
-;;; arch-tag: a8f2fe06-631d-4ae1-887e-446f971b0baa
diff --git a/etc/tutorials/TUTORIAL.eo b/etc/tutorials/TUTORIAL.eo
index 91bf78e47a9..f95f3317abf 100644
--- a/etc/tutorials/TUTORIAL.eo
+++ b/etc/tutorials/TUTORIAL.eo
@@ -1081,8 +1081,8 @@ la dosiero verkita de Stuart Cracraft por la originala Emakso.
 kopirajton, kaj venas kun permeso por disdoni kopiojn se certaj
 kondi�oj estas observataj:
-   Copyright (C) 1985, 1999, 2001, 2002, 2005,
+   Copyright (C) 1985, 1999, 2001-2002, 2005, 2007-2011
-   2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+     Free Software Foundation, Inc.
   �i tiu dosiero estas parto de "GNU Emacs".
 
@@ -1114,5 +1114,3 @@ kaj kompletigis Sergio B. Pokrovskij.
 ;;; Local Variables:
 ;;;   coding: latin-3
 ;;; End:
-;; arch-tag: ee436ebb-58b6-4102-9402-1e92c33966e9
diff --git a/etc/tutorials/TUTORIAL.es b/etc/tutorials/TUTORIAL.es
index 7b8198a915b..e4b2cf0d528 100644
--- a/etc/tutorials/TUTORIAL.es
+++ b/etc/tutorials/TUTORIAL.es
@@ -1179,8 +1179,7 @@ Por favor, en caso de duda, s�lo es v�lido el original en ingl�s de la
 siguiente nota de derechos de reproducci�n (que puede encontrar en el
 archivo TUTORIAL).
-Copyright (C) 1985, 1996, 1998, 2001, 2002, 2003, 2004,
+Copyright (C) 1985, 1996, 1998, 2001-2011  Free Software Foundation, Inc.
-   2005, 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
   Se permite a cualquiera hacer o distribuir copias literales de este
   documento como se recibe, en cualquier medio, siempre que la nota
@@ -1205,4 +1204,3 @@ compartiendo software libre!
 ;;;   coding: latin-1
 ;;; End:
-;;; arch-tag: 66aae86e-6f86-4a3e-b82a-44a783f774fd
diff --git a/etc/tutorials/TUTORIAL.fr b/etc/tutorials/TUTORIAL.fr
index 305f01957f9..5ba4ebae9c3 100644
--- a/etc/tutorials/TUTORIAL.fr
+++ b/etc/tutorials/TUTORIAL.fr
@@ -1162,8 +1162,7 @@ Cette version du didacticiel, comme GNU Emacs, est plac�e sous
 copyright, et vous pouvez en distribuer des copies sous certaines
 conditions :
-Copyright (C) 1985, 1996, 2001, 2002, 2003, 2004,
+Copyright (C) 1985, 1996, 2001-2011  Free Software Foundation, Inc.
-   2005, 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
   Chacun peut cr�er ou distribuer des copies de ce document tel qu'il
   l'a re�u, sur n'importe quel support, pourvu que la note de
@@ -1192,4 +1191,3 @@ Cette traduction fran�aise a �t� effectu�e par �ric Jacoboni
 ;;;   sentence-end-double-space: nil
 ;;; End:
-;;; arch-tag: f6c5c2ff-bf24-477c-bd18-32f76f51ba65
diff --git a/etc/tutorials/TUTORIAL.he b/etc/tutorials/TUTORIAL.he
index 8c376314d2e..529c42a1c40 100644
--- a/etc/tutorials/TUTORIAL.he
+++ b/etc/tutorials/TUTORIAL.he
@@ -1008,7 +1008,7 @@ find-file.
 גירסה זו של השיעור הינה חלק מחבילת GNU Emacs. היא מוגנת בזכויות יוצרים
 וניתנת להעתקה והפצת עותקים בתנאים מסויימים כדלקמן:
-                       Copyright (C) 2010 Free Software Foundation, Inc.
+                       Copyright (C) 2010-2011 Free Software Foundation, Inc.
 ‏GNU Emacs הינו תכנה חפשית; זכותכם להפיצו ו\או לשנותו בכפוף לתנאי
 הרשיון GNU General Public License, כפי שהוא יוצא לאור ע"י Free
diff --git a/etc/tutorials/TUTORIAL.it b/etc/tutorials/TUTORIAL.it
index fda4a57adda..1c9f8bc6654 100644
--- a/etc/tutorials/TUTORIAL.it
+++ b/etc/tutorials/TUTORIAL.it
@@ -1085,7 +1085,7 @@ distribuito con il permesso di farne copie a determinate condizioni:
   indicativo, restando comunque inteso il fatto che � quella originale a
   fare fede.
-Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+Copyright (C) 2003-2011  Free Software Foundation, Inc.
   � permesso a chiunque copiare e distribuire attraverso ogni mezzo copie
   fedeli di questo documento cos� come viene ricevuto, a condizione che
@@ -1109,4 +1109,3 @@ condividendo software libero!
 ;;;   coding: latin-1
 ;;; End:
-;;; arch-tag: c6f7079d-8032-473d-91d4-36754af15719
diff --git a/etc/tutorials/TUTORIAL.ja b/etc/tutorials/TUTORIAL.ja
index fac39e3f0c3..e4917d40987 100644
--- a/etc/tutorials/TUTORIAL.ja
+++ b/etc/tutorials/TUTORIAL.ja
@@ -1062,8 +1062,7 @@ starting with the one written by Stuart Cracraft for the original Emacs.
 This version of the tutorial, like GNU Emacs, is copyrighted, and
 comes with permission to distribute copies on certain conditions:
-Copyright (C) 1985, 1996, 1998, 2001, 2002, 2003, 2004,
+Copyright (C) 1985, 1996, 1998, 2001-2011  Free Software Foundation, Inc.
-   2005, 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
   Permission is granted to anyone to make or distribute verbatim copies
   of this document as received, in any medium, provided that the
@@ -1085,4 +1084,3 @@ GNU Emacs to your friends.  Help stamp out software obstructionism
 ;;; coding: iso-2022-jp
 ;;; End:
-;;; arch-tag: 7136abc2-eb97-4f51-80a2-fa690ba4cfe8
diff --git a/etc/tutorials/TUTORIAL.ko b/etc/tutorials/TUTORIAL.ko
index 5cb3c23f132..a928923832d 100644
--- a/etc/tutorials/TUTORIAL.ko
+++ b/etc/tutorials/TUTORIAL.ko
@@ -981,8 +981,7 @@ C-x C-s$(C?M(B (META$(C<h3*(B EDIT$(C<h(B $(CH$@:(B $(C13C<<h0!(B $(C
 GNU $(C@L8F=:?M(B $(C00@L(B $(C@L(B $(CAvD'<-(B $(CFG@:(B $(C@z@[1G@L(B $(C@V@88g(B $(CF/A$GQ(B $(CA60G@;(B $(C88A7GR(B
 $(C6'?!(B $(C:9;g:;@;(B $(C9hFwGR(B $(C<v(B $(C@V4B(B $(CGc0!8&(B $(C0.0m(B $(C3*?B(B $(C0M@L4Y(B:
-Copyright (C) 1985, 1996, 2001, 2002, 2003, 2004,
+Copyright (C) 1985, 1996, 2001-2011  Free Software Foundation, Inc.
-   2005, 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
   $(C@L(B $(C9.<-4B(B $(C@L(B $(C@z@[1G(B $(C0x0m?M(B $(CGc?k(B $(C0x0m0!(B $(C1W4k7N(B $(C@/Av5G0m(B, $(C9hFw@Z0!(B
   $(C<vCk@Z?!0T(B $(C@L(B $(C0x0m?!(B $(C5{6s(B $(CGc?k5G4B(B $(C0MC373(B $(C6G(B $(C@g:P9hGO4B(B $(C0M@;(B
@@ -998,4 +997,3 @@ COPYING$(C@L6s4B(B $(CFD@O@;(B $(C@P0m(B $(C3-(B $(CHD?!(B GNU $(C@L8
 $(CAV=J=C?@(B.  $(C@Z@/(B $(C<RGAF.?~>n8&(B $(C>20m(B $(C885i0m(B $(C0x@/GT@87N=a(B $(C<RGAF.?~>n(B
 $(C9fGX8&(B ("$(C<R@/1G(B") $(C1Y@}GO4B5%(B $(C55?s=C4Y(B.
-;;; arch-tag: 44503bc5-b2c1-4169-962d-9d33157221a9
diff --git a/etc/tutorials/TUTORIAL.nl b/etc/tutorials/TUTORIAL.nl
index 6308c8b5547..59f54c1b2db 100644
--- a/etc/tutorials/TUTORIAL.nl
+++ b/etc/tutorials/TUTORIAL.nl
@@ -1196,8 +1196,7 @@ het Engelse origineel.)
 Deze versie van de inleiding valt onder copyright, net als GNU Emacs.
 Je mag deze inleiding verspreiden onder bepaalde voorwaarden:
-Copyright (C) 1985, 1996, 1997, 2001, 2002, 2003, 2004,
+Copyright (C) 1985, 1996-1997, 2001-2011  Free Software Foundation, Inc.
-   2005, 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
   Iedereen mag letterlijke kopie�n van dit document, zowel ontvangen
   als verspreiden, op elk medium, vooropgesteld dat de
@@ -1221,8 +1220,7 @@ software te gebruiken, te schrijven en te delen!
 This version of the tutorial, like GNU Emacs, is copyrighted, and
 comes with permission to distribute copies on certain conditions:
-Copyright (C) 1985, 1996, 1997, 2001, 2002, 2003, 2004,
+Copyright (C) 1985, 1996-1997, 2001-2011  Free Software Foundation, Inc.
-   2005, 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
   Permission is granted to anyone to make or distribute verbatim
   copies of this document as received, in any medium, provided that
@@ -1243,5 +1241,3 @@ GNU Emacs to your friends.  Help stamp out software obstructionism
 ;;; Local Variables:
 ;;;   coding: latin-1
 ;;; End:
-;;; arch-tag: 3399e308-e605-4125-8fbb-b2fe91ac3149
diff --git a/etc/tutorials/TUTORIAL.pl b/etc/tutorials/TUTORIAL.pl
index 7e2f147efd7..f6859612a49 100644
--- a/etc/tutorials/TUTORIAL.pl
+++ b/etc/tutorials/TUTORIAL.pl
@@ -1209,8 +1209,7 @@ z pomoc� Ryszarda Kubiaka i Janusza S. Bienia <jsbien@mail.uw.edu.pl>.
 Ta wersja samouczka, podobnie jak GNU Emacs, jest chroniona prawem
 autorskim, ale wolno j� kopiowa� pod nast�puj�cymi warunkami:
-Copyright (C) 1985, 1994, 2001, 2002, 2003, 2004,
+Copyright (C) 1985, 1994, 2001-2011  Free Software Foundation, Inc.
-   2005, 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
 Zezwala si� na wykonywanie lub rozpowszechnianie
 wiernych kopii tego dokumentu w otrzymanej formie, na dowolnym
@@ -1237,4 +1236,3 @@ u�ywaj�c, tworz�c i dziel�c si� oprogramowaniem swobodnym.
 ;;; sentence-end-double-space: nil
 ;;; End:
-;;; arch-tag: 6c6b7445-4cd5-44ca-a101-7f4697b92f60
diff --git a/etc/tutorials/TUTORIAL.pt_BR b/etc/tutorials/TUTORIAL.pt_BR
index a3feb476d39..1328c22f7b3 100644
--- a/etc/tutorials/TUTORIAL.pt_BR
+++ b/etc/tutorials/TUTORIAL.pt_BR
@@ -1056,7 +1056,7 @@ Essa vers�o do tutorial foi originalmente traduzida por Marcelo Toledo
 <marcelo@gnu.org> e como o GNU Emacs, tem um copyright, e vem
 com uma permiss�o de distribui��o de c�pias nas seguintes condi��es:
-Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+Copyright (C) 2004-2011  Free Software Foundation, Inc.
   Permiss�o � garantida a qualquer um para fazer ou distribuir c�pias
   integrais deste documento como recebido, em qualquer meio, deixando
@@ -1078,4 +1078,3 @@ Emacs para seus amigos. Ajude a erradicar o obstrucionismo de software
 ;;;   sentence-end-double-space: nil
 ;;; End:
-;;; arch-tag: 8ea256d6-2c4a-49ee-ac08-0ea6ef25bf8d
diff --git a/etc/tutorials/TUTORIAL.ro b/etc/tutorials/TUTORIAL.ro
index 1000950e704..a3ce0b79d48 100644
--- a/etc/tutorials/TUTORIAL.ro
+++ b/etc/tutorials/TUTORIAL.ro
@@ -1082,8 +1082,7 @@ continuare no�ita de copyright original� �n limba englez�.
 This version of the tutorial, like GNU Emacs, is copyrighted, and
 comes with permission to distribute copies on certain conditions:
-Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005,
+Copyright (C) 1998, 2001-2011  Free Software Foundation, Inc.
-   2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
   Permission is granted to anyone to make or distribute verbatim copies
   of this document as received, in any medium, provided that the
@@ -1105,4 +1104,3 @@ folosind, scriind �i distribuind free software!
 ;;; coding: iso-latin-2
 ;;; End:
-;;; arch-tag: dcf252cf-bd67-4f8d-a440-1ec4b8dbfd70
diff --git a/etc/tutorials/TUTORIAL.ru b/etc/tutorials/TUTORIAL.ru
index 16bf9133d15..f8127a2d82e 100644
--- a/etc/tutorials/TUTORIAL.ru
+++ b/etc/tutorials/TUTORIAL.ru
@@ -1128,8 +1128,7 @@ Dired ��������� ��� ���������� ������ ������ � �������� (� �����
 (copyrighted) � �������� � ������������� ��������������� ����� ��
 ���������� ������������:
-Copyright (C) 1985, 1996, 1998, 2001, 2002, 2003, 2004,
+Copyright (C) 1985, 1996, 1998, 2001-2011  Free Software Foundation, Inc.
-   2005, 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
   Permission is granted to anyone to make or distribute verbatim copies
   of this document as received, in any medium, provided that the
@@ -1156,4 +1155,3 @@ Copyright (C) 1985, 1996, 1998, 2001, 2002, 2003, 2004,
 ;;; sentence-end-double-space: nil
 ;;; End:
-;;; arch-tag: ad4e5698-ea8b-45b7-b236-ed5ad5b72d2b
diff --git a/etc/tutorials/TUTORIAL.sk b/etc/tutorials/TUTORIAL.sk
index ab7721e2cf5..b75f4c24f0e 100644
--- a/etc/tutorials/TUTORIAL.sk
+++ b/etc/tutorials/TUTORIAL.sk
@@ -1074,8 +1074,7 @@ t�torialom nap�san�m Stuartom Cracraftom pre p�vodn� Emacs.
 T�to verzia t�torialu je, podobne ako GNU Emacs, chr�nen� copyrightom
 a je ��ren� s povolen�m distribuova� k�pie za ist�ch podmienok:
-Copyright (C) 1985, 1996, 1998, 2001, 2002, 2003, 2004,
+Copyright (C) 1985, 1996, 1998, 2001-2011  Free Software Foundation, Inc.
-   2005, 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
   Ka�d�mu je zaru�en� pr�vo vytv�ra� a distribuova� presn� k�pie tohto
   dokumentu tak, ako ho dostal, na akomko�vek m�diu, s t�m, �e bude
@@ -1096,4 +1095,3 @@ GNU Emacsu svojim priate�om.  Pom�hajte potla�ova� softwarov� ob�trukciu
 ;;; coding: iso-latin-2
 ;;; End:
-;;; arch-tag: 87861cfa-5cf6-4b87-9fab-86c93c5ca9f3
diff --git a/etc/tutorials/TUTORIAL.sl b/etc/tutorials/TUTORIAL.sl
index 96923368438..e43ac324870 100644
--- a/etc/tutorials/TUTORIAL.sl
+++ b/etc/tutorials/TUTORIAL.sl
@@ -1106,8 +1106,7 @@ Emacs. V sloven��ino ga je prevedel Primo� Peterlin.
 To besedilo, kot sam GNU Emacs, je avtorsko delo, in njegovo
 razmno�evanje in raz�irjanje je dovoljeno pod naslednjimi pogoji:
-Copyright (C) 1985, 1996, 1998, 2001, 2002, 2003, 2004,
+Copyright (C) 1985, 1996, 1998, 2001-2011  Free Software Foundation, Inc.
-   2005, 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
   Dovoljeno je izdelovati in raz�irjati neokrnjene kopije tega spisa
   v kakr�nikoli obliki pod pogojem, da je ohranjena navedba o
@@ -1129,4 +1128,3 @@ pi�ete in delite prosto programje!
 ;;; sentence-end-double-space: nil
 ;;; End:
-;;; arch-tag: 985059e4-44c6-4ac9-b627-46c8db57acf6
diff --git a/etc/tutorials/TUTORIAL.sv b/etc/tutorials/TUTORIAL.sv
index 811178ec3b2..1960d35fff5 100644
--- a/etc/tutorials/TUTORIAL.sv
+++ b/etc/tutorials/TUTORIAL.sv
@@ -1119,8 +1119,7 @@ Lidell �versatte den till Svenska.
 This version of the tutorial, like GNU Emacs, is copyrighted, and
 comes with permission to distribute copies on certain conditions:
-Copyright (C) 1985, 1996, 1998, 2001, 2002, 2003, 2004,
+Copyright (C) 1985, 1996, 1998, 2001-2011  Free Software Foundation, Inc.
-   2005, 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
   Permission is granted to anyone to make or distribute verbatim copies
   of this document as received, in any medium, provided that the
@@ -1143,4 +1142,3 @@ GNU Emacs to your friends.  Help stamp out software obstructionism
 ;;;   sentence-end-double-space: nil
 ;;; End:
-;;; arch-tag: b352f774-622b-4cc6-85ce-43e3baf4fc1b
diff --git a/etc/tutorials/TUTORIAL.th b/etc/tutorials/TUTORIAL.th
index c53fad154ec..fae084cd5e8 100644
--- a/etc/tutorials/TUTORIAL.th
+++ b/etc/tutorials/TUTORIAL.th
@@ -964,8 +964,7 @@ starting with the one written by Stuart Cracraft for the original Emacs.
 This version of the tutorial, like GNU Emacs, is copyrighted, and
 comes with permission to distribute copies on certain conditions:
-Copyright (C) 1985, 1996, 2001, 2002, 2003, 2004,
+Copyright (C) 1985, 1996, 2001-2011  Free Software Foundation, Inc.
-   2005, 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
   Permission is granted to anyone to make or distribute verbatim copies
   of this document as received, in any medium, provided that the
@@ -1005,4 +1004,3 @@ Translate - January 1999 by Virach Sornlertlamvanich
 ;;;   sentence-end-double-space: nil
 ;;; End:
-;;; arch-tag: 79ad252a-448a-4dc9-a4cb-2097dd1ec014
diff --git a/etc/tutorials/TUTORIAL.translators b/etc/tutorials/TUTORIAL.translators
index ea0b1ec040e..a69d23c471d 100644
--- a/etc/tutorials/TUTORIAL.translators
+++ b/etc/tutorials/TUTORIAL.translators
@@ -96,4 +96,3 @@ Maintainer: Chao-Hong Liu <chliu@gnu.org>
 ;;; coding: utf-8
 ;;; End:
-;;; arch-tag: 8788b16b-e739-4304-a7f2-729bdb999fa0
diff --git a/etc/tutorials/TUTORIAL.zh b/etc/tutorials/TUTORIAL.zh
index 567aeb7915d..a7dc9e63a4a 100644
--- a/etc/tutorials/TUTORIAL.zh
+++ b/etc/tutorials/TUTORIAL.zh
@@ -1049,8 +1049,7 @@ issue here>�v�C
 �o�Ӫ������ֳt���n�M GNU Emacs �@�˳��O���v�ƪ��A�åB���\�b�Y�Ǳ���U
 ���G������G
-Copyright (C) 1985, 1996, 1998, 2001, 2002, 2003, 2004,
+Copyright (C) 1985, 1996, 1998, 2001-2011  Free Software Foundation, Inc.
-   2005, 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
   Permission is granted to anyone to make or distribute verbatim copies
   of this document as received, in any medium, provided that the
@@ -1083,4 +1082,3 @@ Copyright (C) 1985, 1996, 1998, 2001, 2002, 2003, 2004,
 ;;; coding: chinese-big5
 ;;; End:
-;;; arch-tag: a51dafb4-e602-432b-8020-5d5d5f150811
author	Stefan Monnier	2011-02-01 12:09:25 -0500
committer	Stefan Monnier	2011-02-01 12:09:25 -0500
commit	8f1d2ef658f95549eb33fe5265f8f11c5129bece (patch)
tree	b7cd852a1adb423384532cfe22c31547160b22bc /etc
parent	590130fb19e1f433965c421d98fedeb2d7c33310 (diff)
parent	1dc4075fa8809805aed5092e93e225e889725c94 (diff)
download	emacs-8f1d2ef658f95549eb33fe5265f8f11c5129bece.tar.gz emacs-8f1d2ef658f95549eb33fe5265f8f11c5129bece.zip