Mercurial > emacs
changeset 93650:e13ec6b5b482
Update for cal-persia name changes.
author | Glenn Morris <rgm@gnu.org> |
---|---|
date | Fri, 04 Apr 2008 07:35:23 +0000 |
parents | 498835e424c8 |
children | 1500b4e92cd0 |
files | lisp/calendar/cal-dst.el |
diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/calendar/cal-dst.el Fri Apr 04 07:34:56 2008 +0000 +++ b/lisp/calendar/cal-dst.el Fri Apr 04 07:35:23 2008 +0000 @@ -181,7 +181,7 @@ (setq lo probe))) hi)))) -(autoload 'calendar-absolute-from-persian "cal-persia") +(autoload 'calendar-persian-to-absolute "cal-persia") (defun calendar-time-zone-daylight-rules (abs-date utc-diff) "Return daylight transition rule for ABS-DATE, UTC-DIFF sec offset from UTC. @@ -214,10 +214,10 @@ ;; FIXME what does the Persian calendar have to do with this? (if (and (= m 3) (<= 20 d) (<= d 21)) '((calendar-gregorian-from-absolute - (calendar-absolute-from-persian `(1 1 ,(- year 621)))))) + (calendar-persian-to-absolute `(1 1 ,(- year 621)))))) (if (and (= m 9) (<= 22 d) (<= d 23)) '((calendar-gregorian-from-absolute - (calendar-absolute-from-persian `(7 1 ,(- year 621)))))))) + (calendar-persian-to-absolute `(7 1 ,(- year 621)))))))) (prevday-sec (- -1 utc-diff)) ; last sec of previous local day (year (1+ y)) new-rules)