Double DST correction removed!

2396dbcb · Edward M. Reingold · 2f8d25d5 · 2396dbcb
Commit 2396dbcb authored Apr 27, 1996 by Edward M. Reingold
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 6 deletions

lisp/calendar/solar.el lisp/calendar/solar.el +4 -6

No files found.
--- a/lisp/calendar/solar.el
+++ b/lisp/calendar/solar.el
@@ -884,12 +884,10 @@ No diary entry if there is no sunset on that date."
  (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)))
+                        (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.