# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1245742225 0
# Node ID decf5e666b9ed81b30c856ed6ace3069c0d57b5e
# Parent  c2bcca5f9ba3d997f5c20feb72c6c1fdd926e8cd
(calendar-time-zone-daylight-rules): Simplify Persian conditionals.

diff -r c2bcca5f9ba3 -r decf5e666b9e lisp/ChangeLog
--- a/lisp/ChangeLog	Tue Jun 23 07:28:19 2009 +0000
+++ b/lisp/ChangeLog	Tue Jun 23 07:30:25 2009 +0000
@@ -1,5 +1,8 @@
 2009-06-23  Glenn Morris  <rgm@gnu.org>
 
+	* calendar/cal-dst.el (calendar-time-zone-daylight-rules):
+	Simplify Persian conditionals.
+
 	* calc/calc-graph.el (calc-graph-plot): Avoid assignment to free
 	variable `filename'.
 
diff -r c2bcca5f9ba3 -r decf5e666b9e lisp/calendar/cal-dst.el
--- a/lisp/calendar/cal-dst.el	Tue Jun 23 07:28:19 2009 +0000
+++ b/lisp/calendar/cal-dst.el	Tue Jun 23 07:30:25 2009 +0000
@@ -212,12 +212,12 @@
              rlist)
            ;; 01-01 and 07-01 for this year's Persian calendar.
            ;; FIXME what does the Persian calendar have to do with this?
-           (if (and (= m 3) (<= 20 d) (<= d 21))
-               '((calendar-gregorian-from-absolute
-                  (calendar-persian-to-absolute `(1 1 ,(- year 621))))))
-           (if (and (= m 9) (<= 22 d) (<= d 23))
-               '((calendar-gregorian-from-absolute
-                  (calendar-persian-to-absolute `(7 1 ,(- year 621))))))))
+           (and (= m 3) (memq d '(20 21))
+                '((calendar-gregorian-from-absolute
+                   (calendar-persian-to-absolute `(1 1 ,(- year 621))))))
+           (and (= m 9) (memq d '(22 23))
+                '((calendar-gregorian-from-absolute
+                   (calendar-persian-to-absolute `(7 1 ,(- year 621))))))))
          (prevday-sec (- -1 utc-diff)) ; last sec of previous local day
          (year (1+ y))
          new-rules)