Merge from trunk

24 files changed, 196 insertions, 62 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index f3f244c7e39..6f2b178fcd7 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,52 @@
+2012-09-17  Glenn Morris  <rgm@gnu.org>
+
+        * refcards/emacsver.tex: New file.
+        * 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/emacsver.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/sk-dired-ref.tex, refcards/sk-refcard.tex:
+        * refcards/sk-survival.tex, refcards/survival.tex:
+        * refcards/vipcard.tex, refcards/viperCard.tex: Include emacsver.tex.
+        * refcards/calccard.tex (\emacsversionnumber):
+        Rename to \versionemacs, same as all the other refcards.
+        * refcards/Makefile (ENVADD): New variable.
+        (sk-dired-ref.pdf, sk-survival.pdf, pl-refcard.pdf)
+        (%.pdf, %,dvi, sk-dired-ref.dvi, sk-survival.dvi, pl-refcard.dvi):
+        Depend on emacsver.tex.  Add "." to TEXINPUTS for TeX commands.
+
+2012-09-16  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Remove configure's --without-sync-input option (Bug#12450).
+        * TODO (Make SYNC_INPUT the default): Remove, as the code now
+        behaves as if SYNC_INPUT is always true.
+
+2012-09-13  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Use a more backwards-compatible timer format (Bug#12430).
+        * NEWS: Document it, plus fix a typo.
+
+2012-09-13  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * NEWS (--with-x-toolkit): Mention that Gtk+ 3 is now default.
+
+2012-09-13  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * NEWS: Document timer format change (Bug#12430).
+
+2012-09-11  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Simplify, document, and port floating-point (Bug#12381).
+        * NEWS: Document NaNs versus signaling-error change.
+
+2012-09-04  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Give more-useful info on a fatal error (Bug#12328).
+        * NEWS: Document the change.
+
 2012-09-01  Paul Eggert  <eggert@cs.ucla.edu>
 
         Better seeds for (random).
diff --git a/etc/NEWS b/etc/NEWS
index 45966e53882..3344158b73c 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -65,6 +65,14 @@ renamed to '--enable-check-lisp-object-type', as the resulting
 Lisp_Object type no longer uses a union to implement the compile time
 check that this option enables.
 
+---
+** The default toolkit has been changed to Gtk+ version 3.
+If you don't pass --with-x-toolkit to configure or if you pass
+--with-x-toolkit=gtk or --with-x-toolkit=yes, configure will try to build
+with Gtk+ version 3, and if that fails, try Gtk+ version 2.
+You can explicitly require a specific version by passing
+--with-x-toolkit=gtk2 or --with-x-toolkit=gtk3 to configure.
+
 
 * Startup Changes in Emacs 24.3
 
@@ -78,6 +86,10 @@ been adding them there, put them somewhere else, eg site-lisp.
 
 * Changes in Emacs 24.3
 
+** You can now scroll the selected window in most y-or-n prompts.
+Typing C-v or M-v at a prompt scrolls forward or backward
+respectively, without leaving the y-or-n prompt.
+
 ** Help changes
 
 *** `C-h f' (describe-function) can now perform autoloading.
@@ -97,6 +109,16 @@ machines.  Other functions that use this format, such as
 file-attributes and format-time-string, have been changed accordingly.
 Old-format time stamps are still accepted.
 
+** The format of timers in timer-list and timer-idle-list is now
+[TRIGGERED-P HI-SECS LO-SECS USECS REPEAT-DELAY FUNCTION ARGS IDLE-DELAY PSECS].
+The PSECS slot is new, and uses picosecond resolution.  It can be
+accessed via the new timer--psecs accessor.
+
+** Emacs now generates backtraces on fatal errors.
+On encountering a fatal error, Emacs now outputs a textual description
+of the fatal signal, and a short backtrace on platforms like glibc
+that support backtraces.
+
 ** New functions `system-users', `system-groups' return lists of the user
 name, group names known to the system (where possible).
 
@@ -177,6 +199,14 @@ just removing them, as done by `yank-excluded-properties'.
 delete-trailing-whitespace command should delete trailing lines at the
 end of the buffer.  It defaults to t.
 
++++
+** `C-x r +' is now overloaded to invoke `append-to-register.
+
++++
+** New option `register-separator' specifies the register containing
+the text to put between collected texts for use with M-x
+append-to-register and M-x prepend-to-register.
+
 ** Search changes
 
 *** Global `M-s _' starts a symbol (identifier) incremental search,
@@ -192,6 +222,13 @@ of one or more whitespace characters defined by the variable
 `isearch-lax-whitespace'.  In regexp incremental search, it toggles
 the value of the variable `isearch-regexp-lax-whitespace'.
 
+** query-replace changes
+
+*** When new option `replace-lax-whitespace' is non-nil,
+and you enter a space or spaces in the strings or regexps
+to be replaced, `query-replace' will match any sequence matched
+by the regexp `search-whitespace-regexp'.
+
 ** M-x move-to-column, if called interactively with no prefix arg, now
 prompts for a column number.
 
@@ -320,6 +357,14 @@ python-describe-symbol    | python-eldoc-at-point
 
 *** Accepts \r and \f as whitespace.
 
+** SQL Mode
+
+*** DB2 added `sql-db2-escape-newlines'
+
+If non-nil, newlines sent to the command interpreter will be escaped
+by a backslash.  The default does not escape the newlines and assumes
+that the sql statement will be terminated by a semicolon.
+
 ** Diff mode
 
 Faces for changes now use the same diff color scheme as in modern VCSes
@@ -331,6 +376,9 @@ The variable `diff-use-changed-face' defines whether to use
 the face `diff-changed', or `diff-removed' and `diff-added'
 to highlight changes in context diffs.
 
+*** The new command `diff-remove-trailing-whitespace' fixes trailing
+whitespace problems introduced by the diff.
+
 ** Ediff now uses the same color scheme as Diff mode
 on high color displays.
 
@@ -411,6 +459,13 @@ channel keys found, if any.
 if the command ends in `;' (when operating on multiple files).
 Otherwise, it executes the command on each file in parallel.
 
+*** The minibuffer default for `=' (`dired-diff) has changed.
+It is now the backup file for the file at point, if one exists, rather
+than the file at the mark.
+
+*** `M-=' is no longer bound to `dired-backup-diff' in Dired buffers.
+The global binding for `M-=', `count-words-region' is in effect.
+
 ** Shell
 
 *** New option `async-shell-command-buffer' specifies what buffer to use
@@ -596,11 +651,18 @@ are deprecated and will be removed eventually.
 
 *** `facemenu-unlisted-faces'
 *** `rmail-decode-mime-charset'
-*** `last-input-char' and `last-command-char'
+*** `last-input-char', `last-command-char', `unread-command-char'.
 
 
 * Lisp changes in Emacs 24.3
 
+** Interpreted files get eagerly macro-expanded during load.
+This can significantly speed up execution of non-byte-compiled code, but can
+also bump into harmless and previously unnoticed cyclic dependencies.
+These should not be fatal: they will simply cause the macro-calls to be left
+for later expansion (as before), but will also result in a warning describing
+the cycle.
+
 ** New minor mode `read-only-mode' to replace toggle-read-only (now obsolete).
 
 ** New functions `autoloadp' and `autoload-do-load'.
@@ -626,26 +688,54 @@ The interpretation of the DECLS is determined by `defun-declarations-alist'.
 
 ** New error type and new function `user-error'.  Doesn't trigger the debugger.
 
+** Debugger
+*** New option `debugger-bury-or-kill'.
+
+*** Set `debug-on-message' to enter the debugger when a certain
+message is displayed in the echo area.  This can be useful when trying
+to work out which code is doing something.
+
+*** New var `inhibit-debugger', automatically set to prevent accidental
+recursive invocations.
+
++++
+** New utility function `buffer-narrowed-p'.
+
 ** Window changes
 
 *** The functions get-lru-window, get-mru-window and get-largest-window
 now accept a third argument to avoid choosing the selected window.
 
-*** New display action alist `inhibit-switch-frame', if non-nil, tells
-display action functions to avoid changing which frame is selected.
+*** New macro `with-temp-buffer-window'.
+
+*** New option `temp-buffer-resize-frames'.
+
+*** New function `fit-frame-to-buffer' and new option
+    `fit-frame-to-buffer-bottom-margin'.
 
-*** New display action alist `pop-up-frame-parameters', if non-nil,
-specifies frame parameters to give any newly-created frame.
+*** New display action functions `display-buffer-below-selected' and
+`display-buffer-in-previous-window'.
+
+*** New display action alist entry `inhibit-switch-frame', if non-nil,
+tells display action functions to avoid changing which frame is
+selected.
+
+*** New display action alist entry `pop-up-frame-parameters', if
+non-nil, specifies frame parameters to give any newly-created frame.
+
+*** New display action alist entry `previous-window', if non-nil,
+specifies window to reuse in `display-buffer-in-previous-window'.
 
 *** The following variables are obsolete, as they can be replaced by
 appropriate entries in the `display-buffer-alist' function introduced
 in Emacs 24.1:
-
++++
 **** `display-buffer-reuse-frames'
 **** `special-display-regexps'
 **** `special-display-frame-alist'
 **** `special-display-buffer-names'
 **** `special-display-function'
+**** `display-buffer-function'
 
 ** Completion
 
@@ -661,12 +751,21 @@ table, but with a different prefix.
 must be in the range 1000..9999.  It now works with any year supported
 by the underlying C implementation.
 
+** Floating point
+
+*** When floating point functions such as `log' are given invalid
+arguments, e.g., (log -1.0), they now uniformly return special values
+such as NaNs instead of signaling errors.  Previously, these functions
+returned NaNs on some platforms but signaled errors on others.  The affected
+functions are acos, asin, tan, exp, expt, log, log10, sqrt, and mod.
+
 ** New function file-name-base.
 
 ** New function `tty-top-frame' returns the topmost frame of a text terminal.
 
 ** `automount-dir-prefix' is obsolete.
 ** `buffer-has-markers-at' is obsolete.
+** `window-system-version' is obsolete.
 
 * Changes in Emacs 24.3 on non-free operating systems
 
@@ -1399,6 +1498,10 @@ If you had that set, you need to put
 
 in your ~/.authinfo file instead.
 
+*** SMTPmail defaults to using the address in the From: header as the
+SMTP MAIL FROM envelope.  To override this, set `mail-envelope-from'
+to the address you wish to use instead.
+
 ** SQL mode
 
 *** New options `sql-port', `sql-connection-alist', `sql-send-terminator',
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."
    For use by sml-mode, python-mode, tex-mode, scheme-mode, lisp-mode,
    haskell-mode, tuareg-mode, ...
 
-** Make SYNC_INPUT the default. [true since 2008-03-11]
-   All loops using immediate_quit need to be checked to ensure that
-   C-g can interrupt them, in case of an infinite loop.  Once we
-   switch to using SYNC_INPUT, we can remove the BLOCK_INPUTs in the
-   allocation functions (allocate_string etc.) without worrying about
-   data munging.
-
 ** Add "link" button class
    Add a standard button-class named "link", and make all other link-like
    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
 viper-cards_pdf: ${VIPER_CARDS_PDF}
 viper-cards_ps: ${VIPER_CARDS_PDF:.pdf=.ps}
 
+ENVADD = TEXINPUTS=".:"
 
 ## PDF files.
 
 ## The page layouts (a4/letter) are written directly in the .tex files.
 
 cs-refcard.pdf cs-dired-ref.pdf cs-survival.pdf sk-refcard.pdf \
-sk-dired-ref.pdf sk-survival.pdf: %.pdf:        %.tex
+sk-dired-ref.pdf sk-survival.pdf: %.pdf: %.tex emacsver.tex
         if pdfcsplain --version > /dev/null 2> /dev/null; then \
-          pdfcsplain $<; \
+          ${ENVADD} pdfcsplain $<; \
         else \
-          csplain "\pdfoutput=1\input $<"; \
+          ${ENVADD} csplain "\pdfoutput=1\input $<"; \
         fi
 
 ## Some versions of pdfmex seem to create dvi by default, hence output-format.
-pl-refcard.pdf: %.pdf: %.tex
+pl-refcard.pdf: %.pdf: %.tex emacsver.tex
         if ! kpsewhich -format=fmt mex > /dev/null && \
           ! pdfmex --version > /dev/null 2> /dev/null; then \
           echo "No mex format found."; false; \
         fi
-        pdftex -output-format=pdf $<
+        ${ENVADD} pdftex -output-format=pdf $<
 
 ru-refcard.pdf: %.pdf: %.tex
         pdflatex $<
@@ -81,21 +82,21 @@ gnus-booklet.pdf: gnus-refcard.tex gnus-logo.pdf
         pdflatex -jobname=gnus-booklet '\def\booklettrue{}\def\letterpapertrue{}\input{gnus-refcard}'
 
 ## Everything not explicitly listed above.
-%.pdf: %.tex
-        pdftex $<
+%.pdf: %.tex emacsver.tex
+        ${ENVADD} pdftex $<
 
 
 ## dvi files.
 
 cs-refcard.dvi cs-dired-ref.dvi cs-survival.dvi sk-refcard.dvi \
-sk-dired-ref.dvi sk-survival.dvi: %.dvi:        %.tex
-        csplain $<
+sk-dired-ref.dvi sk-survival.dvi: %.dvi: %.tex emacsver.tex
+        ${ENVADD} csplain $<
 
-pl-refcard.dvi: %.dvi: %.tex
+pl-refcard.dvi: %.dvi: %.tex emacsver.tex
         if ! kpsewhich -format=fmt mex > /dev/null; then \
           echo "No mex format found."; false; \
         fi
-        tex $<
+        ${ENVADD} tex $<
 
 ru-refcard.dvi gnus-refcard.dvi: %.dvi: %.tex
         latex $<
@@ -105,8 +106,8 @@ gnus-booklet.dvi: gnus-refcard.tex
         mv gnus-refcard.dvi $@
 
 ## Everything not explicitly listed above.
-%.dvi: %.tex
-        tex $<
+%.dvi: %.tex emacsver.tex
+        ${ENVADD} tex $<
 
 
 ## 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 @@
 %  UUCP: mit-erl!gildea
 %  Internet: gildea@stop.mail-abuse.org
 
-\def\emacsversionnumber{24}
-\def\year{2012}                 % latest copyright year
+\input emacsver.tex
 
 \def\shortcopyrightnotice{\vskip 1ex plus 2 fill
   \centerline{\small \copyright\ \year\ Free Software Foundation, Inc.
@@ -276,7 +275,7 @@ are preserved on all copies.
 
 \title{GNU Calc Reference Card}
 
-\centerline{(for GNU Emacs version \emacsversionnumber)}
+\centerline{(for GNU Emacs version \versionemacs)}
 
 \section{Starting and Stopping}
 
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 @@
 \input pdflayout.sty
 \pdflayout=(0)
 
-\def\versionemacs{24}           % version of Emacs this is for
-\def\year{2012}                 % latest copyright year
+\input emacsver.tex
 
 % Nothing else needs to be changed.
 
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 @@
 \input pdflayout.sty
 \pdflayout=(0)
 
-\def\versionemacs{24}           % version of Emacs this is for
-\def\year{2012}                 % latest copyright year
+\input emacsver.tex
 
 % Nothing else needs to be changed.
 
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 @@
 % Czech hyphenation rules applied
 \chyph
 
-\def\versionemacs{24}           % version of Emacs this is for
-\def\year{2012}                 % latest copyright year
+\input emacsver.tex
 
 \def\copyrightnotice{\penalty-1\vfill
   \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 @@
 \input german.sty
 \mdqoff               % deactivates the "-char
 
-\def\versionemacs{24}           % version of Emacs this is for
-\def\year{2012}                 % latest copyright year
+\input emacsver.tex
 
 % Nothing else needs to be changed below this line.
 
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 @@
 \input pdflayout.sty
 \pdflayout=(1)
 
-\def\versionemacs{24}           % version of Emacs this is for
-\def\year{2012}                 % latest copyright year
+\input emacsver.tex
 
 % Nothing else needs to be changed.
 
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 @@
+%% This file is not generated by configure, because then the provided
+%% pdf files would always appear out-of-date.
+\def\versionemacs{24}           % major version of emacs
+\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 @@
 \input pdflayout.sty
 \pdflayout=(0)
 
-\def\versionemacs{24}           % version of Emacs this is for
-\def\year{2012}                 % latest copyright year
+\input emacsver.tex
 
 % Nothing else needs to be changed.
 
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 @@
 \input pdflayout.sty
 \pdflayout=(0l)
 
-\def\versionemacs{24}           % version of Emacs this is for
-\def\year{2012}                 % latest copyright year
+\input emacsver.tex
 
 % Nothing else needs to be changed below this line.
 
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 @@
 \input pdflayout.sty
 \pdflayout=(0)
 
-\def\versionemacs{24}           % version of Emacs this is for
-\def\year{2012}                 % latest copyright year
+\input emacsver.tex
 
 \def\copyrightnotice{\penalty-1\vfill
   \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 @@
 % Reference Card for Org Mode
 \def\orgversionnumber{7.8.11}
 \def\versionyear{2012}          % latest update
-\def\year{2012}                 % latest copyright year
+\input emacsver.tex
 
 %**start of header
 \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 @@
 \input pdflayout.sty
 \pdflayout=(0)
 
-\def\versionemacs{24}           % version of Emacs this is for
-\def\year{2012}                 % latest copyright year
+\input emacsver.tex
 
 % Nothing else needs to be changed.
 
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 @@
 \input pdflayout.sty
 \pdflayout=(0l)
 
-\def\versionemacs{24}           % version of Emacs this is for
-\def\year{2012}                 % latest copyright year
+\input emacsver.tex
 
 % Nothing else needs to be changed below this line.
 
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 @@
 
 % Nothing else needs to be changed below this line.
 
-\def\versionemacs{24}           % version of Emacs this is for
-\def\year{2012}                 % copyright year
+\input emacsver.tex
 
 \def\shortcopyrightnotice{\vskip 1ex plus 2 fill
   \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 @@
 \input pdflayout.sty
 \pdflayout=(0)
 
-\def\versionemacs{24}           % version of Emacs this is for
-\def\year{2012}                 % latest copyright year
+\input emacsver.tex
 
 % Nothing else needs to be changed.
 
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 @@
 \input pdflayout.sty
 \pdflayout=(0)
 
-\def\versionemacs{24}           % version of Emacs this is for
-\def\year{2012}                 % latest copyright year
+\input emacsver.tex
 
 % Nothing else needs to be changed.
 
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 @@
 % Slovak hyphenation rules applied
 \shyph
 
-\def\versionemacs{24}           % version of Emacs this is for
-\def\year{2012}                 % latest copyright year
+\input emacsver.tex
 
 \def\copyrightnotice{\penalty-1\vfill
   \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 @@
 \input pdflayout.sty
 \pdflayout=(1)
 
-\def\versionemacs{24}           % version of Emacs this is for
-\def\year{2012}                 % latest copyright year
+\input emacsver.tex
 
 \def\copyrightnotice{\penalty-1\vfill
   \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 @@
 \input pdflayout.sty
 \pdflayout=(1)
 
+\input emacsver.tex
 \def\versionemacs{18}           % version of Emacs this is for
-\def\year{2012}                 % latest copyright year
 \def\versionvip{3.5}
 
 % 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 @@
 \input pdflayout.sty
 \pdflayout=(1)
 
+\input emacsver.tex
 \def\versionemacs{21}           % version of Emacs this is for
-\def\year{2012}                 % latest copyright year
 \def\versionxemacs{20}          % version of XEmacs this is for
 \def\versionviper{3.0}          % version of Viper this is for