[Emacs-diffs] trunk r113828: Merge from emacs-24; up to r111400

[Glenn Morris]

------------------------------------------------------------
revno: 113828 [merge]
revision-id: address@hidden
parent: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2013-08-13 00:02:00 -0700
message:
  Merge from emacs-24; up to r111400
modified:
  doc/misc/ChangeLog             changelog-20091113204419-o5vbwnq5f7feedwu-6331
  doc/misc/cc-mode.texi          
ccmode.texi-20091113204419-o5vbwnq5f7feedwu-6291
  doc/misc/edt.texi              edt.texi-20091215194433-gyppc2fi66nhko62-2
  doc/misc/epa.texi              epa.texi-20091113204419-o5vbwnq5f7feedwu-8552
  doc/misc/mairix-el.texi        
mairixel.texi-20091113204419-o5vbwnq5f7feedwu-8759
  doc/misc/reftex.texi           
reftex.texi-20091113204419-o5vbwnq5f7feedwu-6317
  etc/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1485
  etc/refcards/Makefile          makefile-20091113204419-o5vbwnq5f7feedwu-5192

=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog        2013-08-12 01:48:11 +0000
+++ b/doc/misc/ChangeLog        2013-08-13 07:02:00 +0000
@@ -1,3 +1,18 @@
+2013-08-13  Glenn Morris  <address@hidden>
+
+       * reftex.texi (LaTeX xr Package, Options - Table of Contents)
+       (Options - Defining Label Environments, Options - Creating Labels)
+       (Options - Referencing Labels, Options - Creating Citations)
+       (Options - Index Support, Options - Viewing Cross-References)
+       (Options - Finding Files, Options - Optimizations)
+       (Options - Fontification, Options - Misc):
+       * cc-mode.texi (Sample Init File):
+       * edt.texi (Init file):
+       * epa.texi (Encrypting/decrypting gpg files):
+       * mairix-el.texi (About, Setting up the mairix interface, Using)
+       (Extending):
+       Rename nodes to avoid characters that can cause Texinfo problems.
+
 2013-08-12  Katsumi Yamaoka  <address@hidden>
 
        * gnus.texi (Mail Source Specifiers): Fix description for pop3's :leave.

=== modified file 'doc/misc/cc-mode.texi'
--- a/doc/misc/cc-mode.texi     2013-07-03 03:20:04 +0000
+++ b/doc/misc/cc-mode.texi     2013-08-13 07:02:00 +0000
@@ -241,7 +241,7 @@
 * Customizing Indentation::
 * Custom Macros::
 * Odds and Ends::
-* Sample .emacs File::
+* Sample Init File::
 * Performance Issues::
 * Limitations and Known Bugs::
 * FAQ::
@@ -1113,7 +1113,7 @@
 This function is not bound to a key by default, but it's intended to be
 used on the @kbd{RET} key.  If you like the behavior of
 @code{newline-and-indent} on @kbd{RET}, you should consider switching to
-this function.  @xref{Sample .emacs File}.
+this function.  @xref{Sample Init File}.
 
 @item @kbd{M-x c-context-open-line}
 @findex c-context-open-line
@@ -1170,7 +1170,7 @@
 
 You can toggle each of these minor modes on and off, and you can
 configure @ccmode{} so that it starts up with your favorite
-combination of them (@pxref{Sample .emacs File}).  By default, when
+combination of them (@pxref{Sample Init File}).  By default, when
 you initialize a buffer, electric mode and syntactic-indentation mode
 are enabled but the other two modes are disabled.
 
@@ -2378,7 +2378,7 @@
 @vindex initialization-hook (c-)
 Hook run only once per Emacs session, when @ccmode{} is initialized.
 This is a good place to change key bindings (or add new ones) in any
-of the @ccmode{} key maps.  @xref{Sample .emacs File}.
+of the @ccmode{} key maps.  @xref{Sample Init File}.
 @end defvar
 
 @defvar c-mode-common-hook
@@ -2406,7 +2406,7 @@
 Here's a simplified example of what you can add to your @file{.emacs}
 file to do things whenever any @ccmode{} language is edited.  See the
 Emacs manuals for more information on customizing Emacs via hooks.
