# HG changeset patch # User Edward M. Reingold # Date 770675222 0 # Node ID 866b98279551c5379aac87aced7ee77d2cdb3a92 # Parent b0e2bd1e825acc7b21f4e9b720380a11acd706cb (solar-holidays): Revised to use the rewritten and new fcns. diff -r b0e2bd1e825a -r 866b98279551 lisp/calendar/calendar.el --- 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.")