# HG changeset patch # User Glenn Morris # Date 1207292813 0 # Node ID 8a8d2922328b3ba37a7f5ac8838f702be8f5d224 # Parent ce3f8a4ae31592004133d07c16a97ce140260008 Update for cal-julian name changes. diff -r ce3f8a4ae315 -r 8a8d2922328b lisp/calendar/solar.el --- a/lisp/calendar/solar.el Fri Apr 04 07:06:37 2008 +0000 +++ b/lisp/calendar/solar.el Fri Apr 04 07:06:53 2008 +0000 @@ -51,7 +51,7 @@ (require 'calendar) (require 'cal-dst) -;; calendar-absolute-from-astro and v versa are cal-autoloads. +;; calendar-astro-to-absolute and v versa are cal-autoloads. ;;;(require 'cal-julian) @@ -723,7 +723,7 @@ `calendar-daylight-savings-starts-time', `calendar-daylight-savings-ends', `calendar-daylight-savings-ends-time', `calendar-daylight-time-offset', and `calendar-time-zone' are used to interpret local time." - (let* ((a-d (calendar-absolute-from-astro d)) + (let* ((a-d (calendar-astro-to-absolute d)) ;; Get Universal Time. (date (calendar-astro-from-absolute (- a-d @@ -735,7 +735,7 @@ (extract-calendar-year (calendar-gregorian-from-absolute (floor - (calendar-absolute-from-astro + (calendar-astro-to-absolute date))))))) (U (/ (- date 2451545) 3652500)) (longitude @@ -1041,7 +1041,7 @@ ;; (calendar-absolute-from-gregorian ;; (list (+ 3 (* k 3)) 15 y))) ;; 90)) - ;; (abs-day (calendar-absolute-from-astro d))) + ;; (abs-day (calendar-astro-to-absolute d))) (abs-day (calendar-absolute-from-gregorian d))) (list (list (calendar-gregorian-from-absolute (floor abs-day))