address@hidden .emacs File}, for a more complete sample @file{.emacs}
address@hidden Init File}, for a more complete sample @file{.emacs}
 file.
 
 @example
@@ -2685,7 +2685,7 @@
 style.  To do this, put the new style's settings into a list with the
 following format; the list can then be passed as an argument to the
 function @code{c-add-style}.  You can see an example of a style
-definition in @ref{Sample .emacs File}.
+definition in @ref{Sample Init File}.
 
 @cindex style definition
 @c @defvr {List} style definition
@@ -2753,7 +2753,7 @@
 You should use @code{c-set-style} instead.
 
 The sample @file{.emacs} file provides a concrete example of how a new
-style can be added and automatically set.  @xref{Sample .emacs File}.
+style can be added and automatically set.  @xref{Sample Init File}.
 @end defun
 
 @defvar c-style-alist
@@ -6760,7 +6760,7 @@
 @end defun
 
 @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
address@hidden    Odds and Ends, Sample .emacs File, Custom Macros, Top
address@hidden    Odds and Ends, Sample Init File, Custom Macros, Top
 @comment node-name, next, previous, up
 @chapter Odds and Ends
 @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -6804,9 +6804,9 @@
 
 
 @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
address@hidden    Sample .emacs File, Performance Issues, Odds and Ends, Top
address@hidden    Sample Init File, Performance Issues, Odds and Ends, Top
 @comment node-name, next, previous, up
address@hidden Sample .emacs File
address@hidden Sample Init File
 @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 Here's a sample .emacs file fragment that might help you along the way.
@@ -6863,7 +6863,7 @@
 @end verbatim
 
 @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
address@hidden    Performance Issues, Limitations and Known Bugs, Sample .emacs 
File, Top
address@hidden    Performance Issues, Limitations and Known Bugs, Sample Init 
File, Top
 @comment node-name, next, previous, up
 @chapter Performance Issues
 @cindex performance

=== modified file 'doc/misc/edt.texi'
--- a/doc/misc/edt.texi 2013-01-01 09:11:05 +0000
+++ b/doc/misc/edt.texi 2013-08-13 06:55:21 +0000
@@ -789,13 +789,13 @@
 special needs.
 
 @menu
-* edt-user.el::          Creating your own @file{edt-user.el} file.
+* Init file::            Creating your own @file{edt-user.el} file.
 * Words::                Specifying word entities.
 * Control keys::         Enabling EDT control key sequence bindings.
 * Scroll margins::       Setting scroll margins.
 @end menu
 
address@hidden edt-user.el
address@hidden Init file
 @section Creating your own @file{edt-user.el} File
 
 A sample @file{edt-user.el} file is provided in the Emacs @file{etc/}

=== modified file 'doc/misc/epa.texi'
--- a/doc/misc/epa.texi 2013-06-10 05:22:52 +0000
+++ b/doc/misc/epa.texi 2013-08-13 07:02:00 +0000
@@ -106,7 +106,7 @@
 * Cryptographic operations on files::
 * Dired integration::
 * Mail-mode integration::
-* Encrypting/decrypting *.gpg files::
+* Encrypting/decrypting gpg files::
 @end menu
 
 @node Key management
@@ -346,8 +346,8 @@
 
 @end table
 
address@hidden Encrypting/decrypting *.gpg files
address@hidden Encrypting/decrypting *.gpg files
address@hidden Encrypting/decrypting gpg files
address@hidden Encrypting/decrypting gpg files
 By default, every file whose name ends with @samp{.gpg} will be
 treated as encrypted.  That is, when you open such a file, the
 decrypted text is inserted in the buffer rather than encrypted one.
@@ -464,7 +464,7 @@
 
 To set up elisp passphrase cache, set
 @code{epa-file-cache-passphrase-for-symmetric-encryption}.
address@hidden/decrypting *.gpg files}.
address@hidden/decrypting gpg files}.
 
 @node Bug Reports
 @chapter Bug Reports

