diff options
| author | Edward M. Reingold <reingold@emr.cs.iit.edu> | 1996-04-27 00:13:07 +0000 |
|---|---|---|
| committer | Edward M. Reingold <reingold@emr.cs.iit.edu> | 1996-04-27 00:13:07 +0000 |
| commit | 2396dbcbdd306b91139e05334ffeefa88fc4c369 (patch) | |
| tree | 5d4d6c0fea7899d8ace1cee6edbe7b16544eadb3 /lisp/calendar/solar.el | |
| parent | 2f8d25d5f1d9fae51ace43a4a783c2259e91b170 (diff) | |
| download | emacs-2396dbcbdd306b91139e05334ffeefa88fc4c369.tar.gz | |
Double DST correction removed!
Diffstat (limited to 'lisp/calendar/solar.el')
| -rw-r--r-- | lisp/calendar/solar.el | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/lisp/calendar/solar.el b/lisp/calendar/solar.el index 3a573620ab2..936f78501b1 100644 --- a/lisp/calendar/solar.el +++ b/lisp/calendar/solar.el @@ -883,13 +883,11 @@ No diary entry if there is no sunset on that date." (solar-setup)) (if (= (% (calendar-absolute-from-gregorian date) 7) 5);; Friday (let* ((sunset (car (cdr (solar-sunrise-sunset date)))) - (light (if sunset - (dst-adjust-time - date - (- (car sunset) (/ 18.0 60.0)))))) - (if (and light (calendar-date-equal date (car light))) + (light (if sunset + (cons (- (car sunset) (/ 18.0 60.0)) (cdr sunset))))) + (if sunset (format "%s Sabbath candle lighting" - (apply 'solar-time-string (cdr light))))))) + (apply 'solar-time-string light)))))) (defun solar-equinoxes/solstices (k year) "Date of equinox/solstice K for YEAR. |