from trunk

5 files changed, 29 insertions, 6 deletions

diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE
index 27c15ac5a84..45330262041 100644
--- a/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@ -252,8 +252,6 @@ windows.texi      -- rudalics
 
 * PLANNED ADDITIONS
 
-** CEDET (not for 23.1 due to paperwork issues, perhaps for 23.2)
-** js2-mode
 ** pov-mode (probably not for Emacs-23: waiting for a Free POV-Ray).
 ** gas-mode ?
 
diff --git a/etc/ChangeLog b/etc/ChangeLog
index 6659fd15190..9fbdeabb6cd 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,11 @@
+2010-03-02  Glenn Morris  <rgm@gnu.org>
+
+	* refcards/Makefile: For cs- and sk-, use pdfcsplain if available.
+	(pl-refcard.pdf): Let presence of pdfmex be another test for the
+	required TeX files.  Pass explicit output-format to tex command.
+	(orgcard.pdf): Use ps2pdf, since pdftex tends to produce a
+	portrait layout rather than the desired landscape.
+
 2010-03-01  Glenn Morris  <rgm@gnu.org>
 
 	* refcards/pl-refcard.tex: Double forward-slashes in URL for Mex.
diff --git a/etc/refcards/Makefile b/etc/refcards/Makefile
index 5a98ffd3eb8..c08a9b2cfab 100644
--- a/etc/refcards/Makefile
+++ b/etc/refcards/Makefile
@@ -55,13 +55,19 @@ viper-cards_ps: ${VIPER-CARDS_PDF:.pdf=.ps}
 
 cs-refcard.pdf cs-dired-ref.pdf cs-survival.pdf sk-refcard.pdf \
 sk-dired-ref.pdf sk-survival.pdf: %.pdf:	%.tex
-	csplain "\pdfoutput=1\input $<"
+	if pdfcsplain --version > /dev/null 2> /dev/null; then \
+	  pdfcsplain $<; \
+	else \
+	  csplain "\pdfoutput=1\input $<"; \
+	fi
 
+## Some versions of pdfmex seem to create dvi by default, hence output-format.
 pl-refcard.pdf: %.pdf: %.tex
-	if ! kpsewhich -format=fmt mex > /dev/null; then \
+	if ! kpsewhich -format=fmt mex > /dev/null && \
+	  ! pdfmex --version > /dev/null 2> /dev/null; then \
 	  echo "No mex format found."; false; \
 	fi
-	pdftex $<
+	pdftex -output-format=pdf $<
 
 ru-refcard.pdf: %.pdf: %.tex
 	pdflatex $<
@@ -75,6 +81,10 @@ gnus-refcard.pdf: %.pdf: %.tex gnus-logo.pdf
 gnus-booklet.pdf: gnus-refcard.tex gnus-logo.pdf
 	pdflatex -jobname=gnus-booklet '\def\booklettrue{}\def\letterpapertrue{}\input{gnus-refcard}'
 
+## FIXME just pdftex produces portrait rather than landscape.
+orgcard.pdf: orgcard.ps
+	ps2pdf $<
+
 ## Everything not explicitly listed above.
 %.pdf: %.tex
 	pdftex $<
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8f2c2460aad..ca850a4db59 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-02  Glenn Morris  <rgm@gnu.org>
+
+	* calendar/cal-hebrew.el (holiday-hebrew-passover): Fix date
+	of Yom HaAtzma'ut when it falls on a Monday (rule changed in 2004).
+
 2010-03-01  Alan Mackenzie  <acm@muc.de>
 
 	* progmodes/cc-engine.el (c-remove-stale-state-cache): Correct
diff --git a/lisp/calendar/cal-hebrew.el b/lisp/calendar/cal-hebrew.el
index 330d3c22cb5..2a7556ff322 100644
--- a/lisp/calendar/cal-hebrew.el
+++ b/lisp/calendar/cal-hebrew.el
@@ -505,7 +505,9 @@ or ALL is non-nil."
                       (+ abs-p 18)
                     (if (= (% abs-p 7) 6)
                         (+ abs-p 19)
-                      (+ abs-p 20))))
+                      (if (= (% abs-p 7) 2)
+                          (+ abs-p 21)
+                        (+ abs-p 20)))))
                  "Yom HaAtzma'ut")
            (list (calendar-gregorian-from-absolute (+ abs-p 33))
                  "Lag BaOmer")