Merge from mainline.

24 files changed, 417 insertions, 101 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 4c0535d07a0..c1cb67a6a67 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,41 @@
+2013-08-15  Glenn Morris  <rgm@gnu.org>
+
+        * refcards/calccard.pdf, refcards/cs-dired-ref.pdf:
+        * refcards/cs-refcard.pdf, refcards/de-refcard.pdf:
+        * refcards/dired-ref.pdf, refcards/fr-dired-ref.pdf:
+        * refcards/fr-refcard.pdf, refcards/gnus-booklet.pdf:
+        * refcards/gnus-refcard.pdf, refcards/orgcard.pdf:
+        * refcards/pl-refcard.pdf, refcards/pt-br-refcard.pdf:
+        * refcards/refcard.pdf, refcards/ru-refcard.pdf:
+        * refcards/sk-dired-ref.pdf, refcards/sk-refcard.pdf:
+        Remove generated files from repository.
+
+        * refcards/Makefile: Rewrite to use portable Makefile syntax.
+        Add language-specific targets.
+        (distclean, extraclean): New rules.
+
+2013-08-13  Glenn Morris  <rgm@gnu.org>
+
+        * refcards/Makefile (all_pdf, all_ps, fr-survival.ps, dist):
+        New rules.
+        (SURVIVAL_CARDS_PDF): Add fr_survival.pdf.
+
+2013-08-11  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * NEWS: Mention -lz and `decompress-gzipped-region'.
+
+2013-08-08  Juanma Barranquero  <lekktu@gmail.com>
+
+        * NEWS: Document new keybinding of `C-x r f' to frameset-to-register.
+
+2013-08-06  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * NEWS: Mention `cache-long-scans'.
+
+2013-08-05  Juanma Barranquero  <lekktu@gmail.com>
+
+        * tutorials/TUTORIAL.es: Fix typo (bug#15027).
+
 2013-08-03  Juanma Barranquero  <lekktu@gmail.com>
 
         * NEWS: Document new package frameset.el.
diff --git a/etc/NEWS b/etc/NEWS
index fd16a43015f..a6d6f5b04c4 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -41,6 +41,11 @@ specially.
 ** Directories passed to configure option `--enable-locallisppath' are
 no longer created during installation.
 
+** Emacs can be compiled with zlib support.  If this library is present
+(which it normally is on most systems), the function
+`zlib-decompress-region' becomes available, which can decompress gzip-
+and zlib-format compressed data.
+
 ---
 ** Emacs for NS (OSX, GNUStep) can be built with ImageMagick support.
 pkg-config is required to find ImageMagick libraries.
@@ -54,6 +59,10 @@ pkg-config is required to find ImageMagick libraries.
 ** Key ? also describes prefix bindings like C-h.
 
 +++
+** `cache-long-line-scans' has been renamed to `cache-long-scans'
+because it affects caching of paragraph scanning results as well.
+
++++
 ** `apropos-variable' is now `apropos-user-option'
 `apropos-user-option' shows all user options while `apropos-variable'
 shows all variables.  When called with a universal prefix argument,
@@ -127,6 +136,11 @@ You can change the default by customizing the variable blink-cursor-blinks.
 Also timers for blinking are stopped when no blinking is done, so Emacs does
 not consume CPU cycles.
 
+** New command `frameset-to-register' is now bound to `C-x r f', replacing
+`frame-configuration-to-register'.  It offers similar functionality, plus
+some enhancements, like the ability to restore deleted frames.  Command
+`frame-configuration-to-register' is still available, but unbound.
+
 
 * Editing Changes in Emacs 24.4
 
@@ -229,6 +243,13 @@ The default separator is changed to allow surrounding spaces around the comma.
 
 ** Calendar and Diary
 
+*** New faces: `calendar-weekday-header', `calendar-weekend-header',
+`calendar-month-header'.
+
+*** New option `calendar-day-header-array'.
+
+*** The variable `calendar-font-lock-keywords' is obsolete.
+
 +++
 *** New variable `diary-from-outlook-function', used by the command
 `diary-from-outlook'.
@@ -274,9 +295,9 @@ on the given date.
 auto-saves of the desktop.
 
 *** `desktop-restore-frames', enabled by default, allows saving and
-restoring the window/frame configuration.  Additional options
+restoring the frame/window configuration (frameset).  Additional options
 `desktop-restore-in-current-display', `desktop-restore-reuses-frames'
-and `desktop-restore-forces-onscreen' allow further customization.
+and `desktop-restore-forces-onscreen' offer further customization.
 
 ** Dired
 