=== modified file 'doc/misc/mairix-el.texi'
--- a/doc/misc/mairix-el.texi   2013-03-04 08:45:03 +0000
+++ b/doc/misc/mairix-el.texi   2013-08-13 07:02:00 +0000
@@ -55,15 +55,15 @@
 @end ifnottex
 
 @menu
-* About mairix and mairix.el::  About the mairix search engine and mairix.el
-* Configuring mairix::          How to configure mairix
-* Setting up mairix.el::        Set up mairix.el
-* Using mairix.el::             List of interactive functions
-* Extending mairix.el::         Support your favorite mail reader!
+* About::                       About the mairix search engine and mairix.el.
+* Configuring mairix::          How to configure mairix.
+* Setting up the mairix interface:: Set up mairix.el.
+* Using::                       List of interactive functions
+* Extending::                   Support your favorite mail reader!
 * GNU Free Documentation License::  The license for this documentation.
 @end menu
 
address@hidden About mairix and mairix.el
address@hidden About
 @chapter About mairix and mairix.el
 
 Mairix is a tool for indexing and searching words in locally stored
@@ -98,7 +98,7 @@
 with RMail, Gnus, or VM as the Emacs mail program.  However, it should
 also work with Maildir or MH, and it should be very easy to integrate
 other Emacs mail programs into @code{mairix.el}
-(@pxref{Extending mairix.el}).
+(@pxref{Extending}).
 
 If you use Gnus with maildir or MH, you should really use the native
 Gnus back end @code{nnmairix} instead, since it is more tightly
@@ -165,8 +165,8 @@
 Note that this may take a few minutes, but every following index will do
 the updates incrementally and hence is very fast.
 
address@hidden Setting up mairix.el
address@hidden Setting up mairix.el
address@hidden Setting up the mairix interface
address@hidden Setting up the mairix interface
 
 First, put @code{mairix.el} in your Emacs search path and put
 @code{(require 'mairix)} into your @file{.emacs} file.  Then, use
@@ -179,13 +179,12 @@
 nnmairix instead.
 
 If you use another Emacs mail program which is not yet supported by
-mairix.el, it is pretty easy to integrate it.  @xref{Extending
-mairix.el}, on how to integrate it into mairix.el.
-
-Now you should be ready to go. @xref{Using mairix.el}, for the available
-commands.
-
address@hidden Using mairix.el
+mairix.el, it is pretty easy to integrate it.  @xref{Extending},
+on how to integrate it into mairix.el.
+
+Now you should be ready to go. @xref{Using}, for the available commands.
+
address@hidden Using
 @chapter Using mairix.el
 
 There are currently no default key bindings for mairix.el, since those
@@ -314,7 +313,7 @@
 @end table
 
 
address@hidden Extending mairix.el
address@hidden Extending
 @chapter Extending mairix.el
 
 Your favorite Emacs mail program is not supported?  Shame on me.  But

=== modified file 'doc/misc/reftex.texi'
--- a/doc/misc/reftex.texi      2013-07-25 07:10:56 +0000
+++ b/doc/misc/reftex.texi      2013-08-13 07:02:00 +0000
@@ -153,7 +153,7 @@
 * Defining Label Environments::        ... and environments it doesn't.
 * Reference Info::                   View the label corresponding to a \ref.
 * Reference Styles::                 Macros to be used instead of \ref.
-* xr (LaTeX package)::               References to external documents.
+* LaTeX xr Package::                 References to external documents.
 
 Defining Label Environments
 
@@ -196,17 +196,17 @@
 
 Options, Keymaps, Hooks
 
-* Options (Table of Contents)::
-* Options (Defining Label Environments)::
-* Options (Creating Labels)::
-* Options (Referencing Labels)::
-* Options (Creating Citations)::
-* Options (Index Support)::
-* Options (Viewing Cross-References)::
-* Options (Finding Files)::
-* Options (Optimizations)::
-* Options (Fontification)::
-* Options (Misc)::
+* Options - Table of Contents::
+* Options - Defining Label Environments::
+* Options - Creating Labels::
+* Options - Referencing Labels::
+* Options - Creating Citations::
+* Options - Index Support::
+* Options - Viewing Cross-References::
+* Options - Finding Files::
+* Options - Optimizations::
+* Options - Fontification::
+* Options - Misc::
 
 @end detailmenu
 @end menu
@@ -581,8 +581,8 @@
 @item mouse-2
 @vindex reftex-highlight-selection
 Clicking with mouse button 2 on a line has the same effect as @key{RET}.
-See also variable @code{reftex-highlight-selection}, @ref{Options
-(Fontification)}.
+See also variable @code{reftex-highlight-selection},
address@hidden - Fontification}.
 
 @item f
 @vindex reftex-toc-follow-mode
@@ -701,9 +701,8 @@
 
 @item x
 Switch to the @file{*toc*} buffer of an external document.  When the
-current document is using the @code{xr} package (@pxref{xr (LaTeX
-package)}), @RefTeX{} will switch to one of the external
-documents.
+current document is using the @code{xr} package (@pxref{LaTeX xr Package}),
address@hidden will switch to one of the external documents.
 
 
 @tablesubheading{Automatic recentering}
@@ -796,7 +795,7 @@
 * Defining Label Environments::        ... and environments it doesn't.
 * Reference Info::                   View the label corresponding to a \ref.
 * Reference Styles::                 Macros to be used instead of \ref.
-* xr (LaTeX package)::               References to external documents.
+* LaTeX xr Package::                 References to external documents.
 @end menu
 
 @node Creating Labels
@@ -859,8 +858,8 @@
 
 @vindex reftex-insert-label-flags
 If you want to change the way certain labels are created, check out the
-variable @code{reftex-insert-label-flags} (@pxref{Options (Creating
-Labels)}).
+variable @code{reftex-insert-label-flags} (@pxref{Options - Creating
+Labels}).
 
 If you are using @AUCTeX{} to write your @LaTeX{} documents, you can
 set it up to delegate the creation of labels to
@@ -981,7 +980,7 @@
 @vindex reftex-highlight-selection
 Clicking with mouse button 2 on a label will accept it like @key{RET}
 would.  See also variable @code{reftex-highlight-selection},
address@hidden (Misc)}.
address@hidden - Misc}.
 
 @vindex reftex-multiref-punctuation
 @item m - + ,
