[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/07 01:59:37

Index: cal-dst.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/calendar/cal-dst.el,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- cal-dst.el  5 Apr 2008 20:25:18 -0000       1.45
+++ cal-dst.el  7 Apr 2008 01:59:36 -0000       1.46
@@ -189,9 +189,9 @@
 The result has the proper form for `calendar-daylight-savings-starts'."
   (let* ((date (calendar-gregorian-from-absolute abs-date))
          (weekday (% abs-date 7))
-         (m (extract-calendar-month date))
-         (d (extract-calendar-day date))
-         (y (extract-calendar-year date))
+         (m (calendar-extract-month date))
+         (d (calendar-extract-day date))
+         (y (calendar-extract-year date))
          (last (calendar-last-day-of-month m y))
          j rlist
          (candidate-rules               ; these return Gregorian dates
@@ -423,7 +423,7 @@
 (defun dst-in-effect (date)
   "True if on absolute DATE daylight saving time is in effect.
 Fractional part of DATE is local standard time of day."
-  (let* ((year (extract-calendar-year
+  (let* ((year (calendar-extract-year
                 (calendar-gregorian-from-absolute (floor date))))
          (dst-starts-gregorian (eval calendar-daylight-savings-starts))
          (dst-ends-gregorian (eval calendar-daylight-savings-ends))