@@ -327,6 +348,8 @@ directory, respectively.
 `f' (`image-next-frame') and `b' (`image-previous-frame') visit the
 next or previous frame.  `F' (`image-goto-frame') shows a specific frame.
 
+*** New commands to speed up, slow down, or reverse animation.
+
 ---
 *** The command `image-mode-fit-frame' deletes other windows.
 When toggling, it restores the frame's previous window configuration.
@@ -429,6 +452,7 @@ New features include:
   archive files, undoing or unarchiving done items;
 - reprioritizing items by inputting a numerical priority;
 - extensive customizability of operation and display, including numerous faces.
+The Todo mode user manual describes all commands and most user options.
 To support some of these features, a new file format is used, which is
 incompatible with the old format; however, you can convert old todo and done
 item files to the new format on initializing the first new todo file, or at any
@@ -583,6 +607,9 @@ in the presence of files with negative time stamps.
 
 * Lisp Changes in Emacs 24.4
 
++++
+** New function `define-error'.
+
 ** New hook `tty-setup-hook'.
 
 +++
@@ -659,6 +686,8 @@ Emacs uses `image-default-frame-delay'.
 *** New functions `image-current-frame' and `image-show-frame' for getting
 and setting the current frame of a multi-frame image.
 
+*** You can change the speed of animated images.
+
 ** Changes in encoding and decoding of text
 
 ---
@@ -692,7 +721,7 @@ These attributes are only meaningful for coding-systems of type
 with the same interpretation as the returned value of `visited-file-modtime'.
 
 ** time-to-seconds is not obsolete any more.
-** New function special-form-p.
+** New functions special-form-p and macrop.
 ** Docstrings can be made dynamic by adding a `dynamic-docstring-function'
 text-property on the first char.
 
@@ -734,12 +763,10 @@ meant to be used by other packages.
 
 * Changes in Emacs 24.4 on Non-Free Operating Systems
 
-** Emacs for MS-Windows can now be built by running the configure script
-using the MSYS environment and MinGW development tools.
-This is from now on the preferred method of building Emacs on
-MS-Windows.  The Windows-specific configure.bat and makefile.w32-in
-files are deprecated.  See the file nt/INSTALL.MSYS for detailed
-instructions.
+** The procedure for building Emacs on MS-Windows has changed.
+It is now built by running the same configure script as on all other
+platforms.  This requires the MSYS environment and MinGW development
+tools.  See the updated instructions in nt/INSTALL for details.
 
 Using the Posix configure script and Makefile's also means a change in
 the directory structure of the Emacs installation on Windows.  It is
@@ -872,6 +899,10 @@ treated as images.
 *** ImageMagick images now support the :max-width and :max-height
 keywords.
 
+*** Some data types aren't auto-detected by ImageMagick.  Adding
+:format to `create-image' may help if the content type is in the
+new variable `image-format-suffixes'.
+
 ** Minibuffer
 
 *** In minibuffer filename prompts, `C-M-f' and `C-M-b' now move to the
diff --git a/etc/PROBLEMS b/etc/PROBLEMS
index 7556c23daee..f241655dedd 100644
--- a/etc/PROBLEMS
+++ b/etc/PROBLEMS
@@ -3016,9 +3016,9 @@ You can enter M-f6 by typing ESC f6.
 *** MS-Windows 95/98/ME: subprocesses do not terminate properly.
 
 This is a limitation of the Operating System, and can cause problems
-when shutting down Windows. Ensure that all subprocesses are exited
-cleanly before exiting Emacs. For more details, see the FAQ at
-http://www.gnu.org/software/emacs/windows/.
+when shutting down Windows.  Ensure that all subprocesses are exited
+cleanly before exiting Emacs.  For more details, see the Emacs on MS
+Windows FAQ (info manual "efaq-w32").
 
 *** MS-Windows 95/98/ME: crashes when Emacs invokes non-existent programs.
 
