Merge from emacs-23

25 files changed, 46 insertions, 66 deletions

diff --git a/etc/refcards/Makefile b/etc/refcards/Makefile
index c1bddd124d7..70ca724e4da 100644
--- a/etc/refcards/Makefile
+++ b/etc/refcards/Makefile
@@ -1,7 +1,7 @@
 ### Makefile for Emacs refcards
 
 ## Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-##   2008, 2009, 2010  Free Software Foundation, Inc.
+##   2008, 2009, 2010, 2011  Free Software Foundation, Inc.
 
 ## This file is part of GNU Emacs.
 #
diff --git a/etc/refcards/README b/etc/refcards/README
index 7a0d3f4e2ad..661f10aa3af 100644
--- a/etc/refcards/README
+++ b/etc/refcards/README
@@ -12,6 +12,6 @@ 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, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
     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..e74cc536151 100644
--- a/etc/refcards/calccard.tex
+++ b/etc/refcards/calccard.tex
@@ -21,7 +21,7 @@
 % Typical command to print (3 cols):  dvips -t landscape calccard.dvi
 
 % Copyright (C) 1987, 1992, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-%   2008, 2009, 2010  Free Software Foundation, Inc.
+%   2008, 2009, 2010, 2011  Free Software Foundation, Inc.
 
 % This file is part of GNU Emacs.
 
@@ -65,7 +65,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 +674,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..bb91fa60023 100644
--- a/etc/refcards/cs-dired-ref.tex
+++ b/etc/refcards/cs-dired-ref.tex
@@ -1,7 +1,7 @@
 % Reference Card for Dired
 
 % Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-%   2009, 2010  Free Software Foundation, Inc.
+%   2009, 2010, 2011  Free Software Foundation, Inc.
 
 % Author: Evgeny Roubinchtein <eroubinc@u.washington.edu>
 % Czech translation: Pavel Janík <Pavel@Janik.cz>, March 2001
@@ -43,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.
 
@@ -399,4 +399,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..252976d6e86 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,
-%   2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+%   2006, 2007, 2008, 2009, 2010, 2011  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..b87e561ff3c 100644
--- a/etc/refcards/cs-survival.tex
+++ b/etc/refcards/cs-survival.tex
@@ -1,7 +1,7 @@
 % Title:  GNU Emacs Survival Card
 
 % Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-%   2009, 2010  Free Software Foundation, Inc.
+%   2009, 2010, 2011  Free Software Foundation, Inc.
 
 % Author: Wlodek Bzyl <matwb@univ.gda.pl>
 % Czech translation: Pavel Janík <Pavel@Janik.cz>, March 2001
@@ -56,7 +56,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 +416,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..9e074b72396 100644
--- a/etc/refcards/de-refcard.tex
+++ b/etc/refcards/de-refcard.tex
@@ -1,7 +1,7 @@
 % Reference Card for GNU Emacs
 
 % Copyright (C) 1987, 1993, 1996, 2000, 2001, 2002, 2003, 2004, 2005,
-%   2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+%   2006, 2007, 2008, 2009, 2010, 2011  Free Software Foundation, Inc.
 
 % Author: Stephen Gildea <gildea@stop.mail-abuse.org>
 % German translation: Sven Joachim <svenjoac@gmx.de>
@@ -62,7 +62,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 +680,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..fdb46d5b48f 100644
--- a/etc/refcards/dired-ref.tex
+++ b/etc/refcards/dired-ref.tex
@@ -1,7 +1,7 @@
 % Reference Card for Dired
 
 % Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-%   2009, 2010  Free Software Foundation, Inc.
+%   2009, 2010, 2011  Free Software Foundation, Inc.
 
 % Author: Evgeny Roubinchtein <eroubinc@u.washington.edu>
 
@@ -45,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
 
 % Nothing else needs to be changed.
 
@@ -408,4 +408,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..549cf341a55 100644
--- a/etc/refcards/fr-dired-ref.tex
+++ b/etc/refcards/fr-dired-ref.tex
@@ -1,7 +1,7 @@
 % Reference Card for Dired
 
 % Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-%   2009, 2010  Free Software Foundation, Inc.
+%   2009, 2010, 2011  Free Software Foundation, Inc.
 
 % Author: Evgeny Roubinchtein <eroubinc@u.washington.edu>
 % French translation: Eric Jacoboni
@@ -37,7 +37,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 +413,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..c02169cc677 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,
-%   2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+%   2006, 2007, 2008, 2009, 2010, 2011  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..fea6ec27cf6 100644
--- a/etc/refcards/fr-survival.tex
+++ b/etc/refcards/fr-survival.tex
@@ -2,7 +2,7 @@
 % Title:  GNU Emacs Survival Card
 
 % Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-%   2009, 2010  Free Software Foundation, Inc.
+%   2009, 2010, 2011  Free Software Foundation, Inc.
 
 % Author: Wlodek Bzyl <matwb@univ.gda.pl>
 % French translation:  \'Eric Jacoboni <jaco@teaser.fr>, November 2001
@@ -51,7 +51,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 +420,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..c397272881b 100644
--- a/etc/refcards/gnus-logo.eps
+++ b/etc/refcards/gnus-logo.eps
@@ -1,5 +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, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
 %   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..85a52e10b35 100644
