From 5c645a20f4a14a95d8363488c44a402d14adad1c Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Fri, 4 Apr 2008 07:06:53 +0000 Subject: [PATCH] Update for cal-julian name changes. --- lisp/calendar/cal-china.el | 6 +++--- lisp/calendar/cal-coptic.el | 4 ++-- lisp/calendar/holidays.el | 4 ++-- lisp/calendar/lunar.el | 8 ++++---- lisp/calendar/solar.el | 8 ++++---- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/lisp/calendar/cal-china.el b/lisp/calendar/cal-china.el index ea4c1e92ad4..116c2950df7 100644 --- a/lisp/calendar/cal-china.el +++ b/lisp/calendar/cal-china.el @@ -51,7 +51,7 @@ (require 'lunar) ; lunar-new-moon-on-or-after ;; solar-date-next-longitude brought in by lunar. ;;;(require 'solar) -;; calendar-absolute-from-astro and v versa are cal-autoloads. +;; calendar-astro-to-absolute and from-absolute are cal-autoloads. ;;;(require 'cal-julian) @@ -195,7 +195,7 @@ The Zodiac signs begin when the sun's longitude is a multiple of 30 degrees." (calendar-daylight-savings-ends-time chinese-calendar-daylight-savings-ends-time)) (floor - (calendar-absolute-from-astro + (calendar-astro-to-absolute (solar-date-next-longitude (calendar-astro-from-absolute d) 30))))) (defun chinese-new-moon-on-or-after (d) @@ -217,7 +217,7 @@ The Zodiac signs begin when the sun's longitude is a multiple of 30 degrees." (calendar-daylight-savings-ends-time chinese-calendar-daylight-savings-ends-time)) (floor - (calendar-absolute-from-astro + (calendar-astro-to-absolute (lunar-new-moon-on-or-after (calendar-astro-from-absolute d)))))) (defun chinese-month-list (start end) diff --git a/lisp/calendar/cal-coptic.el b/lisp/calendar/cal-coptic.el index 963d22312f9..961ce35bf98 100644 --- a/lisp/calendar/cal-coptic.el +++ b/lisp/calendar/cal-coptic.el @@ -41,10 +41,10 @@ "Array of the month names in the Coptic calendar.") (eval-and-compile - (autoload 'calendar-absolute-from-julian "cal-julian")) + (autoload 'calendar-julian-to-absolute "cal-julian")) (defvar coptic-calendar-epoch - (eval-when-compile (calendar-absolute-from-julian '(8 29 284))) + (eval-when-compile (calendar-julian-to-absolute '(8 29 284))) "Absolute date of start of Coptic calendar = August 29, 284 AD (Julian).") (defvar coptic-name "Coptic" diff --git a/lisp/calendar/holidays.el b/lisp/calendar/holidays.el index 67f53af7e51..8660d247d98 100644 --- a/lisp/calendar/holidays.el +++ b/lisp/calendar/holidays.el @@ -439,7 +439,7 @@ is non-nil)." (list (list greg string)))))) ;; Prior call to calendar-julian-from-absolute will autoload cal-julian. -(declare-function calendar-absolute-from-julian "cal-julian" (date)) +(declare-function calendar-julian-to-absolute "cal-julian" (date)) (defun holiday-greek-orthodox-easter () "Date of Easter according to the rule of the Council of Nicaea." @@ -456,7 +456,7 @@ is non-nil)." (* 11 (% julian-year 19))) 30)) (paschal-moon ; day after full moon on or after March 21 - (- (calendar-absolute-from-julian (list 4 19 julian-year)) + (- (calendar-julian-to-absolute (list 4 19 julian-year)) shifted-epact)) (nicaean-easter ; Sunday following the Paschal moon (calendar-gregorian-from-absolute 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))) diff --git a/lisp/calendar/solar.el b/lisp/calendar/solar.el index 3d8b1d4f8ba..c88b4c6f765 100644 --- a/lisp/calendar/solar.el +++ b/lisp/calendar/solar.el @@ -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 @@ The values of `calendar-daylight-savings-starts', `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 @@ The values of `calendar-daylight-savings-starts', (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 @@ Requires floating point." ;; (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)) -- 2.39.2