diff --git a/etc/TODO b/etc/TODO
index 305722dfe7b..3bdb82aa4d4 100644
--- a/etc/TODO
+++ b/etc/TODO
@@ -76,7 +76,8 @@ to use it.
 ** Convert all defvars with leading `*' in the doc-strings into defcustoms
 of appropriate :type and :group.
 
-** Remove any leading `*'s from defcustom doc-strings.  [done?]
+** Remove any leading `*'s from defcustom doc-strings.
+[done?] [A lot of them are in CC Mode.]
 
 ** Remove unnecessary autoload cookies from defcustoms.
 This needs a bit of care, since often people have become used to
diff --git a/etc/refcards/Makefile b/etc/refcards/Makefile
index 66fbc96e181..36abf67d594 100644
--- a/etc/refcards/Makefile
+++ b/etc/refcards/Makefile
@@ -17,124 +17,321 @@
 ## You should have received a copy of the GNU General Public License
 ## along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
+### Commentary:
 
-## Top-level targets.
+## See README for details.
 
-## PDF files that are included with Emacs.
-all: refcards_pdf dired-refcards_pdf misc-refcards_pdf
+PDF_ENGLISH = \
+        calccard.pdf \
+        dired-ref.pdf \
+        gnus-booklet.pdf \
+        gnus-refcard.pdf \
+        orgcard.pdf \
+        refcard.pdf \
+        survival.pdf \
+        vipcard.pdf \
+        viperCard.pdf
 
-REFCARDS_PDF = refcard.pdf cs-refcard.pdf de-refcard.pdf fr-refcard.pdf \
-            pl-refcard.pdf pt-br-refcard.pdf ru-refcard.pdf sk-refcard.pdf
-refcards_pdf: ${REFCARDS_PDF}
-refcards_ps: ${REFCARDS_PDF:.pdf=.ps}
+PDF_CZECH = \
+        cs-dired-ref.pdf \
+        cs-refcard.pdf \
+        cs-survival.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_ps: ${DIRED_REFCARDS_PDF:.pdf=.ps}
+PDF_FRENCH = \
+        fr-dired-ref.pdf \
+        fr-refcard.pdf \
+        fr-survival.pdf \
 
-MISC_REFCARDS_PDF = calccard.pdf gnus-booklet.pdf gnus-refcard.pdf orgcard.pdf
-misc-refcards_pdf: ${MISC_REFCARDS_PDF}
-misc-refcards_ps: ${MISC_REFCARDS_PDF:.pdf=.ps}
+PDF_GERMAN = de-refcard.pdf
 
+PDF_POLISH = pl-refcard.pdf
 
-## The following files are not included with Emacs.
-SURVIVAL_CARDS_PDF = survival.pdf cs-survival.pdf sk-survival.pdf
-survival-cards_pdf: ${SURVIVAL_CARDS_PDF}
-survival-cards_ps: ${SURVIVAL_CARDS_PDF:.pdf=.ps}
+PDF_PORTUGUESE = pt-br-refcard.pdf
 
-VIPER_CARDS_PDF = vipcard.pdf viperCard.pdf
-viper-cards_pdf: ${VIPER_CARDS_PDF}
-viper-cards_ps: ${VIPER_CARDS_PDF:.pdf=.ps}
+PDF_RUSSIAN = ru-refcard.pdf
 
-ENVADD = TEXINPUTS=".:"
+PDF_SLOVAKIAN = \
+        sk-dired-ref.pdf \
+        sk-refcard.pdf \
+        sk-survival.pdf
 
-## PDF files.
+PDF_TARGETS = $(PDF_ENGLISH) $(PDF_CZECH) $(PDF_FRENCH) $(PDF_GERMAN) \
+        $(PDF_POLISH) $(PDF_PORTUGUESE) $(PDF_RUSSIAN) $(PDF_SLOVAKIAN)
 
-## The page layouts (a4/letter) are written directly in the .tex files.
+PS_ENGLISH = \
+        calccard.ps \
+        dired-ref.ps \
+        gnus-booklet.ps \
+        gnus-refcard.ps \
+        orgcard.ps \
+        refcard.ps \
+        survival.ps \
+        vipcard.ps \
+        viperCard.ps
 
-cs-refcard.pdf cs-dired-ref.pdf cs-survival.pdf sk-refcard.pdf \
-sk-dired-ref.pdf sk-survival.pdf: %.pdf: %.tex emacsver.tex
-        if pdfcsplain --version > /dev/null 2> /dev/null; then \
-          ${ENVADD} pdfcsplain $<; \
-        else \
-          ${ENVADD} csplain "\pdfoutput=1\input $<"; \
-        fi
+PS_CZECH = \
+        cs-dired-ref.ps \
+        cs-refcard.ps \
+        cs-survival.ps
 
-## Some versions of pdfmex seem to create dvi by default, hence output-format.
-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
-        ${ENVADD} pdftex -output-format=pdf $<
+PS_FRENCH = \
+        fr-dired-ref.ps \
+        fr-refcard.ps \
+        fr-survival.ps \
 
-ru-refcard.pdf: %.pdf: %.tex
-        pdflatex $<
+PS_GERMAN = de-refcard.ps
 
-#gnus-logo.pdf: %.pdf: %.eps
-#       ps2pdf $<
+PS_POLISH = pl-refcard.ps
 
-gnus-refcard.pdf: %.pdf: %.tex gnus-logo.pdf
-        pdflatex $<
+PS_PORTUGUESE = pt-br-refcard.ps
 
-gnus-booklet.pdf: gnus-refcard.tex gnus-logo.pdf
-        pdflatex -jobname=gnus-booklet '\def\booklettrue{}\def\letterpapertrue{}\input{gnus-refcard}'
+PS_RUSSIAN = ru-refcard.ps
 
-## Everything not explicitly listed above.
-%.pdf: %.tex emacsver.tex
-        ${ENVADD} pdftex $<
+PS_SLOVAKIAN = \
+        sk-dired-ref.ps \
+        sk-refcard.ps \
+        sk-survival.ps
 
+PS_TARGETS = $(PS_ENGLISH) $(PS_CZECH) $(PS_FRENCH) $(PS_GERMAN) \
+        $(PS_POLISH) $(PS_PORTUGUESE) $(PS_RUSSIAN) $(PS_SLOVAKIAN)
 
-## dvi files.
 
-cs-refcard.dvi cs-dired-ref.dvi cs-survival.dvi sk-refcard.dvi \
-sk-dired-ref.dvi sk-survival.dvi: %.dvi: %.tex emacsver.tex
-        ${ENVADD} csplain $<
+## For emacsver.tex.
+ENVADD = TEXINPUTS=".:$(TEXINPUTS)"
 
-pl-refcard.dvi: %.dvi: %.tex emacsver.tex
-        if ! kpsewhich -format=fmt mex > /dev/null; then \
-          echo "No mex format found."; false; \
-        fi
-        ${ENVADD} tex $<
 
-ru-refcard.dvi gnus-refcard.dvi: %.dvi: %.tex
-        latex $<
+.PHONY: all pdf ps
 
-gnus-booklet.dvi: gnus-refcard.tex
-        latex '\def\booklettrue{}\def\letterpapertrue{}\input{gnus-refcard}'
-        mv gnus-refcard.dvi $@
+all: pdf
+pdf: $(PDF_TARGETS)
+ps: $(PS_TARGETS)
 
-## Everything not explicitly listed above.
-%.dvi: %.tex emacsver.tex
-        ${ENVADD} tex $<
 
+.PHONY: english czech french german polish portuguese russian slovakian
+english: $(PDF_ENGLISH)
+czech: $(PDF_CZECH)
+french: $(PDF_FRENCH)
+german: $(PDF_GERMAN)
+polish: $(PDF_POLISH)
+portuguese: $(PDF_PORTUGUESE)
+russian: $(PDF_RUSSIAN)
+slovakian: $(PDF_SLOVAKIAN)
 
-## PostScript files.
+.PHONY: english-ps czech-ps french-ps german-ps polish-ps portuguese-ps russian-ps slovakian-ps
+english-ps: $(PS_ENGLISH)
+czech-ps: $(PS_CZECH)
+french-ps: $(PS_FRENCH)
+german-ps: $(PS_GERMAN)
+polish-ps: $(PS_POLISH)
+portuguese-ps: $(PS_PORTUGUESE)
+russian-ps: $(PS_RUSSIAN)
+slovakian-ps: $(PS_SLOVAKIAN)
 
-## Note that some of the tex files (refcard, de-refcard, fr-refcard,
-## pt-br-refcard) have settings for letter or a4 paper. Following are
-## the default paper sizes (letter for English, A4 for translations).
-## FIXME orgcard.ps does not fit on letter (see orgcard.tex).
 
-## A4, landscape.
-de-refcard.ps fr-refcard.ps pt-br-refcard.ps orgcard.ps: %.ps: %.dvi
-        dvips -t a4 -t landscape $< -o $@
+## Default for file that do not use a different paper size.
+.SUFFIXES: .ps .dvi
+.dvi.ps:
+        dvips -t letter -o $@ $<
+
+
+make_cs=if pdfcsplain --version > /dev/null 2> /dev/null; then \
+          $(ENVADD) pdfcsplain $$input; \
+        else \
+          $(ENVADD) csplain "\pdfoutput=1\input $$input"; \
+        fi
+
+## For pdf output, the page layouts (a4/letter) are written directly
+## in the .tex files.
 
-## A4, portrait.
-cs-dired-ref.ps cs-refcard.ps cs-survival.ps fr-dired-ref.ps \
-pl-refcard.ps ru-refcard.ps \
-sk-dired-ref.ps sk-refcard.ps sk-survival.ps: %.ps: %.dvi
-        dvips -t a4 $< -o $@
+## For PostScript output, note that some of the tex files (refcard,
+## de-refcard, fr-refcard, pt-br-refcard) have settings for letter or
+## a4 paper.  The Following are the default paper sizes (letter for English,
+## A4 for translations).
+## FIXME orgcard.ps does not fit on letter (see orgcard.tex).
 
-## letter, landscape.
-calccard.ps refcard.ps: %.ps: %.dvi
-        dvips -t letter -t landscape $< -o $@
+## A4, landscape: de-refcard, fr-refcard, pt-br-refcard orgcard
+## A4, portrait: cs-*, fr-dired-ref, sk-*, pl-refcard, ru-refcard
+## Letter, landscape: calccard, refcard
+## Letter, portrait (suffix rule): dired-ref, gnus-*, survival, vip*
+
+calccard_deps = calccard.tex emacsver.tex pdflayout.sty
+calccard.pdf: $(calccard_deps)
+        $(ENVADD) pdftex calccard.tex
+calccard.dvi: $(calccard_deps)
+        $(ENVADD) tex calccard.tex
+calccard.ps: calccard.dvi
+        dvips -t letter -t landscape -o $@ calccard.dvi
+
+cs_dired_ref_deps = cs-dired-ref.tex emacsver.tex pdflayout.sty
+cs-dired-ref.pdf: $(cs_dired_ref_deps)
+        input=cs-dired-ref.tex; $(make_cs)
+cs-dired-ref.dvi: $(cs_dired_ref_deps)
+        $(ENVADD) csplain cs-dired-ref.tex
+cs-dired-ref.ps: cs-dired-ref.dvi
+        dvips -t a4 -o $@ cs-dired-ref.dvi
+
+cs_refcard_deps = cs-refcard.tex emacsver.tex pdflayout.sty
+cs-refcard.pdf: $(cs_refcard_deps)
+        input=cs-refcard.tex; $(make_cs)
+cs-refcard.dvi: $(cs_refcard_deps)
+        $(ENVADD) csplain cs-refcard.tex
+cs-refcard.ps: cs-refcard.dvi
+        dvips -t a4 -o $@ cs-refcard.dvi
+
+cs_survival_deps = cs-survival.tex emacsver.tex pdflayout.sty
+cs-survival.pdf: $(cs_survival_deps)
+        input=cs-survival.tex; $(make_cs)
+cs-survival.dvi: $(cs_survival_deps)
+        $(ENVADD) csplain cs-survival.tex
+cs-survival.ps: cs-survival.dvi
+        dvips -t a4 -o $@ cs-survival.dvi
+
+de_refcard_deps = de-refcard.tex emacsver.tex pdflayout.sty
+de-refcard.pdf: $(de_refcard_deps)
+        $(ENVADD) pdftex de-refcard.tex
+de-refcard.dvi: $(de_refcard_deps)
+        $(ENVADD) tex de-refcard.tex
+de-refcard.ps: de-refcard.dvi
+        dvips -t a4 -t landscape -o $@ de-refcard.dvi
+
+dired_ref_deps = dired-ref.tex emacsver.tex pdflayout.sty
+dired-ref.pdf: $(dired_ref_deps)
+        $(ENVADD) pdftex dired-ref.tex
+dired-ref.dvi: $(dired_ref_deps)
+        $(ENVADD) tex dired-ref.tex
+
+fr_dired_ref_deps = fr-dired-ref.tex emacsver.tex pdflayout.sty
+fr-dired-ref.pdf: $(fr_dired_ref_deps)
+        $(ENVADD) pdftex fr-dired-ref.tex
+fr-dired-ref.dvi: $(fr_dired_ref_deps)
+        $(ENVADD) tex fr-dired-ref.tex
+fr-dired-ref.ps: fr-dired-ref.dvi
+        dvips -t a4 -o $@ fr-dired-ref.dvi
+
+fr_refcard_deps = fr-refcard.tex emacsver.tex pdflayout.sty
+fr-refcard.pdf: $(fr_refcard_deps)
+        $(ENVADD) pdftex fr-refcard.tex
+fr-refcard.dvi: $(fr_refcard_deps)
+        $(ENVADD) tex fr-refcard.tex
+fr-refcard.ps: fr-refcard.dvi
+        dvips -t a4 -t landscape -o $@ fr-refcard.dvi
+
+fr_survival_deps = fr-survival.tex emacsver.tex pdflayout.sty
+fr-survival.pdf: $(fr_survival_deps)
+        $(ENVADD) pdftex fr-survival.tex
+fr-survival.dvi: $(fr_survival_deps)
+        $(ENVADD) tex fr-survival.tex
+fr-survival.ps: fr-survival.dvi
+        dvips -t a4 -o $@ fr-survival.dvi
+
+## No dependency on emacsver.tex, pdflayout.sty; no need for ENVADD.
+gnus_booklet_deps = gnus-refcard.tex gnus-logo.pdf
+gnus-booklet.pdf: $(gnus_booklet_deps)
+        pdflatex -jobname=gnus-booklet '\def\booklettrue{}\def\letterpapertrue{}\input{gnus-refcard}'
+gnus-booklet.dvi: gnus-refcard.tex gnus-logo.eps
+        latex '\def\booklettrue{}\def\letterpapertrue{}\input{gnus-refcard}'
+        mv gnus-refcard.dvi $@
 
-## letter, portrait.
-dired-ref.ps gnus-booklet.ps gnus-refcard.ps survival.ps vipcard.ps \
-viperCard.ps: %.ps: %.dvi
-        dvips -t letter $< -o $@
+###gnus-logo.pdf: gnus-logo.eps
+###     ps2pdf gnus-logo.eps
+
+## No dependency on emacsver.tex, pdflayout.sty; no need for ENVADD.
+gnus_refcard_deps = gnus-refcard.tex gnus-logo.pdf
+gnus-refcard.pdf: $(gnus_refcard_deps)
+        pdflatex gnus-refcard.tex
+gnus-refcard.dvi: $(gnus_refcard_deps)
+        latex gnus-refcard.tex
+
+orgcard_deps = orgcard.tex emacsver.tex pdflayout.sty
+orgcard.pdf: $(orgcard_deps)
+        $(ENVADD) pdftex orgcard.tex
+orgcard.dvi: $(orgcard_deps)
+        $(ENVADD) tex orgcard.tex
+orgcard.ps: orgcard.dvi
+        dvips -t a4 -t landscape -o $@ orgcard.dvi
+
+pl_refcard_deps = pl-refcard.tex emacsver.tex pdflayout.sty
+## Some versions of pdfmex seem to create dvi by default, hence output-format.
+pl-refcard.pdf: $(pl_refcard_deps)
+        if ! kpsewhich -format=fmt mex > /dev/null && \
+          ! pdfmex --version > /dev/null 2> /dev/null; then \
+          echo "No mex format found."; false; \
+        fi
+        $(ENVADD) pdftex -output-format=pdf pl-refcard.tex
+pl-refcard.dvi: $(pl_refcard_deps)
+        if ! kpsewhich -format=fmt mex > /dev/null; then \
+          echo "No mex format found."; false; \
+        fi
+        $(ENVADD) tex pl-refcard.tex
+pl-refcard.ps: pl-refcard.dvi
+        dvips -t a4 -o $@ pl-refcard.dvi
+
+pt_br_refcard_deps = pt-br-refcard.tex emacsver.tex pdflayout.sty
+pt-br-refcard.pdf: $(pt_br_refcard_deps)
+        $(ENVADD) pdftex pt-br-refcard.tex
+pt-br-refcard.dvi: $(pt_br_refcard_deps)
+        $(ENVADD) tex pt-br-refcard.tex
+pt-br-refcard.ps: pt-br-refcard.dvi
+        dvips -t a4 -t landscape -o $@ pt-br-refcard.dvi
+
+refcard_deps = refcard.tex emacsver.tex pdflayout.sty
+refcard.pdf: $(refcard_deps)
+        $(ENVADD) pdftex refcard.tex
+refcard.dvi: $(refcard_deps)
+        $(ENVADD) tex refcard.tex
+refcard.ps: refcard.dvi
+        dvips -t letter -t landscape -o $@ refcard.dvi
+
+## No dependency on emacsver.tex, pdflayout.sty; no need for ENVADD.
+ru_refcard_deps = ru-refcard.tex
+ru-refcard.pdf: $(ru_refcard_deps)
+        pdflatex ru-refcard.tex
+ru-refcard.dvi: $(ru_refcard_deps)
+        latex ru-refcard.tex
+ru-refcard.ps: ru-refcard.dvi
+        dvips -t a4 -o $@ ru-refcard.dvi
+
+sk_dired_ref_deps = sk-dired-ref.tex emacsver.tex pdflayout.sty
+sk-dired-ref.pdf: $(sk_dired_ref_deps)
+        input=sk-dired-ref.tex; $(make_cs)
+sk-dired-ref.dvi: $(sk_dired_ref_deps)
+        $(ENVADD) csplain sk-dired-ref.tex
+sk-dired-ref.ps: sk-dired-ref.dvi
+        dvips -t a4 -o $@ sk-dired-ref.dvi
+
+sk_refcard_deps = sk-refcard.tex emacsver.tex pdflayout.sty
+sk-refcard.pdf: $(sk_refcard_deps)
+        input=sk-refcard.tex; $(make_cs)
+sk-refcard.dvi: $(sk_refcard_deps)
+        $(ENVADD) csplain sk-refcard.tex
+sk-refcard.ps: sk-refcard.dvi
+        dvips -t a4 -o $@ sk-refcard.dvi
+
+sk_survival_deps = sk-survival.tex emacsver.tex pdflayout.sty
+sk-survival.pdf: $(sk_survival_deps)
+        input=sk-survival.tex; $(make_cs)
+sk-survival.dvi: $(sk_survival_deps)
+        $(ENVADD) csplain sk-survival.tex
+sk-survival.ps: sk-survival.dvi
+        dvips -t a4 -o $@ sk-survival.dvi
+
+survival_deps = survival.tex emacsver.tex pdflayout.sty
+survival.pdf: $(survival_deps)
+        $(ENVADD) pdftex survival.tex
+survival.dvi: $(survival_deps)
+        $(ENVADD) tex survival.tex
+
+vipcard_deps = vipcard.tex emacsver.tex pdflayout.sty
+vipcard.pdf: $(vipcard_deps)
+        $(ENVADD) pdftex vipcard.tex
+vipcard.dvi: $(vipcard_deps)
+        $(ENVADD) tex vipcard.tex
+
+vipercard_deps = viperCard.tex emacsver.tex pdflayout.sty
+viperCard.pdf: $(vipercard_deps)
+        $(ENVADD) pdftex viperCard.tex
+viperCard.dvi: $(vipercard_deps)
+        $(ENVADD) tex viperCard.tex
 
 
 .PHONY: clean
@@ -142,4 +339,19 @@ viperCard.ps: %.ps: %.dvi
 clean:
         -rm -f *.dvi *.log *.aux
 
+distclean: clean
+
+## This should really by maintainer-clean, but the handling of the
+## refcards is funny.  So abuse extraclean for this.
+extraclean: clean
+        -rm -f $(PDF_TARGETS) $(PS_TARGETS)
+
+## For the Emacs website.
+dist:
+        rm -rf emacs-refcards
+        mkdir emacs-refcards
+        cp Makefile README *.tex gnus-logo.* pdflayout.sty emacs-refcards/
+        tar -cf emacs-refcards.tar emacs-refcards
+        rm -rf emacs-refcards
+
 ### Makefile ends here
diff --git a/etc/refcards/README b/etc/refcards/README
index 273f7ca317c..7a8c7c76bf4 100644
--- a/etc/refcards/README
+++ b/etc/refcards/README
@@ -1,5 +1,11 @@
+Copyright (C) 2013 Free Software Foundation, Inc.
+See the end of the file for license conditions.
+
+
+REFERENCE CARDS FOR GNU EMACS
+
 To generate these refcards, you need to install the TeX document
-production system.  For example, http://www.tug.org/texlive/ .
+production system.  For example, <http://www.tug.org/texlive/>.
 
 All modern GNU/Linux distributions provide TeX packages, so the
 easiest way is just to install those.  Your distribution may have
@@ -7,7 +13,18 @@ split some of the files needed to process non-English output into
 separate, optional packages such as: texlive-lang-cyrillic,
 texlive-lang-czechslovak, texlive-lang-german, and texlive-lang-polish.
 
+Type `make all' (or `make pdf') to generate PDF versions of all the cards.
+For PostScript format, use `make ps'.
+To only generate the cards for a specific language, use e.g.
+`make french' or `make french-ps'.  As mentioned above, you may need
+to install extra TeX packages for some languages.
+
+PDF and PS copies of these cards are also available at
+<http://www.gnu.org/software/emacs/refcards>.  The FSF online
+store <http://shop.fsf.org/> sometimes has printed copies for sale.
+
 
