diff options
| author | Glenn Morris | 2008-03-26 03:10:23 +0000 |
|---|---|---|
| committer | Glenn Morris | 2008-03-26 03:10:23 +0000 |
| commit | 06e3b7ae73ca87e3450a32efb5228e7dd296766d (patch) | |
| tree | 84305d34f1a6b8937d2454b9d46f72b0fbd7c803 | |
| parent | dad6b4ee590e419d1cf0b1120915386a0e9117f9 (diff) | |
| download | emacs-06e3b7ae73ca87e3450a32efb5228e7dd296766d.tar.gz emacs-06e3b7ae73ca87e3450a32efb5228e7dd296766d.zip | |
Don't require cal-persia.
(calendar-absolute-from-persian): Autoload it.
(dst-adjust-time): Doc fix.
| -rw-r--r-- | lisp/calendar/cal-dst.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/calendar/cal-dst.el b/lisp/calendar/cal-dst.el index b2bc8c36d3a..f4512fa12ea 100644 --- a/lisp/calendar/cal-dst.el +++ b/lisp/calendar/cal-dst.el | |||
| @@ -34,7 +34,6 @@ | |||
| 34 | ;;; Code: | 34 | ;;; Code: |
| 35 | 35 | ||
| 36 | (require 'calendar) | 36 | (require 'calendar) |
| 37 | (require 'cal-persia) | ||
| 38 | 37 | ||
| 39 | 38 | ||
| 40 | (defgroup calendar-dst nil | 39 | (defgroup calendar-dst nil |
| @@ -183,6 +182,8 @@ Return nil if no such transition can be found." | |||
| 183 | (setq lo probe))) | 182 | (setq lo probe))) |
| 184 | hi)))) | 183 | hi)))) |
| 185 | 184 | ||
| 185 | (autoload 'calendar-absolute-from-persian "cal-persia") | ||
| 186 | |||
| 186 | (defun calendar-time-zone-daylight-rules (abs-date utc-diff) | 187 | (defun calendar-time-zone-daylight-rules (abs-date utc-diff) |
| 187 | "Return daylight transition rule for ABS-DATE, UTC-DIFF sec offset from UTC. | 188 | "Return daylight transition rule for ABS-DATE, UTC-DIFF sec offset from UTC. |
| 188 | ABS-DATE must specify a day that contains a daylight saving transition. | 189 | 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 | |||
| 463 | Conversion to daylight saving time is done according to | 464 | Conversion to daylight saving time is done according to |
| 464 | `calendar-daylight-savings-starts', `calendar-daylight-savings-ends', | 465 | `calendar-daylight-savings-starts', `calendar-daylight-savings-ends', |
| 465 | `calendar-daylight-savings-starts-time', | 466 | `calendar-daylight-savings-starts-time', |
| 466 | `calendar-daylight-savings-ends-time', and | 467 | `calendar-daylight-savings-ends-time', and `calendar-daylight-time-offset'." |
| 467 | `calendar-daylight-savings-offset'." | ||
| 468 | 468 | ||
| 469 | (let* ((rounded-abs-date (+ (calendar-absolute-from-gregorian date) | 469 | (let* ((rounded-abs-date (+ (calendar-absolute-from-gregorian date) |
| 470 | (/ (round (* 60 time)) 60.0 24.0))) | 470 | (/ (round (* 60 time)) 60.0 24.0))) |