diff options
author | Glenn Morris <rgm@gnu.org> | 2008-04-04 07:06:53 +0000 |
---|---|---|
committer | Glenn Morris <rgm@gnu.org> | 2008-04-04 07:06:53 +0000 |
commit | 5c645a20f4a14a95d8363488c44a402d14adad1c (patch) | |
tree | 023a58688dddb9dd0754f8c375bc5210a908257f /lisp/calendar/lunar.el | |
parent | bd773d17f8630129e0768e77a05801d6708f7c91 (diff) | |
download | emacs-5c645a20f4a14a95d8363488c44a402d14adad1c.tar.gz |
Update for cal-julian name changes.
Diffstat (limited to 'lisp/calendar/lunar.el')
-rw-r--r-- | lisp/calendar/lunar.el | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lisp/calendar/lunar.el b/lisp/calendar/lunar.el index b1ac809ec61..549bf689c29 100644 --- a/lisp/calendar/lunar.el +++ b/lisp/calendar/lunar.el @@ -43,7 +43,7 @@ (require 'calendar) (require 'solar) (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) (defun lunar-phase (index) @@ -354,7 +354,7 @@ use when highlighting the day in the calendar." (- (solar-ephemeris-correction (extract-calendar-year (calendar-gregorian-from-absolute - (floor (calendar-absolute-from-astro newJDE)))))) + (floor (calendar-astro-to-absolute newJDE)))))) (/ calendar-time-zone 60.0 24.0)))) (defun lunar-new-moon-on-or-after (d) @@ -367,7 +367,7 @@ as governed by the values of `calendar-daylight-savings-starts', `calendar-daylight-savings-ends-time', `calendar-daylight-time-offset', and `calendar-time-zone'." (let* ((date (calendar-gregorian-from-absolute - (floor (calendar-absolute-from-astro d)))) + (floor (calendar-astro-to-absolute d)))) (year (+ (extract-calendar-year date) (/ (calendar-day-number date) 365.25))) (k (floor (* (- year 2000.0) 12.3685))) @@ -376,7 +376,7 @@ as governed by the values of `calendar-daylight-savings-starts', (while (< date d) (setq k (1+ k) date (lunar-new-moon-time k))) - (calendar-absolute-from-astro date))) + (calendar-astro-to-absolute date))) (time (* 24 (- a-date (truncate a-date)))) (date (calendar-gregorian-from-absolute (truncate a-date))) (adj (dst-adjust-time date time))) |