+
 COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES
 
 The file gnus-logo.eps contains copyright and license information, but
@@ -17,3 +34,20 @@ File: gnus-logo.eps, gnus-logo.pdf
   Author: Luis Fernandes <elf@ee.ryerson.ca>
   Copyright (C) 2001-2013 Free Software Foundation, Inc.
   License: GNU General Public License version 3 or later (see COPYING)
+
+
+
+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/>.
diff --git a/etc/refcards/calccard.pdf b/etc/refcards/calccard.pdf
deleted file mode 100644
index 8d39aa013a0..00000000000
--- a/etc/refcards/calccard.pdf
+++ /dev/null
diff --git a/etc/refcards/cs-dired-ref.pdf b/etc/refcards/cs-dired-ref.pdf
deleted file mode 100644
index 0e6232a800d..00000000000
--- a/etc/refcards/cs-dired-ref.pdf
+++ /dev/null
diff --git a/etc/refcards/cs-refcard.pdf b/etc/refcards/cs-refcard.pdf
deleted file mode 100644
index a032a7ce407..00000000000
--- a/etc/refcards/cs-refcard.pdf
+++ /dev/null
diff --git a/etc/refcards/de-refcard.pdf b/etc/refcards/de-refcard.pdf
deleted file mode 100644
index 84c0f4c121a..00000000000
--- a/etc/refcards/de-refcard.pdf
+++ /dev/null
diff --git a/etc/refcards/dired-ref.pdf b/etc/refcards/dired-ref.pdf
deleted file mode 100644
index b80daa90638..00000000000
--- a/etc/refcards/dired-ref.pdf
+++ /dev/null
diff --git a/etc/refcards/fr-dired-ref.pdf b/etc/refcards/fr-dired-ref.pdf
deleted file mode 100644
index 77b36c3f2a7..00000000000
--- a/etc/refcards/fr-dired-ref.pdf
+++ /dev/null
diff --git a/etc/refcards/fr-refcard.pdf b/etc/refcards/fr-refcard.pdf
deleted file mode 100644
index 5fdf2998e4b..00000000000
--- a/etc/refcards/fr-refcard.pdf
+++ /dev/null
diff --git a/etc/refcards/gnus-booklet.pdf b/etc/refcards/gnus-booklet.pdf
deleted file mode 100644
index 6cc54baaead..00000000000
--- a/etc/refcards/gnus-booklet.pdf
+++ /dev/null
diff --git a/etc/refcards/gnus-refcard.pdf b/etc/refcards/gnus-refcard.pdf
deleted file mode 100644
index 7a1c5b3bcab..00000000000
--- a/etc/refcards/gnus-refcard.pdf
+++ /dev/null
diff --git a/etc/refcards/orgcard.pdf b/etc/refcards/orgcard.pdf
deleted file mode 100644
index 8fc57d9c6d8..00000000000
--- a/etc/refcards/orgcard.pdf
+++ /dev/null
diff --git a/etc/refcards/pl-refcard.pdf b/etc/refcards/pl-refcard.pdf
deleted file mode 100644
index b832990fb1c..00000000000
--- a/etc/refcards/pl-refcard.pdf
+++ /dev/null
diff --git a/etc/refcards/pt-br-refcard.pdf b/etc/refcards/pt-br-refcard.pdf
deleted file mode 100644
index 200425f27d7..00000000000
--- a/etc/refcards/pt-br-refcard.pdf
+++ /dev/null
diff --git a/etc/refcards/refcard.pdf b/etc/refcards/refcard.pdf
deleted file mode 100644
index 1d3b630bfc5..00000000000
--- a/etc/refcards/refcard.pdf
+++ /dev/null
diff --git a/etc/refcards/ru-refcard.pdf b/etc/refcards/ru-refcard.pdf
deleted file mode 100644
index f415fd5574d..00000000000
--- a/etc/refcards/ru-refcard.pdf
+++ /dev/null
diff --git a/etc/refcards/sk-dired-ref.pdf b/etc/refcards/sk-dired-ref.pdf
deleted file mode 100644
index f3cb4f64368..00000000000
--- a/etc/refcards/sk-dired-ref.pdf
+++ /dev/null
diff --git a/etc/refcards/sk-refcard.pdf b/etc/refcards/sk-refcard.pdf
deleted file mode 100644
index d4a85a3d4b9..00000000000
--- a/etc/refcards/sk-refcard.pdf
+++ /dev/null
diff --git a/etc/spook.lines b/etc/spook.lines
index 2a1a0ac1cb9..3a6d503cdf5 100644
--- a/etc/spook.lines
+++ b/etc/spook.lines
diff --git a/etc/tutorials/TUTORIAL.es b/etc/tutorials/TUTORIAL.es
index 15b0a4e26bf..f2ae8ab0354 100644
--- a/etc/tutorials/TUTORIAL.es
+++ b/etc/tutorials/TUTORIAL.es
@@ -974,7 +974,7 @@ diferentes:
 
 >> Teclee C-x 4 C-f seguido del nombre de uno de sus archivos.
    Finalice con <Return>.  Vea que el archivo especificado aparece en
-   la ventana inferior.  El cursor vá allá también.
+   la ventana inferior.  El cursor va allá también.
 
 >> Teclee C-x o para regresar a la ventana superior, y C-x 1 para
    borrar la ventana inferior.