@@ -1034,7 +1033,7 @@
 @tablesubheading{Controlling what gets displayed}
 @vindex reftex-label-menu-flags
 The defaults for the following flags can be configured with the variable
address@hidden (@pxref{Options (Referencing Labels)}).
address@hidden (@pxref{Options - Referencing Labels}).
 
 @item c
 Toggle the display of the one-line label definition context in the
@@ -1082,8 +1081,7 @@
 Reference a label from an external document.  With the @LaTeX{} package
 @code{xr} it is possible to reference labels defined in another
 document.  This key will switch to the label menu of an external
-document and let you select a label from there (@pxref{xr (LaTeX
-package),,xr}).
+document and let you select a label from there (@pxref{LaTeX xr Package,,xr}).
 
 @end table
 
@@ -1203,8 +1201,8 @@
 @vindex reftex-label-alist
 @RefTeX{} can be configured to recognize additional labeled
 environments and macros.  This is done with the variable
address@hidden (@pxref{Options (Defining Label
-Environments)}).  If you are not familiar with Lisp, you can use the
address@hidden (@pxref{Options - Defining Label
+Environments}).  If you are not familiar with Lisp, you can use the
 @code{custom} library to configure this rather complex variable.  To do
 this, use
 
@@ -1302,8 +1300,7 @@
 @code{nil} means to use the text right after the label definition.
 @item
 For more complex ways of getting context, see the variable
address@hidden (@ref{Options (Defining Label
-Environments)}).
address@hidden (@ref{Options - Defining Label Environments}).
 @end itemize
 
 The following list of strings is used to guess the correct label type
@@ -1356,9 +1353,8 @@
 Depending on how you would like the label insertion and selection for
 the new environments to work, you might want to add the letters @samp{a}
 and @samp{h} to some of the flags in the variables
