# HG changeset patch # User Glenn Morris # Date 1206501023 0 # Node ID 380387e4c93c009081606a6ba824911a660b5cb1 # Parent 546789da9d8f41abd8c9fa2768b9f3fde0f6fc00 Don't require cal-persia. (calendar-absolute-from-persian): Autoload it. (dst-adjust-time): Doc fix. diff -r 546789da9d8f -r 380387e4c93c lisp/calendar/cal-dst.el --- a/lisp/calendar/cal-dst.el Wed Mar 26 03:10:04 2008 +0000 +++ b/lisp/calendar/cal-dst.el Wed Mar 26 03:10:23 2008 +0000 @@ -34,7 +34,6 @@ ;;; Code: (require 'calendar) -(require 'cal-persia) (defgroup calendar-dst nil @@ -183,6 +182,8 @@ (setq lo probe))) hi)))) +(autoload 'calendar-absolute-from-persian "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. ABS-DATE must specify a day that contains a daylight saving transition. @@ -463,8 +464,7 @@ Conversion to daylight saving time is done according to `calendar-daylight-savings-starts', `calendar-daylight-savings-ends', `calendar-daylight-savings-starts-time', -`calendar-daylight-savings-ends-time', and -`calendar-daylight-savings-offset'." +`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)))