merge trunk

3 files changed, 31 insertions, 36 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index c1cb67a6a67..bd5534d9446 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,9 @@
+2013-09-09  Glenn Morris  <rgm@gnu.org>
+
+        * refcards/Makefile (PS_ENGLISH, PS_CZECH, PS_FRENCH, PS_GERMAN)
+        (PS_POLISH, PS_PORTUGUESE, PS_RUSSIAN, PS_SLOVAKIAN, PS_TARGETS):
+        Use substitution refs.
+
 2013-08-15  Glenn Morris  <rgm@gnu.org>
 
         * refcards/calccard.pdf, refcards/cs-dired-ref.pdf:
diff --git a/etc/NEWS b/etc/NEWS
index cd69a8e09a0..a5da8eaa893 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -34,6 +34,10 @@ build time.  To prevent this, use the configure option
 `--with-file-notification-no'.  See below for file-notify features.
 FIXME?  This feature is not available for the Nextstep port. (?)
 
+** The configure option `without-compress-info' has been generalized,
+and renamed to `without-compress-install'.  It now prevents compression
+of _any_ files during installation.
+
 ** The configure option --with-crt-dir has been removed.
 It is no longer needed, as the crt*.o files are no longer linked
 specially.
@@ -610,9 +614,20 @@ file using `set-file-extended-attributes'.
 ** `visited-file-modtime' now returns -1 for nonexistent files.
 Formerly it returned a list (-1 LOW USEC PSEC), but this was ambiguous
 in the presence of files with negative time stamps.
+
+** The cars of the elements in `interpreter-mode-alist' are now treated
+as regexps rather than literal strings.  Technically this is an
+incompatible change, but unless you are using interpreter-mode-alist
+for something (not just adding elements to it), it ought not to affect you.
+
 
 * Lisp Changes in Emacs 24.4
 
+** Comparison functions =, <, >, <=, >= now take many arguments.
+
+** The second argument of `eval' can now be a lexical-environment.
+
+** `with-demoted-errors' takes an additional argument `format'.
 +++
 ** New function `define-error'.
 
diff --git a/etc/refcards/Makefile b/etc/refcards/Makefile
index 36abf67d594..0931540e4d8 100644
--- a/etc/refcards/Makefile
+++ b/etc/refcards/Makefile
@@ -58,42 +58,16 @@ PDF_SLOVAKIAN = \
 PDF_TARGETS = $(PDF_ENGLISH) $(PDF_CZECH) $(PDF_FRENCH) $(PDF_GERMAN) \
         $(PDF_POLISH) $(PDF_PORTUGUESE) $(PDF_RUSSIAN) $(PDF_SLOVAKIAN)
 
-PS_ENGLISH = \
-        calccard.ps \
-        dired-ref.ps \
-        gnus-booklet.ps \
-        gnus-refcard.ps \
-        orgcard.ps \
-        refcard.ps \
-        survival.ps \
-        vipcard.ps \
-        viperCard.ps
-
-PS_CZECH = \
-        cs-dired-ref.ps \
-        cs-refcard.ps \
-        cs-survival.ps
-
-PS_FRENCH = \
-        fr-dired-ref.ps \
-        fr-refcard.ps \
-        fr-survival.ps \
-
-PS_GERMAN = de-refcard.ps
-
-PS_POLISH = pl-refcard.ps
-
-PS_PORTUGUESE = pt-br-refcard.ps
-
-PS_RUSSIAN = ru-refcard.ps
-
-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)
+PS_ENGLISH = $(PDF_ENGLISH:.pdf=.ps)
+PS_CZECH = $(PDF_CZECH:.pdf=.ps)
+PS_FRENCH = $(PDF_FRENCH:.pdf=.ps)
+PS_GERMAN = $(PDF_GERMAN:.pdf=.ps)
+PS_POLISH = $(PDF_POLISH:.pdf=.ps)
+PS_PORTUGUESE = $(PDF_PORTUGUESE:.pdf=.ps)
+PS_RUSSIAN = $(PDF_RUSSIAN:.pdf=.ps)
+PS_SLOVAKIAN = $(PDF_SLOVAKIAN:.pdf=.ps)
+
+PS_TARGETS = $(PDF_TARGETS:.pdf=.ps)
 
 
 ## For emacsver.tex.