address@hidden (@pxref{Options (Creating Labels)})
-and @code{reftex-label-menu-flags} (@pxref{Options (Referencing
-Labels)}).
address@hidden (@pxref{Options - Creating Labels})
+and @code{reftex-label-menu-flags} (@pxref{Options - Referencing Labels}).
 
 
 @node Quick Equation
@@ -1749,7 +1745,7 @@
 these variables are deprecated now.  Instead of setting them, the
 variable @code{reftex-ref-style-default-list} should be adapted now.
 
address@hidden xr (LaTeX package)
address@hidden LaTeX xr Package
 @section @code{xr}: Cross-Document References
 @cindex @code{xr}, LaTeX package
 @cindex LaTeX packages, @code{xr}
@@ -1883,8 +1879,8 @@
 @item mouse-2
 @vindex reftex-highlight-selection
 Clicking with mouse button 2 on a citation will accept it like @key{RET}
-would.  See also variable @code{reftex-highlight-selection}, @ref{Options
-(Misc)}.
+would.  See also variable @code{reftex-highlight-selection},
address@hidden - Misc}.
 
 @item m
 Mark the current entry.  When one or several entries are marked,
@@ -2403,8 +2399,9 @@
 
 The @samp{Find and Index in Document} menu in the phrases buffer also
 lists a few options for the indexing process.  The options have
-associated customization variables to set the defaults (@pxref{Options
-(Index Support)}).  Here is a short explanation of what the options do:
+associated customization variables to set the defaults
+(@pxref{Options - Index Support}).  Here is a short explanation of
+what the options do:
 
 @table @i
 @item Match Whole Words
@@ -2759,7 +2756,7 @@
 @samp{ref} or @samp{refrange}} of the @code{\ref} macro are active for
 cross-reference display.  This works also for labels defined in an
 external document when the current document refers to them through the
address@hidden interface (@pxref{xr (LaTeX package)}).
address@hidden interface (@pxref{LaTeX xr Package}).
 
 @item @code{\label}
 @cindex @code{\label}
@@ -2908,7 +2905,7 @@
 use faces only when @code{font-lock} is loaded.  This seems to be
 reasonable because people who like faces will very likely have it
 loaded.  If you wish to turn off fontification or change the involved
-faces, see @ref{Options (Fontification)}.
+faces, see @ref{Options - Fontification}.
 
 @node Multifile Documents
 @section Multifile Documents
@@ -3894,21 +3891,21 @@
 reftex-customize} will get you there.
 
 @menu
-* Options (Table of Contents)::
-* Options (Defining Label Environments)::
-* Options (Creating Labels)::
-* Options (Referencing Labels)::
-* Options (Creating Citations)::
-* Options (Index Support)::
-* Options (Viewing Cross-References)::
-* Options (Finding Files)::
-* Options (Optimizations)::
-* Options (Fontification)::
-* Options (Misc)::
+* Options - Table of Contents::
+* Options - Defining Label Environments::
+* Options - Creating Labels::
+* Options - Referencing Labels::
+* Options - Creating Citations::
+* Options - Index Support::
+* Options - Viewing Cross-References::
+* Options - Finding Files::
+* Options - Optimizations::
+* Options - Fontification::
+* Options - Misc::
 * Keymaps and Hooks::
 @end menu
 
address@hidden Options (Table of Contents)
address@hidden Options - Table of Contents
 @section Table of Contents
 @cindex Options, table of contents
 @cindex Table of contents, options
@@ -4032,7 +4029,7 @@
 (@pxref{Table of Contents}).
 @end deffn
 
address@hidden Options (Defining Label Environments)
address@hidden Options - Defining Label Environments
 @section Defining Label Environments
 @cindex Options, defining label environments
 @cindex Defining label environments, options
@@ -4259,7 +4256,7 @@
 non-footnote labels.
 @end defopt
 
address@hidden Options (Creating Labels)
address@hidden Options - Creating Labels
 @section Creating Labels
 @cindex Options, creating labels
 @cindex Creating labels, options
