From: Edward M. Reingold <reingold@emr.cs.iit.edu>
Date: Sat, 27 Apr 1996 00:13:07 +0000 (+0000)
Subject: Double DST correction removed!
X-Git-Tag: emacs-19.34~766
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2396dbcbdd306b91139e05334ffeefa88fc4c369;p=emacs.git

Double DST correction removed!
---

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.