[Emacs-diffs] Changes to emacs/lisp/calendar/cal-dst.el,v

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       08/04/04 07:35:23

Index: cal-dst.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/calendar/cal-dst.el,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- cal-dst.el  2 Apr 2008 03:18:55 -0000       1.42
+++ cal-dst.el  4 Apr 2008 07:35:23 -0000       1.43
@@ -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)