diff options
| author | Paul Eggert <eggert@twinsun.com> | 1993-08-28 04:14:25 +0000 |
|---|---|---|
| committer | Paul Eggert <eggert@twinsun.com> | 1993-08-28 04:14:25 +0000 |
| commit | 581315e9a9594c647de6aa0b3380634ff837f190 (patch) | |
| tree | dbd76aec3dec47ffc3cd66c192fc7c1afc90cbee /lisp | |
| parent | 589578bf9f7f1a374b7fbe0427744a2ccdd61403 (diff) | |
| download | emacs-581315e9a9594c647de6aa0b3380634ff837f190.tar.gz | |
(solar-time-string):
Use new calendar-daylight-savings-{starts,ends}-time
vars instead of old calendar-daylight-savings-switchover-time var.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/calendar/solar.el | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lisp/calendar/solar.el b/lisp/calendar/solar.el index e0e51334a2e..61f3b6c4260 100644 --- a/lisp/calendar/solar.el +++ b/lisp/calendar/solar.el @@ -274,8 +274,8 @@ is 'standard and daylight savings time (if available) when its value is Format used is given by `calendar-time-display-form'. Converted to daylight savings time according to `calendar-daylight-savings-starts', -`calendar-daylight-savings-ends', `calendar-daylight-switchover-time', and -`calendar-daylight-savings-offset'." +`calendar-daylight-savings-ends', `calendar-daylight-savings-starts-time', +`calendar-daylight-savings-ends-time', and `calendar-daylight-savings-offset'." (let* ((year (extract-calendar-year date)) (time (round (* 60 time))) (rounded-abs-date (+ (calendar-absolute-from-gregorian date) @@ -283,12 +283,12 @@ savings time according to `calendar-daylight-savings-starts', (dst-starts (and calendar-daylight-savings-starts (+ (calendar-absolute-from-gregorian (eval calendar-daylight-savings-starts)) - (/ calendar-daylight-savings-switchover-time + (/ calendar-daylight-savings-starts-time 60.0 24.0)))) (dst-ends (and calendar-daylight-savings-ends (+ (calendar-absolute-from-gregorian (eval calendar-daylight-savings-ends)) - (/ (- calendar-daylight-savings-switchover-time + (/ (- calendar-daylight-savings-ends-time calendar-daylight-time-offset) 60.0 24.0)))) (dst (and (not (eq style 'standard)) |