diff options
| author | Glenn Morris | 2008-03-08 21:07:21 +0000 |
|---|---|---|
| committer | Glenn Morris | 2008-03-08 21:07:21 +0000 |
| commit | 7e2f1bb5592c89d6af350e6bac5e121a5db2db73 (patch) | |
| tree | fd1648f99f680a14647f581b77b74e8e152c536f | |
| parent | 5bbcf603323c8118854fe2ea6dccf5f86b09ce91 (diff) | |
| download | emacs-7e2f1bb5592c89d6af350e6bac5e121a5db2db73.tar.gz emacs-7e2f1bb5592c89d6af350e6bac5e121a5db2db73.zip | |
Formatting changes only.
| -rw-r--r-- | lisp/calendar/holidays.el | 30 |
1 files 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." | |||
| 358 | (y2 y1)) | 358 | (y2 y1)) |
| 359 | (increment-calendar-month m1 y1 -1) | 359 | (increment-calendar-month m1 y1 -1) |
| 360 | (increment-calendar-month m2 y2 1) | 360 | (increment-calendar-month m2 y2 1) |
| 361 | (let* ((d1; first possible base date for holiday | 361 | (let* ((d1 ; first possible base date for holiday |
| 362 | (+ (calendar-nth-named-absday 1 dayname m1 y1) | 362 | (+ (calendar-nth-named-absday 1 dayname m1 y1) |
| 363 | (* -7 n) | 363 | (* -7 n) |
| 364 | (if (> n 0) 1 -7))) | 364 | (if (> n 0) 1 -7))) |
| 365 | (d2; last possible base date for holiday | 365 | (d2 ; last possible base date for holiday |
| 366 | (+ (calendar-nth-named-absday -1 dayname m2 y2) | 366 | (+ (calendar-nth-named-absday -1 dayname m2 y2) |
| 367 | (* -7 n) | 367 | (* -7 n) |
| 368 | (if (> n 0) 7 -1))) | 368 | (if (> n 0) 7 -1))) |
| 369 | (y1 (extract-calendar-year (calendar-gregorian-from-absolute d1))) | 369 | (y1 (extract-calendar-year (calendar-gregorian-from-absolute d1))) |
| 370 | (y2 (extract-calendar-year (calendar-gregorian-from-absolute d2))) | 370 | (y2 (extract-calendar-year (calendar-gregorian-from-absolute d2))) |
| 371 | (y; year of base date | 371 | (y ; year of base date |
| 372 | (if (or (= y1 y2) (> month 9)) | 372 | (if (or (= y1 y2) (> month 9)) |
| 373 | y1 | 373 | y1 |
| 374 | y2)) | 374 | y2)) |
| 375 | (d; day of base date | 375 | (d ; day of base date |
| 376 | (or day (if (> n 0) | 376 | (or day (if (> n 0) |
| 377 | 1 | 377 | 1 |
| 378 | (calendar-last-day-of-month month y)))) | 378 | (calendar-last-day-of-month month y)))) |
| 379 | (date; base date for holiday | 379 | (date ; base date for holiday |
| 380 | (calendar-absolute-from-gregorian (list month d y)))) | 380 | (calendar-absolute-from-gregorian (list month d y)))) |
| 381 | (if (and (<= d1 date) (<= date d2)) | 381 | (if (and (<= d1 date) (<= date d2)) |
| 382 | (list (list (calendar-nth-named-day n dayname month y d) | 382 | (list (list (calendar-nth-named-day n dayname month y d) |
| @@ -467,20 +467,20 @@ is non-nil)." | |||
| 467 | (if (setq res (holiday-easter-etc (car elem) (cdr elem))) | 467 | (if (setq res (holiday-easter-etc (car elem) (cdr elem))) |
| 468 | (setq res-list (append res res-list))))) | 468 | (setq res-list (append res res-list))))) |
| 469 | (let* ((century (1+ (/ displayed-year 100))) | 469 | (let* ((century (1+ (/ displayed-year 100))) |
| 470 | (shifted-epact ;; Age of moon for April 5... | 470 | (shifted-epact ; age of moon for April 5... |
| 471 | (% (+ 14 (* 11 (% displayed-year 19)) ;; ...by Nicaean rule | 471 | (% (+ 14 (* 11 (% displayed-year 19)) ; ...by Nicaean rule |
| 472 | (- ;; ...corrected for the Gregorian century rule | 472 | (- ; ...corrected for the Gregorian century rule |
| 473 | (/ (* 3 century) 4)) | 473 | (/ (* 3 century) 4)) |
| 474 | (/ ;; ...corrected for Metonic cycle inaccuracy. | 474 | (/ ; ...corrected for Metonic cycle inaccuracy |
| 475 | (+ 5 (* 8 century)) 25) | 475 | (+ 5 (* 8 century)) 25) |
| 476 | (* 30 century)) ;; Keeps value positive. | 476 | (* 30 century)) ; keeps value positive |
| 477 | 30)) | 477 | 30)) |
| 478 | (adjusted-epact ;; Adjust for 29.5 day month. | 478 | (adjusted-epact ; adjust for 29.5 day month |
| 479 | (if (or (zerop shifted-epact) | 479 | (if (or (zerop shifted-epact) |
| 480 | (and (= shifted-epact 1) (< 10 (% displayed-year 19)))) | 480 | (and (= shifted-epact 1) (< 10 (% displayed-year 19)))) |
| 481 | (1+ shifted-epact) | 481 | (1+ shifted-epact) |
| 482 | shifted-epact)) | 482 | shifted-epact)) |
| 483 | (paschal-moon ;; Day after the full moon on or after March 21. | 483 | (paschal-moon ; day after the full moon on or after March 21 |
| 484 | (- (calendar-absolute-from-gregorian (list 4 19 displayed-year)) | 484 | (- (calendar-absolute-from-gregorian (list 4 19 displayed-year)) |
| 485 | adjusted-epact)) | 485 | adjusted-epact)) |
| 486 | (abs-easter (calendar-dayname-on-or-before 0 (+ paschal-moon 7)))) | 486 | (abs-easter (calendar-dayname-on-or-before 0 (+ paschal-moon 7)))) |
| @@ -501,14 +501,14 @@ is non-nil)." | |||
| 501 | (calendar-julian-from-absolute | 501 | (calendar-julian-from-absolute |
| 502 | (calendar-absolute-from-gregorian | 502 | (calendar-absolute-from-gregorian |
| 503 | (list m (calendar-last-day-of-month m y) y))))) | 503 | (list m (calendar-last-day-of-month m y) y))))) |
| 504 | (shifted-epact ;; Age of moon for April 5. | 504 | (shifted-epact ; age of moon for April 5 |
| 505 | (% (+ 14 | 505 | (% (+ 14 |
| 506 | (* 11 (% julian-year 19))) | 506 | (* 11 (% julian-year 19))) |
| 507 | 30)) | 507 | 30)) |
| 508 | (paschal-moon ;; Day after full moon on or after March 21. | 508 | (paschal-moon ; day after full moon on or after March 21 |
| 509 | (- (calendar-absolute-from-julian (list 4 19 julian-year)) | 509 | (- (calendar-absolute-from-julian (list 4 19 julian-year)) |
| 510 | shifted-epact)) | 510 | shifted-epact)) |
| 511 | (nicaean-easter;; Sunday following the Paschal moon | 511 | (nicaean-easter ; Sunday following the Paschal moon |
| 512 | (calendar-gregorian-from-absolute | 512 | (calendar-gregorian-from-absolute |
| 513 | (calendar-dayname-on-or-before 0 (+ paschal-moon 7))))) | 513 | (calendar-dayname-on-or-before 0 (+ paschal-moon 7))))) |
| 514 | (if (calendar-date-is-visible-p nicaean-easter) | 514 | (if (calendar-date-is-visible-p nicaean-easter) |