Don't require cal-persia.

(calendar-absolute-from-persian): Autoload it.
(dst-adjust-time): Doc fix.

diff --git a/lisp/calendar/cal-dst.el b/lisp/calendar/cal-dst.el
index b2bc8c36d3ac22c52a14bb05e0f69543a23ded0d..f4512fa12eac31e56fed93f8400de5496423ebc2 100644 (file)
--- a/lisp/calendar/cal-dst.el
+++ b/lisp/calendar/cal-dst.el
@@ -34,7 +34,6 @@
 ;;; Code:
 
 (require 'calendar)
-(require 'cal-persia)
 
 
 (defgroup calendar-dst nil
@@ -183,6 +182,8 @@ Return nil if no such transition can be found."
            (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 @@ value is 'standard and daylight saving time (if available) when its value is
 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)))