# HG changeset patch
# User Kenichi Handa  <handa@m17n.org>
# Date 1267505644 -32400
# Node ID 72a86cbe50bc77662e775e7af30771f6fc94a61b
# Parent  5e25c4602dd49db0b31301b2930024deaa9b54fb# Parent  994a9686476c172b31108ce4516107ff9908276c
from trunk

diff -r 5e25c4602dd4 -r 72a86cbe50bc admin/FOR-RELEASE
--- a/admin/FOR-RELEASE	Tue Mar 02 13:44:28 2010 +0900
+++ b/admin/FOR-RELEASE	Tue Mar 02 13:54:04 2010 +0900
@@ -252,8 +252,6 @@
 
 * 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 -r 5e25c4602dd4 -r 72a86cbe50bc etc/ChangeLog
--- a/etc/ChangeLog	Tue Mar 02 13:44:28 2010 +0900
+++ b/etc/ChangeLog	Tue Mar 02 13:54:04 2010 +0900
@@ -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 -r 5e25c4602dd4 -r 72a86cbe50bc etc/refcards/Makefile
--- a/etc/refcards/Makefile	Tue Mar 02 13:44:28 2010 +0900
+++ b/etc/refcards/Makefile	Tue Mar 02 13:54:04 2010 +0900
@@ -55,13 +55,19 @@
 
 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-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 -r 5e25c4602dd4 -r 72a86cbe50bc lisp/ChangeLog
--- a/lisp/ChangeLog	Tue Mar 02 13:44:28 2010 +0900
+++ b/lisp/ChangeLog	Tue Mar 02 13:54:04 2010 +0900
@@ -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 -r 5e25c4602dd4 -r 72a86cbe50bc lisp/calendar/cal-hebrew.el
--- a/lisp/calendar/cal-hebrew.el	Tue Mar 02 13:44:28 2010 +0900
+++ b/lisp/calendar/cal-hebrew.el	Tue Mar 02 13:54:04 2010 +0900
@@ -505,7 +505,9 @@
                       (+ 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")