[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/lisp ChangeLog calendar/cal-dst.el
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] emacs/lisp ChangeLog calendar/cal-dst.el |
Date: |
Tue, 23 Jun 2009 07:30:33 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Glenn Morris <gm> 09/06/23 07:30:32
Modified files:
lisp : ChangeLog
lisp/calendar : cal-dst.el
Log message:
(calendar-time-zone-daylight-rules): Simplify Persian conditionals.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15722&r2=1.15723
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/calendar/cal-dst.el?cvsroot=emacs&r1=1.50&r2=1.51
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15722
retrieving revision 1.15723
diff -u -b -r1.15722 -r1.15723
--- ChangeLog 23 Jun 2009 07:28:19 -0000 1.15722
+++ ChangeLog 23 Jun 2009 07:30:25 -0000 1.15723
@@ -1,5 +1,8 @@
2009-06-23 Glenn Morris <address@hidden>
+ * 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'.
Index: calendar/cal-dst.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/calendar/cal-dst.el,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -b -r1.50 -r1.51
--- calendar/cal-dst.el 10 Jun 2009 01:32:59 -0000 1.50
+++ calendar/cal-dst.el 23 Jun 2009 07:30:30 -0000 1.51
@@ -212,10 +212,10 @@
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))
+ (and (= m 3) (memq d '(20 21))
'((calendar-gregorian-from-absolute
(calendar-persian-to-absolute `(1 1 ,(- year 621))))))
- (if (and (= m 9) (<= 22 d) (<= d 23))
+ (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