aboutsummaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorKenichi Handa2012-09-22 11:26:05 +0900
committerKenichi Handa2012-09-22 11:26:05 +0900
commitfa42927fd0ed023ec95a5475ce342429fd8a348d (patch)
tree5f37f88faa47b36dc85d19aedf89f483dc458358 /etc
parent3cccbd87267735609a21df50b80b3aad07004555 (diff)
parent58f3a196fcd6c2f8b65e6b6cf1bc377d1a6287aa (diff)
downloademacs-fa42927fd0ed023ec95a5475ce342429fd8a348d.tar.gz
emacs-fa42927fd0ed023ec95a5475ce342429fd8a348d.zip
merge trunk
Diffstat (limited to 'etc')
-rw-r--r--etc/ChangeLog26
-rw-r--r--etc/NEWS25
-rw-r--r--etc/TODO7
-rw-r--r--etc/refcards/Makefile27
-rw-r--r--etc/refcards/calccard.tex5
-rw-r--r--etc/refcards/cs-dired-ref.tex3
-rw-r--r--etc/refcards/cs-refcard.tex3
-rw-r--r--etc/refcards/cs-survival.tex3
-rw-r--r--etc/refcards/de-refcard.tex3
-rw-r--r--etc/refcards/dired-ref.tex3
-rw-r--r--etc/refcards/emacsver.tex4
-rw-r--r--etc/refcards/fr-dired-ref.tex3
-rw-r--r--etc/refcards/fr-refcard.tex3
-rw-r--r--etc/refcards/fr-survival.tex3
-rw-r--r--etc/refcards/orgcard.tex2
-rw-r--r--etc/refcards/pl-refcard.tex3
-rw-r--r--etc/refcards/pt-br-refcard.tex3
-rw-r--r--etc/refcards/refcard.tex3
-rw-r--r--etc/refcards/sk-dired-ref.tex3
-rw-r--r--etc/refcards/sk-refcard.tex3
-rw-r--r--etc/refcards/sk-survival.tex3
-rw-r--r--etc/refcards/survival.tex3
-rw-r--r--etc/refcards/vipcard.tex2
-rw-r--r--etc/refcards/viperCard.tex2
24 files changed, 87 insertions, 58 deletions
diff --git a/etc/ChangeLog b/etc/ChangeLog
index 66c229eaf78..6f2b178fcd7 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,29 @@
12012-09-17 Glenn Morris <rgm@gnu.org>
2
3 * refcards/emacsver.tex: New file.
4 * refcards/calccard.tex, refcards/cs-dired-ref.tex:
5 * refcards/cs-refcard.tex, refcards/cs-survival.tex:
6 * refcards/de-refcard.tex, refcards/dired-ref.tex:
7 * refcards/emacsver.tex, refcards/fr-dired-ref.tex:
8 * refcards/fr-refcard.tex, refcards/fr-survival.tex:
9 * refcards/orgcard.tex, refcards/pl-refcard.tex:
10 * refcards/pt-br-refcard.tex, refcards/refcard.tex:
11 * refcards/sk-dired-ref.tex, refcards/sk-refcard.tex:
12 * refcards/sk-survival.tex, refcards/survival.tex:
13 * refcards/vipcard.tex, refcards/viperCard.tex: Include emacsver.tex.
14 * refcards/calccard.tex (\emacsversionnumber):
15 Rename to \versionemacs, same as all the other refcards.
16 * refcards/Makefile (ENVADD): New variable.
17 (sk-dired-ref.pdf, sk-survival.pdf, pl-refcard.pdf)
18 (%.pdf, %,dvi, sk-dired-ref.dvi, sk-survival.dvi, pl-refcard.dvi):
19 Depend on emacsver.tex. Add "." to TEXINPUTS for TeX commands.
20
212012-09-16 Paul Eggert <eggert@cs.ucla.edu>
22
23 Remove configure's --without-sync-input option (Bug#12450).
24 * TODO (Make SYNC_INPUT the default): Remove, as the code now
25 behaves as if SYNC_INPUT is always true.
26
12012-09-13 Paul Eggert <eggert@cs.ucla.edu> 272012-09-13 Paul Eggert <eggert@cs.ucla.edu>
2 28
3 Use a more backwards-compatible timer format (Bug#12430). 29 Use a more backwards-compatible timer format (Bug#12430).
diff --git a/etc/NEWS b/etc/NEWS
index 3344158b73c..ccd8a6fe35b 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -419,6 +419,8 @@ the experience for Sphinx users.
419 419
420*** Package version in `rst-version'. 420*** Package version in `rst-version'.
421 421
422*** Support `imenu' and `which-func'.
423
422** New `derived-mode' filter for Ibuffer, bound to `/ M'. 424** New `derived-mode' filter for Ibuffer, bound to `/ M'.
423`/ m' is now bound to filter by used-mode, which used to be bound to `/ M'. 425`/ m' is now bound to filter by used-mode, which used to be bound to `/ M'.
424 426
@@ -439,6 +441,9 @@ Use `Buffer-menu-name-width' and `Buffer-menu-size-width' instead.
439 441
440** Calendar 442** Calendar
441 443
444*** You can customize the header text that appears above each calendar month.
445See the variable `calendar-month-header'.
446
442*** The calendars produced by cal-html include holidays. 447*** The calendars produced by cal-html include holidays.
443Customize cal-html-holidays to change this. 448Customize cal-html-holidays to change this.
444 449
@@ -459,9 +464,17 @@ channel keys found, if any.
459if the command ends in `;' (when operating on multiple files). 464if the command ends in `;' (when operating on multiple files).
460Otherwise, it executes the command on each file in parallel. 465Otherwise, it executes the command on each file in parallel.
461 466
467*** Typing M-n in the minibuffer of `dired-do-chmod', `dired-do-chgrp',
468`dired-do-chown', `dired-do-touch' pulls the file attributes of the
469file at point.
470
471*** When the region is active, `m' (`dired-mark'), `u' (`dired-unmark'),
472`DEL' (`dired-unmark-backward'), `d' (`dired-flag-file-deletion')
473mark/unmark/flag all files in the active region.
474
462*** The minibuffer default for `=' (`dired-diff) has changed. 475*** The minibuffer default for `=' (`dired-diff) has changed.
463It is now the backup file for the file at point, if one exists, rather 476It is now the backup file for the file at point, if one exists.
464than the file at the mark. 477In Transient Mark mode the default is the file at the active mark.
465 478
466*** `M-=' is no longer bound to `dired-backup-diff' in Dired buffers. 479*** `M-=' is no longer bound to `dired-backup-diff' in Dired buffers.
467The global binding for `M-=', `count-words-region' is in effect. 480The global binding for `M-=', `count-words-region' is in effect.
@@ -737,6 +750,14 @@ in Emacs 24.1:
737**** `special-display-function' 750**** `special-display-function'
738**** `display-buffer-function' 751**** `display-buffer-function'
739 752
753** Minibuffer
754
755*** `read-regexp' has a new argument HISTORY; the first argument PROMPT
756of `read-regexp' accepts a string ending with a colon and space, and its
757second argument DEFAULTS can be a list of strings accessible via M-n
758in the minibuffer ahead of other hard-coded useful regexp-related values.
759More commands use `read-regexp' now to read their regexp arguments.
760
740** Completion 761** Completion
741 762
742*** New function `completion-table-with-quoting' to handle completion 763*** New function `completion-table-with-quoting' to handle completion
diff --git a/etc/TODO b/etc/TODO
index 50e3bd64b9d..be0ef95aed2 100644
--- a/etc/TODO
+++ b/etc/TODO
@@ -1229,13 +1229,6 @@ systems for HTML/XML files automatically."
1229 For use by sml-mode, python-mode, tex-mode, scheme-mode, lisp-mode, 1229 For use by sml-mode, python-mode, tex-mode, scheme-mode, lisp-mode,
1230 haskell-mode, tuareg-mode, ... 1230 haskell-mode, tuareg-mode, ...
1231 1231
1232** Make SYNC_INPUT the default. [true since 2008-03-11]
1233 All loops using immediate_quit need to be checked to ensure that
1234 C-g can interrupt them, in case of an infinite loop. Once we
1235 switch to using SYNC_INPUT, we can remove the BLOCK_INPUTs in the
1236 allocation functions (allocate_string etc.) without worrying about
1237 data munging.
1238
1239** Add "link" button class 1232** Add "link" button class
1240 Add a standard button-class named "link", and make all other link-like 1233 Add a standard button-class named "link", and make all other link-like
1241 button classes inherit from it. Set the default face of the "link" button 1234 button classes inherit from it. Set the default face of the "link" button
diff --git a/etc/refcards/Makefile b/etc/refcards/Makefile
index 64e2d8638f8..ef810da6022 100644
--- a/etc/refcards/Makefile
+++ b/etc/refcards/Makefile
@@ -47,26 +47,27 @@ VIPER_CARDS_PDF = vipcard.pdf viperCard.pdf
47viper-cards_pdf: ${VIPER_CARDS_PDF} 47viper-cards_pdf: ${VIPER_CARDS_PDF}
48viper-cards_ps: ${VIPER_CARDS_PDF:.pdf=.ps} 48viper-cards_ps: ${VIPER_CARDS_PDF:.pdf=.ps}
49 49
50ENVADD = TEXINPUTS=".:"
50 51
51## PDF files. 52## PDF files.
52 53
53## The page layouts (a4/letter) are written directly in the .tex files. 54## The page layouts (a4/letter) are written directly in the .tex files.
54 55
55cs-refcard.pdf cs-dired-ref.pdf cs-survival.pdf sk-refcard.pdf \ 56cs-refcard.pdf cs-dired-ref.pdf cs-survival.pdf sk-refcard.pdf \
56sk-dired-ref.pdf sk-survival.pdf: %.pdf: %.tex 57sk-dired-ref.pdf sk-survival.pdf: %.pdf: %.tex emacsver.tex
57 if pdfcsplain --version > /dev/null 2> /dev/null; then \ 58 if pdfcsplain --version > /dev/null 2> /dev/null; then \
58 pdfcsplain $<; \ 59 ${ENVADD} pdfcsplain $<; \
59 else \ 60 else \
60 csplain "\pdfoutput=1\input $<"; \ 61 ${ENVADD} csplain "\pdfoutput=1\input $<"; \
61 fi 62 fi
62 63
63## Some versions of pdfmex seem to create dvi by default, hence output-format. 64## Some versions of pdfmex seem to create dvi by default, hence output-format.
64pl-refcard.pdf: %.pdf: %.tex 65pl-refcard.pdf: %.pdf: %.tex emacsver.tex
65 if ! kpsewhich -format=fmt mex > /dev/null && \ 66 if ! kpsewhich -format=fmt mex > /dev/null && \
66 ! pdfmex --version > /dev/null 2> /dev/null; then \ 67 ! pdfmex --version > /dev/null 2> /dev/null; then \
67 echo "No mex format found."; false; \ 68 echo "No mex format found."; false; \
68 fi 69 fi
69 pdftex -output-format=pdf $< 70 ${ENVADD} pdftex -output-format=pdf $<
70 71
71ru-refcard.pdf: %.pdf: %.tex 72ru-refcard.pdf: %.pdf: %.tex
72 pdflatex $< 73 pdflatex $<
@@ -81,21 +82,21 @@ gnus-booklet.pdf: gnus-refcard.tex gnus-logo.pdf
81 pdflatex -jobname=gnus-booklet '\def\booklettrue{}\def\letterpapertrue{}\input{gnus-refcard}' 82 pdflatex -jobname=gnus-booklet '\def\booklettrue{}\def\letterpapertrue{}\input{gnus-refcard}'
82 83
83## Everything not explicitly listed above. 84## Everything not explicitly listed above.
84%.pdf: %.tex 85%.pdf: %.tex emacsver.tex
85 pdftex $< 86 ${ENVADD} pdftex $<
86 87
87 88
88## dvi files. 89## dvi files.
89 90
90cs-refcard.dvi cs-dired-ref.dvi cs-survival.dvi sk-refcard.dvi \ 91cs-refcard.dvi cs-dired-ref.dvi cs-survival.dvi sk-refcard.dvi \
91sk-dired-ref.dvi sk-survival.dvi: %.dvi: %.tex 92sk-dired-ref.dvi sk-survival.dvi: %.dvi: %.tex emacsver.tex
92 csplain $< 93 ${ENVADD} csplain $<
93 94
94pl-refcard.dvi: %.dvi: %.tex 95pl-refcard.dvi: %.dvi: %.tex emacsver.tex
95 if ! kpsewhich -format=fmt mex > /dev/null; then \ 96 if ! kpsewhich -format=fmt mex > /dev/null; then \
96 echo "No mex format found."; false; \ 97 echo "No mex format found."; false; \
97 fi 98 fi
98 tex $< 99 ${ENVADD} tex $<
99 100
100ru-refcard.dvi gnus-refcard.dvi: %.dvi: %.tex 101ru-refcard.dvi gnus-refcard.dvi: %.dvi: %.tex
101 latex $< 102 latex $<
@@ -105,8 +106,8 @@ gnus-booklet.dvi: gnus-refcard.tex
105 mv gnus-refcard.dvi $@ 106 mv gnus-refcard.dvi $@
106 107
107## Everything not explicitly listed above. 108## Everything not explicitly listed above.
108%.dvi: %.tex 109%.dvi: %.tex emacsver.tex
109 tex $< 110 ${ENVADD} tex $<
110 111
111 112
112## PostScript files. 113## PostScript files.
diff --git a/etc/refcards/calccard.tex b/etc/refcards/calccard.tex
index fd3d45b8da4..04c88befeea 100644
--- a/etc/refcards/calccard.tex
+++ b/etc/refcards/calccard.tex
@@ -63,8 +63,7 @@
63% UUCP: mit-erl!gildea 63% UUCP: mit-erl!gildea
64% Internet: gildea@stop.mail-abuse.org 64% Internet: gildea@stop.mail-abuse.org
65 65
66\def\emacsversionnumber{24} 66\input emacsver.tex
67\def\year{2012} % latest copyright year
68 67
69\def\shortcopyrightnotice{\vskip 1ex plus 2 fill 68\def\shortcopyrightnotice{\vskip 1ex plus 2 fill
70 \centerline{\small \copyright\ \year\ Free Software Foundation, Inc. 69 \centerline{\small \copyright\ \year\ Free Software Foundation, Inc.
@@ -276,7 +275,7 @@ are preserved on all copies.
276 275
277\title{GNU Calc Reference Card} 276\title{GNU Calc Reference Card}
278 277
279\centerline{(for GNU Emacs version \emacsversionnumber)} 278\centerline{(for GNU Emacs version \versionemacs)}
280 279
281\section{Starting and Stopping} 280\section{Starting and Stopping}
282 281
diff --git a/etc/refcards/cs-dired-ref.tex b/etc/refcards/cs-dired-ref.tex
index ee7acaf416d..45867e11d44 100644
--- a/etc/refcards/cs-dired-ref.tex
+++ b/etc/refcards/cs-dired-ref.tex
@@ -41,8 +41,7 @@
41\input pdflayout.sty 41\input pdflayout.sty
42\pdflayout=(0) 42\pdflayout=(0)
43 43
44\def\versionemacs{24} % version of Emacs this is for 44\input emacsver.tex
45\def\year{2012} % latest copyright year
46 45
47% Nothing else needs to be changed. 46% Nothing else needs to be changed.
48 47
diff --git a/etc/refcards/cs-refcard.tex b/etc/refcards/cs-refcard.tex
index d17e5c6ddeb..98842dd08e0 100644
--- a/etc/refcards/cs-refcard.tex
+++ b/etc/refcards/cs-refcard.tex
@@ -59,8 +59,7 @@
59\input pdflayout.sty 59\input pdflayout.sty
60\pdflayout=(0) 60\pdflayout=(0)
61 61
62\def\versionemacs{24} % version of Emacs this is for 62\input emacsver.tex
63\def\year{2012} % latest copyright year
64 63
65% Nothing else needs to be changed. 64% Nothing else needs to be changed.
66 65
diff --git a/etc/refcards/cs-survival.tex b/etc/refcards/cs-survival.tex
index 5aa111c0297..4050cf0a1ab 100644
--- a/etc/refcards/cs-survival.tex
+++ b/etc/refcards/cs-survival.tex
@@ -54,8 +54,7 @@
54% Czech hyphenation rules applied 54% Czech hyphenation rules applied
55\chyph 55\chyph
56 56
57\def\versionemacs{24} % version of Emacs this is for 57\input emacsver.tex
58\def\year{2012} % latest copyright year
59 58
60\def\copyrightnotice{\penalty-1\vfill 59\def\copyrightnotice{\penalty-1\vfill
61 \vbox{\smallfont\baselineskip=0.8\baselineskip\raggedcenter 60 \vbox{\smallfont\baselineskip=0.8\baselineskip\raggedcenter
diff --git a/etc/refcards/de-refcard.tex b/etc/refcards/de-refcard.tex
index ca3141b8390..906895b358a 100644
--- a/etc/refcards/de-refcard.tex
+++ b/etc/refcards/de-refcard.tex
@@ -60,8 +60,7 @@
60\input german.sty 60\input german.sty
61\mdqoff % deactivates the "-char 61\mdqoff % deactivates the "-char
62 62
63\def\versionemacs{24} % version of Emacs this is for 63\input emacsver.tex
64\def\year{2012} % latest copyright year
65 64
66% Nothing else needs to be changed below this line. 65% Nothing else needs to be changed below this line.
67 66
diff --git a/etc/refcards/dired-ref.tex b/etc/refcards/dired-ref.tex
index 9ccf57682ff..b85bef1ce0b 100644
--- a/etc/refcards/dired-ref.tex
+++ b/etc/refcards/dired-ref.tex
@@ -43,8 +43,7 @@
43\input pdflayout.sty 43\input pdflayout.sty
44\pdflayout=(1) 44\pdflayout=(1)
45 45
46\def\versionemacs{24} % version of Emacs this is for 46\input emacsver.tex
47\def\year{2012} % latest copyright year
48 47
49% Nothing else needs to be changed. 48% Nothing else needs to be changed.
50 49
diff --git a/etc/refcards/emacsver.tex b/etc/refcards/emacsver.tex
new file mode 100644
index 00000000000..620ee8ef9e0
--- /dev/null
+++ b/etc/refcards/emacsver.tex
@@ -0,0 +1,4 @@
1%% This file is not generated by configure, because then the provided
2%% pdf files would always appear out-of-date.
3\def\versionemacs{24} % major version of emacs
4\def\year{2012} % latest copyright year
diff --git a/etc/refcards/fr-dired-ref.tex b/etc/refcards/fr-dired-ref.tex
index 2819bbaa25b..457ee2db472 100644
--- a/etc/refcards/fr-dired-ref.tex
+++ b/etc/refcards/fr-dired-ref.tex
@@ -35,8 +35,7 @@
35\input pdflayout.sty 35\input pdflayout.sty
36\pdflayout=(0) 36\pdflayout=(0)
37 37
38\def\versionemacs{24} % version of Emacs this is for 38\input emacsver.tex
39\def\year{2012} % latest copyright year
40 39
41% Nothing else needs to be changed. 40% Nothing else needs to be changed.
42 41
diff --git a/etc/refcards/fr-refcard.tex b/etc/refcards/fr-refcard.tex
index ed82f00a85d..4fe94d79075 100644
--- a/etc/refcards/fr-refcard.tex
+++ b/etc/refcards/fr-refcard.tex
@@ -56,8 +56,7 @@
56\input pdflayout.sty 56\input pdflayout.sty
57\pdflayout=(0l) 57\pdflayout=(0l)
58 58
59\def\versionemacs{24} % version of Emacs this is for 59\input emacsver.tex
60\def\year{2012} % latest copyright year
61 60
62% Nothing else needs to be changed below this line. 61% Nothing else needs to be changed below this line.
63 62
diff --git a/etc/refcards/fr-survival.tex b/etc/refcards/fr-survival.tex
index 1cd9cc4cf05..16d67f6b1cd 100644
--- a/etc/refcards/fr-survival.tex
+++ b/etc/refcards/fr-survival.tex
@@ -49,8 +49,7 @@
49\input pdflayout.sty 49\input pdflayout.sty
50\pdflayout=(0) 50\pdflayout=(0)
51 51
52\def\versionemacs{24} % version of Emacs this is for 52\input emacsver.tex
53\def\year{2012} % latest copyright year
54 53
55\def\copyrightnotice{\penalty-1\vfill 54\def\copyrightnotice{\penalty-1\vfill
56 \vbox{\smallfont\baselineskip=0.8\baselineskip\raggedcenter 55 \vbox{\smallfont\baselineskip=0.8\baselineskip\raggedcenter
diff --git a/etc/refcards/orgcard.tex b/etc/refcards/orgcard.tex
index 3c0584d6db4..60e81f36d3e 100644
--- a/etc/refcards/orgcard.tex
+++ b/etc/refcards/orgcard.tex
@@ -1,7 +1,7 @@
1% Reference Card for Org Mode 1% Reference Card for Org Mode
2\def\orgversionnumber{7.8.11} 2\def\orgversionnumber{7.8.11}
3\def\versionyear{2012} % latest update 3\def\versionyear{2012} % latest update
4\def\year{2012} % latest copyright year 4\input emacsver.tex
5 5
6%**start of header 6%**start of header
7\newcount\columnsperpage 7\newcount\columnsperpage
diff --git a/etc/refcards/pl-refcard.tex b/etc/refcards/pl-refcard.tex
index 9cc6fc6a6cd..db814cfa8c2 100644
--- a/etc/refcards/pl-refcard.tex
+++ b/etc/refcards/pl-refcard.tex
@@ -69,8 +69,7 @@
69\input pdflayout.sty 69\input pdflayout.sty
70\pdflayout=(0) 70\pdflayout=(0)
71 71
72\def\versionemacs{24} % version of Emacs this is for 72\input emacsver.tex
73\def\year{2012} % latest copyright year
74 73
75% Nothing else needs to be changed. 74% Nothing else needs to be changed.
76 75
diff --git a/etc/refcards/pt-br-refcard.tex b/etc/refcards/pt-br-refcard.tex
index c16d5096f30..d3fbe54ce87 100644
--- a/etc/refcards/pt-br-refcard.tex
+++ b/etc/refcards/pt-br-refcard.tex
@@ -62,8 +62,7 @@
62\input pdflayout.sty 62\input pdflayout.sty
63\pdflayout=(0l) 63\pdflayout=(0l)
64 64
65\def\versionemacs{24} % version of Emacs this is for 65\input emacsver.tex
66\def\year{2012} % latest copyright year
67 66
68% Nothing else needs to be changed below this line. 67% Nothing else needs to be changed below this line.
69 68
diff --git a/etc/refcards/refcard.tex b/etc/refcards/refcard.tex
index 70788e8c67b..6ca9856085d 100644
--- a/etc/refcards/refcard.tex
+++ b/etc/refcards/refcard.tex
@@ -63,8 +63,7 @@
63 63
64% Nothing else needs to be changed below this line. 64% Nothing else needs to be changed below this line.
65 65
66\def\versionemacs{24} % version of Emacs this is for 66\input emacsver.tex
67\def\year{2012} % copyright year
68 67
69\def\shortcopyrightnotice{\vskip 1ex plus 2 fill 68\def\shortcopyrightnotice{\vskip 1ex plus 2 fill
70 \centerline{\small \copyright\ \year\ Free Software Foundation, Inc. 69 \centerline{\small \copyright\ \year\ Free Software Foundation, Inc.
diff --git a/etc/refcards/sk-dired-ref.tex b/etc/refcards/sk-dired-ref.tex
index 4b12b0b42eb..50d17409072 100644
--- a/etc/refcards/sk-dired-ref.tex
+++ b/etc/refcards/sk-dired-ref.tex
@@ -42,8 +42,7 @@
42\input pdflayout.sty 42\input pdflayout.sty
43\pdflayout=(0) 43\pdflayout=(0)
44 44
45\def\versionemacs{24} % version of Emacs this is for 45\input emacsver.tex
46\def\year{2012} % latest copyright year
47 46
48% Nothing else needs to be changed. 47% Nothing else needs to be changed.
49 48
diff --git a/etc/refcards/sk-refcard.tex b/etc/refcards/sk-refcard.tex
index 5105e8ca986..e617387fad1 100644
--- a/etc/refcards/sk-refcard.tex
+++ b/etc/refcards/sk-refcard.tex
@@ -60,8 +60,7 @@
60\input pdflayout.sty 60\input pdflayout.sty
61\pdflayout=(0) 61\pdflayout=(0)
62 62
63\def\versionemacs{24} % version of Emacs this is for 63\input emacsver.tex
64\def\year{2012} % latest copyright year
65 64
66% Nothing else needs to be changed. 65% Nothing else needs to be changed.
67 66
diff --git a/etc/refcards/sk-survival.tex b/etc/refcards/sk-survival.tex
index 7597c63f5c7..2e7ac9b9298 100644
--- a/etc/refcards/sk-survival.tex
+++ b/etc/refcards/sk-survival.tex
@@ -55,8 +55,7 @@
55% Slovak hyphenation rules applied 55% Slovak hyphenation rules applied
56\shyph 56\shyph
57 57
58\def\versionemacs{24} % version of Emacs this is for 58\input emacsver.tex
59\def\year{2012} % latest copyright year
60 59
61\def\copyrightnotice{\penalty-1\vfill 60\def\copyrightnotice{\penalty-1\vfill
62 \vbox{\smallfont\baselineskip=0.8\baselineskip\raggedcenter 61 \vbox{\smallfont\baselineskip=0.8\baselineskip\raggedcenter
diff --git a/etc/refcards/survival.tex b/etc/refcards/survival.tex
index 92d178a130a..09151e9801c 100644
--- a/etc/refcards/survival.tex
+++ b/etc/refcards/survival.tex
@@ -44,8 +44,7 @@
44\input pdflayout.sty 44\input pdflayout.sty
45\pdflayout=(1) 45\pdflayout=(1)
46 46
47\def\versionemacs{24} % version of Emacs this is for 47\input emacsver.tex
48\def\year{2012} % latest copyright year
49 48
50\def\copyrightnotice{\penalty-1\vfill 49\def\copyrightnotice{\penalty-1\vfill
51 \vbox{\smallfont\baselineskip=0.8\baselineskip\raggedcenter 50 \vbox{\smallfont\baselineskip=0.8\baselineskip\raggedcenter
diff --git a/etc/refcards/vipcard.tex b/etc/refcards/vipcard.tex
index 13b43dbab73..2a709dc79f2 100644
--- a/etc/refcards/vipcard.tex
+++ b/etc/refcards/vipcard.tex
@@ -49,8 +49,8 @@
49\input pdflayout.sty 49\input pdflayout.sty
50\pdflayout=(1) 50\pdflayout=(1)
51 51
52\input emacsver.tex
52\def\versionemacs{18} % version of Emacs this is for 53\def\versionemacs{18} % version of Emacs this is for
53\def\year{2012} % latest copyright year
54\def\versionvip{3.5} 54\def\versionvip{3.5}
55 55
56% Nothing else needs to be changed. 56% Nothing else needs to be changed.
diff --git a/etc/refcards/viperCard.tex b/etc/refcards/viperCard.tex
index a8694dd3bed..c6ab31cdb83 100644
--- a/etc/refcards/viperCard.tex
+++ b/etc/refcards/viperCard.tex
@@ -52,8 +52,8 @@
52\input pdflayout.sty 52\input pdflayout.sty
53\pdflayout=(1) 53\pdflayout=(1)
54 54
55\input emacsver.tex
55\def\versionemacs{21} % version of Emacs this is for 56\def\versionemacs{21} % version of Emacs this is for
56\def\year{2012} % latest copyright year
57\def\versionxemacs{20} % version of XEmacs this is for 57\def\versionxemacs{20} % version of XEmacs this is for
58\def\versionviper{3.0} % version of Viper this is for 58\def\versionviper{3.0} % version of Viper this is for
59 59