(solar-holidays): Revised to use the rewritten and new fcns.

diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el
index df525a47abc9b29880b00ae943ff2d4e33643bb5..e1355cd5442e09acd46da78400cd6a830ea55633 100644 (file)
--- a/lisp/calendar/calendar.el
+++ b/lisp/calendar/calendar.el
@@ -807,10 +807,8 @@ See the documentation for `calendar-holidays' for details.")
         '(format "Daylight Savings Time Begins %s"
                   (if (fboundp 'atan)
                       (solar-time-string
-                       (/ calendar-daylight-savings-starts-time
-                          (float 60))
-                       date
-                       'standard)
+                       (/ calendar-daylight-savings-starts-time (float 60))
+                       calendar-standard-time-zone-name)
                     ""))))
     (funcall
      'holiday-sexp
@@ -818,11 +816,8 @@ See the documentation for `calendar-holidays' for details.")
      '(format "Daylight Savings Time Ends %s"
               (if (fboundp 'atan)
                   (solar-time-string
-                   (/ (- calendar-daylight-savings-ends-time
-                         calendar-daylight-time-offset)
-                      (float 60))
-                   date
-                   'daylight)
+                   (/ calendar-daylight-savings-ends-time (float 60))
+                   calendar-daylight-time-zone-name)
                 ""))))
   "*Sun-related holidays.
 See the documentation for `calendar-holidays' for details.")