@@ -4375,7 +4372,7 @@
 @end table
 @end defopt
 
address@hidden Options (Referencing Labels)
address@hidden Options - Referencing Labels
 @section Referencing Labels
 @cindex Options, referencing labels
 @cindex Referencing labels, options
@@ -4497,7 +4494,7 @@
 (@pxref{Referencing Labels}).
 @end deffn
 
address@hidden Options (Creating Citations)
address@hidden Options - Creating Citations
 @section Creating Citations
 @cindex Options, creating citations
 @cindex Creating citations, options
@@ -4676,7 +4673,7 @@
 @end defopt
 
 
address@hidden Options (Index Support)
address@hidden Options - Index Support, Options - Viewing Cross-References, 
Options - Creating Citations,  Options
 @section Index Support
 @cindex Options, Index support
 @cindex Index support, options
@@ -4896,7 +4893,7 @@
 (@pxref{Index Support}).
 @end deffn
 
address@hidden Options (Viewing Cross-References)
address@hidden Options - Viewing Cross-References
 @section Viewing Cross-References
 @cindex Options, viewing cross-references
 @cindex Viewing cross-references, options
@@ -4955,7 +4952,7 @@
 scans.  In order to clear it, use @kbd{M-x reftex-reset-mode}.
 @end defopt
 
address@hidden Options (Finding Files)
address@hidden Options - Finding Files
 @section Finding Files
 @cindex Options, Finding Files
 @cindex Finding files, options
@@ -5045,7 +5042,7 @@
 @end defopt
 
 @page
address@hidden Options (Optimizations)
address@hidden Options - Optimizations
 @section Optimizations
 @cindex Options, optimizations
 @cindex Optimizations, options
@@ -5154,7 +5151,7 @@
 address@hidden
 @end defopt
 
address@hidden Options (Fontification)
address@hidden Options - Fontification
 @section Fontification
 @cindex Options, fontification
 @cindex Fontification, options
@@ -5252,7 +5249,7 @@
 Face name for index entries.
 @end defopt
 
address@hidden Options (Misc)
address@hidden Options - Misc
 @section Miscellaneous
 @cindex Options, misc
 

=== modified file 'etc/ChangeLog'
--- a/etc/ChangeLog     2013-08-11 19:43:36 +0000
+++ b/etc/ChangeLog     2013-08-13 07:02:00 +0000
@@ -1,3 +1,9 @@
+2013-08-13  Glenn Morris  <address@hidden>
+
+       * 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  <address@hidden>
 
        * NEWS: Mention -lz and `decompress-gzipped-region'.

=== modified file 'etc/refcards/Makefile'
--- a/etc/refcards/Makefile     2013-01-01 09:11:05 +0000
+++ b/etc/refcards/Makefile     2013-08-12 01:14:23 +0000
@@ -23,6 +23,10 @@
 ## PDF files that are included with Emacs.
 all: refcards_pdf dired-refcards_pdf misc-refcards_pdf
 
+all_pdf: all survival-cards_pdf viper-cards_pdf
+all_ps: refcards_ps dired-refcards_ps misc-refcards_ps survival-cards_ps \
+       viper-cards_ps
+
 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}
@@ -39,7 +43,7 @@
 
 
 ## The following files are not included with Emacs.
-SURVIVAL_CARDS_PDF = survival.pdf cs-survival.pdf sk-survival.pdf
+SURVIVAL_CARDS_PDF = survival.pdf cs-survival.pdf fr-survival.pdf 
sk-survival.pdf
 survival-cards_pdf: ${SURVIVAL_CARDS_PDF}
 survival-cards_ps: ${SURVIVAL_CARDS_PDF:.pdf=.ps}
 
@@ -118,7 +122,7 @@
 ## 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
+de-refcard.ps fr-refcard.ps fr-survival.ps pt-br-refcard.ps orgcard.ps: %.ps: 
%.dvi
        dvips -t a4 -t landscape $< -o $@
 
 ## A4, portrait.
@@ -142,4 +146,12 @@
 clean:
        -rm -f *.dvi *.log *.aux
 
+## 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