Mercurial > emacs
changeset 4657:5049c683d5e9
(solar-time-string):
Use new calendar-daylight-savings-{starts,ends}-time
vars instead of old calendar-daylight-savings-switchover-time var.
author | Paul Eggert <eggert@twinsun.com> |
---|---|
date | Sat, 28 Aug 1993 04:14:25 +0000 |
parents | 29bd5f3d0059 |
children | a34bd3ee36ef |
files | lisp/calendar/solar.el |
diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/calendar/solar.el Fri Aug 27 03:55:16 1993 +0000 +++ b/lisp/calendar/solar.el Sat Aug 28 04:14:25 1993 +0000 @@ -274,8 +274,8 @@ 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 @@ (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))