From 7e2f1bb5592c89d6af350e6bac5e121a5db2db73 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sat, 8 Mar 2008 21:07:21 +0000 Subject: [PATCH] Formatting changes only. --- lisp/calendar/holidays.el | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/lisp/calendar/holidays.el b/lisp/calendar/holidays.el index 593e0f307f6..6b32d227c1a 100644 --- a/lisp/calendar/holidays.el +++ b/lisp/calendar/holidays.el @@ -358,25 +358,25 @@ Returns nil if it is not visible in the current calendar window." (y2 y1)) (increment-calendar-month m1 y1 -1) (increment-calendar-month m2 y2 1) - (let* ((d1; first possible base date for holiday + (let* ((d1 ; first possible base date for holiday (+ (calendar-nth-named-absday 1 dayname m1 y1) (* -7 n) (if (> n 0) 1 -7))) - (d2; last possible base date for holiday + (d2 ; last possible base date for holiday (+ (calendar-nth-named-absday -1 dayname m2 y2) (* -7 n) (if (> n 0) 7 -1))) (y1 (extract-calendar-year (calendar-gregorian-from-absolute d1))) (y2 (extract-calendar-year (calendar-gregorian-from-absolute d2))) - (y; year of base date + (y ; year of base date (if (or (= y1 y2) (> month 9)) y1 y2)) - (d; day of base date + (d ; day of base date (or day (if (> n 0) 1 (calendar-last-day-of-month month y)))) - (date; base date for holiday + (date ; base date for holiday (calendar-absolute-from-gregorian (list month d y)))) (if (and (<= d1 date) (<= date d2)) (list (list (calendar-nth-named-day n dayname month y d) @@ -467,20 +467,20 @@ is non-nil)." (if (setq res (holiday-easter-etc (car elem) (cdr elem))) (setq res-list (append res res-list))))) (let* ((century (1+ (/ displayed-year 100))) - (shifted-epact ;; Age of moon for April 5... - (% (+ 14 (* 11 (% displayed-year 19)) ;; ...by Nicaean rule - (- ;; ...corrected for the Gregorian century rule + (shifted-epact ; age of moon for April 5... + (% (+ 14 (* 11 (% displayed-year 19)) ; ...by Nicaean rule + (- ; ...corrected for the Gregorian century rule (/ (* 3 century) 4)) - (/ ;; ...corrected for Metonic cycle inaccuracy. + (/ ; ...corrected for Metonic cycle inaccuracy (+ 5 (* 8 century)) 25) - (* 30 century)) ;; Keeps value positive. + (* 30 century)) ; keeps value positive 30)) - (adjusted-epact ;; Adjust for 29.5 day month. + (adjusted-epact ; adjust for 29.5 day month (if (or (zerop shifted-epact) (and (= shifted-epact 1) (< 10 (% displayed-year 19)))) (1+ shifted-epact) shifted-epact)) - (paschal-moon ;; Day after the full moon on or after March 21. + (paschal-moon ; day after the full moon on or after March 21 (- (calendar-absolute-from-gregorian (list 4 19 displayed-year)) adjusted-epact)) (abs-easter (calendar-dayname-on-or-before 0 (+ paschal-moon 7)))) @@ -501,14 +501,14 @@ is non-nil)." (calendar-julian-from-absolute (calendar-absolute-from-gregorian (list m (calendar-last-day-of-month m y) y))))) - (shifted-epact ;; Age of moon for April 5. + (shifted-epact ; age of moon for April 5 (% (+ 14 (* 11 (% julian-year 19))) 30)) - (paschal-moon ;; Day after full moon on or after March 21. + (paschal-moon ; day after full moon on or after March 21 (- (calendar-absolute-from-julian (list 4 19 julian-year)) shifted-epact)) - (nicaean-easter;; Sunday following the Paschal moon + (nicaean-easter ; Sunday following the Paschal moon (calendar-gregorian-from-absolute (calendar-dayname-on-or-before 0 (+ paschal-moon 7))))) (if (calendar-date-is-visible-p nicaean-easter) -- 2.39.2