--- a/etc/refcards/gnus-refcard.tex
+++ b/etc/refcards/gnus-refcard.tex
@@ -120,8 +120,8 @@
 %% Gnus logo by Luis Fernandes.
 \newcommand{\Copyright}{%
   \begin{center}
-    Copyright \copyright\ 1995, 2000, 2002, 2003, 2004,
-       2005, 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.\\*
+    Copyright \copyright\ 1995, 2000, 2002, 2003, 2004, 2005, 2006, 2007,
+       2008, 2009, 2010, 2011  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..d4704484905 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
@@ -18,7 +18,7 @@
 
 % Nothing else needs to be changed below this line.
 % Copyright (C) 1987, 1993, 1996, 1997, 2001, 2002, 2003, 2004, 2005,
-%   2006, 2007, 2008, 2009  Free Software Foundation, Inc.
+%   2006, 2007, 2008, 2009, 2010, 2011  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..eb3ba849bd6 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, 2008, 2009, 2010, 2011  Free Software Foundation, Inc.
 
 % This file is part of GNU Emacs.
 
diff --git a/etc/refcards/pl-refcard.tex b/etc/refcards/pl-refcard.tex
index cded3166524..500689aa852 100644
--- a/etc/refcards/pl-refcard.tex
+++ b/etc/refcards/pl-refcard.tex
@@ -2,7 +2,7 @@
 % Reference Card for GNU Emacs
 
 % Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-%   2009, 2010  Free Software Foundation, Inc.
+%   2009, 2010, 2011  Free Software Foundation, Inc.
 
 % Author: Stephen Gildea <gildea@stop.mail-abuse.org>
 % Polish translation: W{\l}odek Bzyl <matwb@univ.gda.pl>
@@ -71,7 +71,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 +994,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..76c1c37caa2 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,
-%   2008, 2009, 2010  Free Software Foundation, Inc.
+%   2008, 2009, 2010, 2011  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..1c56bef2fc7 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,
-%   2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+%   2006, 2007, 2008, 2009, 2010, 2011  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..6030dbb17b6 100644
--- a/etc/refcards/ru-refcard.tex
+++ b/etc/refcards/ru-refcard.tex
@@ -1,5 +1,5 @@
-% Copyright (C) 1997, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-%   2009, 2010  Free Software Foundation, Inc.
+% Copyright (C) 1997, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+%   2010, 2011  Free Software Foundation, Inc.
 
 % Author: Stephen Gildea <gildea@stop.mail-abuse.org>
 % Russian translation: Alex Ott <alexott@gmail.com>
@@ -23,7 +23,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 +524,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..4a2b707403f 100644
--- a/etc/refcards/sk-dired-ref.tex
+++ b/etc/refcards/sk-dired-ref.tex
@@ -1,7 +1,7 @@
 % Reference Card for Dired
 
 % Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-%   2009, 2010  Free Software Foundation, Inc.
+%   2009, 2010, 2011  Free Software Foundation, Inc.
 
 % Author: Evgeny Roubinchtein <eroubinc@u.washington.edu>
 % Czech translation: Pavel Janík <Pavel@Janik.cz>, March 2001
@@ -44,7 +44,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 +407,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..534216734c6 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,
-%   2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+%   2006, 2007, 2008, 2009, 2010, 2011  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..b59ba833b94 100644
--- a/etc/refcards/sk-survival.tex
+++ b/etc/refcards/sk-survival.tex
@@ -1,7 +1,7 @@
 % Title:  GNU Emacs Survival Card
 
 % Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-%   2009, 2010  Free Software Foundation, Inc.
+%   2009, 2010, 2011  Free Software Foundation, Inc.
 
 % Author: Wlodek Bzyl <matwb@univ.gda.pl>
 % Czech translation: Pavel Janík <Pavel@Janik.cz>, March 2001
@@ -57,7 +57,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 +419,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..2d2bff576f2 100644
--- a/etc/refcards/survival.tex
+++ b/etc/refcards/survival.tex
@@ -2,7 +2,7 @@
 % Title:  GNU Emacs Survival Card
 
 % Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-%   2009, 2010  Free Software Foundation, Inc.
+%   2009, 2010, 2011  Free Software Foundation, Inc.
 
 % Author: Wlodek Bzyl <matwb@univ.gda.pl>
 
@@ -46,7 +46,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 +412,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..bd3beb71d35 100644
--- a/etc/refcards/vipcard.tex
+++ b/etc/refcards/vipcard.tex
@@ -1,7 +1,7 @@
 % Quick Reference Card for VIP
 
 % Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-%   2009, 2010  Free Software Foundation, Inc.
+%   2009, 2010, 2011  Free Software Foundation, Inc.
 
 % Author: Masahiko Sato <ms@sail.stanford.edu>, <masahiko@sato.riec.tohoku.junet>
 
@@ -51,7 +51,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 +680,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..d403d9d2615 100644
--- a/etc/refcards/viperCard.tex
+++ b/etc/refcards/viperCard.tex
@@ -1,7 +1,7 @@
 % ViperCard -- The Reference Card for Viper under GNU Emacs and XEmacs
 
 % Copyright (C) 1995, 1996, 1997, 2001, 2002, 2003, 2004, 2005, 2006,
-%   2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+%   2007, 2008, 2009, 2010, 2011  Free Software Foundation, Inc.
 
 % Author: Michael Kifer <kifer@cs.sunysb.edu> (Viper)
 %	Aamod Sane <sane@cs.uiuc.edu> (VIP 4.3)
@@ -54,7 +54,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 +741,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