Mercurial > emacs

changeset 7779:866b98279551

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(solar-holidays): Revised to use the rewritten and new fcns.
author Edward M. Reingold <reingold@emr.cs.iit.edu>
date Fri, 03 Jun 1994 20:27:02 +0000
parents b0e2bd1e825a
children 98874151109a
files lisp/calendar/calendar.el
diffstat 1 files changed, 4 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/calendar/calendar.el	Fri Jun 03 20:26:33 1994 +0000
+++ b/lisp/calendar/calendar.el	Fri Jun 03 20:27:02 1994 +0000
@@ -807,10 +807,8 @@
         '(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 @@
      '(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.")