mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-28 07:45:00 +00:00
Code Issues Releases Activity

(calendar-time-zone-daylight-rules): Simplify Persian conditionals.

Browse Source
This commit is contained in:
Glenn Morris 2009-06-23 07:30:25 +00:00
parent d916c9650d
commit 84cb770dc9
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lisp/ChangeLog
View File

@ -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'.

12
lisp/calendar/cal-dst.el
View File

@ -212,12 +212,12 @@ The result has the proper form for `calendar-daylight-savings-starts'."
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)