# HG changeset patch # User Glenn Morris # Date 1207885435 0 # Node ID 09c830b8981def8f47931a23aa79502b95902704 # Parent 7f03edf180ca60bb2057955745e4d6a392cf5e43 (calendar-dst-check-each-year-flag): Fix custom group. (calendar-current-time-zone-cache): Autoload riskiness. diff -r 7f03edf180ca -r 09c830b8981d lisp/calendar/cal-dst.el --- a/lisp/calendar/cal-dst.el Fri Apr 11 03:41:34 2008 +0000 +++ b/lisp/calendar/cal-dst.el Fri Apr 11 03:43:55 2008 +0000 @@ -49,7 +49,7 @@ change." :type 'boolean :version "22.1" - :group 'calendar) + :group 'calendar-dst) ;;;###autoload (put 'calendar-daylight-savings-starts 'risky-local-variable t) @@ -95,7 +95,9 @@ (defvar calendar-current-time-zone-cache nil "Cache for result of `calendar-current-time-zone'.") -(put 'calendar-current-time-zone-cache 'risky-local-variable t) ; why? +;; It gets eval'd, eg by calendar-dst-starts. +;;;###autoload +(put 'calendar-current-time-zone-cache 'risky-local-variable t) (defvar calendar-system-time-basis (calendar-absolute-from-gregorian '(1 1 1970)) @@ -420,6 +422,7 @@ (and (not (zerop calendar-daylight-time-offset)) (calendar-nth-named-day 1 0 11 year)))) +;; used by calc, solar. (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." @@ -443,6 +446,7 @@ (and (<= dst-starts date) (< date dst-ends)) (or (<= dst-starts date) (< date dst-ends)))))) +;; used by calc, lunar, solar. (defun dst-adjust-time (date time &optional style) "Adjust, to account for dst on DATE, decimal fraction standard TIME. Returns a list (date adj-time zone) where `date' and `adj-time' are the values @@ -457,7 +461,6 @@ `calendar-daylight-savings-starts', `calendar-daylight-savings-ends', `calendar-daylight-savings-starts-time', `calendar-daylight-savings-ends-time', and `calendar-daylight-time-offset'." - (let* ((rounded-abs-date (+ (calendar-absolute-from-gregorian date) (/ (round (* 60 time)) 60.0 24.0))) (dst (dst-in-effect rounded-abs-date))