Mercurial > emacs
annotate lisp/calendar/holidays.el @ 93864:a238cf768432
*** empty log message ***
author | Jason Rumney <jasonr@gnu.org> |
---|---|
date | Tue, 08 Apr 2008 14:46:49 +0000 |
parents | bf9ef749c23e |
children | d76c0fd8ef0c |
rev | line source |
---|---|
660
08eb386dd0f3
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
584
diff
changeset
|
1 ;;; holidays.el --- holiday functions for the calendar package |
793
6fb68a1460a6
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
778
diff
changeset
|
2 |
67465
a55ee709ec8d
Update copyright pending Emacs 22.
Glenn Morris <rgm@gnu.org>
parents:
65919
diff
changeset
|
3 ;; Copyright (C) 1989, 1990, 1992, 1993, 1994, 1997, 2001, 2002, 2003, |
79703 | 4 ;; 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
846
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
811
diff
changeset
|
5 |
793
6fb68a1460a6
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
778
diff
changeset
|
6 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu> |
65919
5c09efcfc1d9
Update maintainer email address.
Glenn Morris <rgm@gnu.org>
parents:
64085
diff
changeset
|
7 ;; Maintainer: Glenn Morris <rgm@gnu.org> |
957 | 8 ;; Keywords: holidays, calendar |
793
6fb68a1460a6
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
778
diff
changeset
|
9 |
406 | 10 ;; This file is part of GNU Emacs. |
11 | |
6736
3e1323443b1a
Fix copying conditions for current GPL version.
Richard M. Stallman <rms@gnu.org>
parents:
5831
diff
changeset
|
12 ;; GNU Emacs is free software; you can redistribute it and/or modify |
3e1323443b1a
Fix copying conditions for current GPL version.
Richard M. Stallman <rms@gnu.org>
parents:
5831
diff
changeset
|
13 ;; it under the terms of the GNU General Public License as published by |
78216
93e11478c954
Switch license to GPLv3 or later.
Glenn Morris <rgm@gnu.org>
parents:
77279
diff
changeset
|
14 ;; the Free Software Foundation; either version 3, or (at your option) |
6736
3e1323443b1a
Fix copying conditions for current GPL version.
Richard M. Stallman <rms@gnu.org>
parents:
5831
diff
changeset
|
15 ;; any later version. |
3870
4acdfdf2a7c9
* holidays.el (calendar-holiday-function-fixed,
Jim Blandy <jimb@redhat.com>
parents:
3728
diff
changeset
|
16 |
406 | 17 ;; GNU Emacs is distributed in the hope that it will be useful, |
6736
3e1323443b1a
Fix copying conditions for current GPL version.
Richard M. Stallman <rms@gnu.org>
parents:
5831
diff
changeset
|
18 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of |
3e1323443b1a
Fix copying conditions for current GPL version.
Richard M. Stallman <rms@gnu.org>
parents:
5831
diff
changeset
|
19 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
3e1323443b1a
Fix copying conditions for current GPL version.
Richard M. Stallman <rms@gnu.org>
parents:
5831
diff
changeset
|
20 ;; GNU General Public License for more details. |
406 | 21 |
6736
3e1323443b1a
Fix copying conditions for current GPL version.
Richard M. Stallman <rms@gnu.org>
parents:
5831
diff
changeset
|
22 ;; You should have received a copy of the GNU General Public License |
14169 | 23 ;; along with GNU Emacs; see the file COPYING. If not, write to the |
64085 | 24 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
25 ;; Boston, MA 02110-1301, USA. | |
406 | 26 |
793
6fb68a1460a6
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
778
diff
changeset
|
27 ;;; Commentary: |
6fb68a1460a6
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
778
diff
changeset
|
28 |
93494
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
29 ;; See calendar.el. |
406 | 30 |
793
6fb68a1460a6
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
778
diff
changeset
|
31 ;;; Code: |
6fb68a1460a6
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
778
diff
changeset
|
32 |
406 | 33 (require 'calendar) |
93712
59cfcdcb1474
Require loaddef file rather than loading it.
Glenn Morris <rgm@gnu.org>
parents:
93639
diff
changeset
|
34 (require 'hol-loaddefs) |
957 | 35 |
93844
bf9ef749c23e
Replace int-to-string with number-to-string.
Glenn Morris <rgm@gnu.org>
parents:
93809
diff
changeset
|
36 ;; FIXME name that makes sense |
92922
e5d9e1e9c1b4
(displayed-month, displayed-year): Move declarations where needed.
Glenn Morris <rgm@gnu.org>
parents:
92842
diff
changeset
|
37 ;;;###diary-autoload |
e5d9e1e9c1b4
(displayed-month, displayed-year): Move declarations where needed.
Glenn Morris <rgm@gnu.org>
parents:
92842
diff
changeset
|
38 (defun calendar-holiday-list () |
e5d9e1e9c1b4
(displayed-month, displayed-year): Move declarations where needed.
Glenn Morris <rgm@gnu.org>
parents:
92842
diff
changeset
|
39 "Form the list of holidays that occur on dates in the calendar window. |
e5d9e1e9c1b4
(displayed-month, displayed-year): Move declarations where needed.
Glenn Morris <rgm@gnu.org>
parents:
92842
diff
changeset
|
40 The holidays are those in the list `calendar-holidays'." |
93580
b6cea5b391eb
(calendar-holiday-list): Fix previous change.
Glenn Morris <rgm@gnu.org>
parents:
93494
diff
changeset
|
41 (let (res h) |
b6cea5b391eb
(calendar-holiday-list): Fix previous change.
Glenn Morris <rgm@gnu.org>
parents:
93494
diff
changeset
|
42 (sort |
b6cea5b391eb
(calendar-holiday-list): Fix previous change.
Glenn Morris <rgm@gnu.org>
parents:
93494
diff
changeset
|
43 (dolist (p calendar-holidays res) |
b6cea5b391eb
(calendar-holiday-list): Fix previous change.
Glenn Morris <rgm@gnu.org>
parents:
93494
diff
changeset
|
44 (if (setq h (if calendar-debug-sexp |
b6cea5b391eb
(calendar-holiday-list): Fix previous change.
Glenn Morris <rgm@gnu.org>
parents:
93494
diff
changeset
|
45 (let ((stack-trace-on-error t)) |
b6cea5b391eb
(calendar-holiday-list): Fix previous change.
Glenn Morris <rgm@gnu.org>
parents:
93494
diff
changeset
|
46 (eval p)) |
b6cea5b391eb
(calendar-holiday-list): Fix previous change.
Glenn Morris <rgm@gnu.org>
parents:
93494
diff
changeset
|
47 (condition-case nil |
b6cea5b391eb
(calendar-holiday-list): Fix previous change.
Glenn Morris <rgm@gnu.org>
parents:
93494
diff
changeset
|
48 (eval p) |
b6cea5b391eb
(calendar-holiday-list): Fix previous change.
Glenn Morris <rgm@gnu.org>
parents:
93494
diff
changeset
|
49 (error (beep) |
b6cea5b391eb
(calendar-holiday-list): Fix previous change.
Glenn Morris <rgm@gnu.org>
parents:
93494
diff
changeset
|
50 (message "Bad holiday list item: %s" p) |
b6cea5b391eb
(calendar-holiday-list): Fix previous change.
Glenn Morris <rgm@gnu.org>
parents:
93494
diff
changeset
|
51 (sleep-for 2))))) |
b6cea5b391eb
(calendar-holiday-list): Fix previous change.
Glenn Morris <rgm@gnu.org>
parents:
93494
diff
changeset
|
52 (setq res (append h res)))) |
b6cea5b391eb
(calendar-holiday-list): Fix previous change.
Glenn Morris <rgm@gnu.org>
parents:
93494
diff
changeset
|
53 'calendar-date-compare))) |
92922
e5d9e1e9c1b4
(displayed-month, displayed-year): Move declarations where needed.
Glenn Morris <rgm@gnu.org>
parents:
92842
diff
changeset
|
54 |
93809
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93712
diff
changeset
|
55 (defvar displayed-month) ; from calendar-generate |
92960
5a10f6dafd69
(displayed-month, displayed-year): Move declarations where needed.
Glenn Morris <rgm@gnu.org>
parents:
92922
diff
changeset
|
56 (defvar displayed-year) |
5a10f6dafd69
(displayed-month, displayed-year): Move declarations where needed.
Glenn Morris <rgm@gnu.org>
parents:
92922
diff
changeset
|
57 |
93844
bf9ef749c23e
Replace int-to-string with number-to-string.
Glenn Morris <rgm@gnu.org>
parents:
93809
diff
changeset
|
58 ;; FIXME name that makes sense |
92922
e5d9e1e9c1b4
(displayed-month, displayed-year): Move declarations where needed.
Glenn Morris <rgm@gnu.org>
parents:
92842
diff
changeset
|
59 ;;;###cal-autoload |
e5d9e1e9c1b4
(displayed-month, displayed-year): Move declarations where needed.
Glenn Morris <rgm@gnu.org>
parents:
92842
diff
changeset
|
60 (defun calendar-list-holidays () |
e5d9e1e9c1b4
(displayed-month, displayed-year): Move declarations where needed.
Glenn Morris <rgm@gnu.org>
parents:
92842
diff
changeset
|
61 "Create a buffer containing the holidays for the current calendar window. |
93494
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
62 The holidays are those in the list `calendar-notable-days'. |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
63 Returns non-nil if any holidays are found." |
92922
e5d9e1e9c1b4
(displayed-month, displayed-year): Move declarations where needed.
Glenn Morris <rgm@gnu.org>
parents:
92842
diff
changeset
|
64 (interactive) |
e5d9e1e9c1b4
(displayed-month, displayed-year): Move declarations where needed.
Glenn Morris <rgm@gnu.org>
parents:
92842
diff
changeset
|
65 (message "Looking up holidays...") |
e5d9e1e9c1b4
(displayed-month, displayed-year): Move declarations where needed.
Glenn Morris <rgm@gnu.org>
parents:
92842
diff
changeset
|
66 (let ((holiday-list (calendar-holiday-list)) |
e5d9e1e9c1b4
(displayed-month, displayed-year): Move declarations where needed.
Glenn Morris <rgm@gnu.org>
parents:
92842
diff
changeset
|
67 (m1 displayed-month) |
e5d9e1e9c1b4
(displayed-month, displayed-year): Move declarations where needed.
Glenn Morris <rgm@gnu.org>
parents:
92842
diff
changeset
|
68 (y1 displayed-year) |
e5d9e1e9c1b4
(displayed-month, displayed-year): Move declarations where needed.
Glenn Morris <rgm@gnu.org>
parents:
92842
diff
changeset
|
69 (m2 displayed-month) |
e5d9e1e9c1b4
(displayed-month, displayed-year): Move declarations where needed.
Glenn Morris <rgm@gnu.org>
parents:
92842
diff
changeset
|
70 (y2 displayed-year)) |
e5d9e1e9c1b4
(displayed-month, displayed-year): Move declarations where needed.
Glenn Morris <rgm@gnu.org>
parents:
92842
diff
changeset
|
71 (if (not holiday-list) |
93494
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
72 (message "Looking up holidays...none found") |
93024
efee212e0b17
(calendar-list-holidays, list-holidays, calendar-cursor-holidays):
Glenn Morris <rgm@gnu.org>
parents:
92960
diff
changeset
|
73 (calendar-in-read-only-buffer holiday-buffer |
93809
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93712
diff
changeset
|
74 (calendar-increment-month m1 y1 -1) |
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93712
diff
changeset
|
75 (calendar-increment-month m2 y2 1) |
93024
efee212e0b17
(calendar-list-holidays, list-holidays, calendar-cursor-holidays):
Glenn Morris <rgm@gnu.org>
parents:
92960
diff
changeset
|
76 (calendar-set-mode-line |
efee212e0b17
(calendar-list-holidays, list-holidays, calendar-cursor-holidays):
Glenn Morris <rgm@gnu.org>
parents:
92960
diff
changeset
|
77 (if (= y1 y2) |
efee212e0b17
(calendar-list-holidays, list-holidays, calendar-cursor-holidays):
Glenn Morris <rgm@gnu.org>
parents:
92960
diff
changeset
|
78 (format "Notable Dates from %s to %s, %d%%-" |
efee212e0b17
(calendar-list-holidays, list-holidays, calendar-cursor-holidays):
Glenn Morris <rgm@gnu.org>
parents:
92960
diff
changeset
|
79 (calendar-month-name m1) (calendar-month-name m2) y2) |
efee212e0b17
(calendar-list-holidays, list-holidays, calendar-cursor-holidays):
Glenn Morris <rgm@gnu.org>
parents:
92960
diff
changeset
|
80 (format "Notable Dates from %s, %d to %s, %d%%-" |
efee212e0b17
(calendar-list-holidays, list-holidays, calendar-cursor-holidays):
Glenn Morris <rgm@gnu.org>
parents:
92960
diff
changeset
|
81 (calendar-month-name m1) y1 (calendar-month-name m2) y2))) |
efee212e0b17
(calendar-list-holidays, list-holidays, calendar-cursor-holidays):
Glenn Morris <rgm@gnu.org>
parents:
92960
diff
changeset
|
82 (insert |
efee212e0b17
(calendar-list-holidays, list-holidays, calendar-cursor-holidays):
Glenn Morris <rgm@gnu.org>
parents:
92960
diff
changeset
|
83 (mapconcat |
efee212e0b17
(calendar-list-holidays, list-holidays, calendar-cursor-holidays):
Glenn Morris <rgm@gnu.org>
parents:
92960
diff
changeset
|
84 (lambda (x) (concat (calendar-date-string (car x)) |
efee212e0b17
(calendar-list-holidays, list-holidays, calendar-cursor-holidays):
Glenn Morris <rgm@gnu.org>
parents:
92960
diff
changeset
|
85 ": " (cadr x))) |
efee212e0b17
(calendar-list-holidays, list-holidays, calendar-cursor-holidays):
Glenn Morris <rgm@gnu.org>
parents:
92960
diff
changeset
|
86 holiday-list "\n"))) |
93494
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
87 (message "Looking up holidays...done")) |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
88 holiday-list)) |
92922
e5d9e1e9c1b4
(displayed-month, displayed-year): Move declarations where needed.
Glenn Morris <rgm@gnu.org>
parents:
92842
diff
changeset
|
89 |
e5d9e1e9c1b4
(displayed-month, displayed-year): Move declarations where needed.
Glenn Morris <rgm@gnu.org>
parents:
92842
diff
changeset
|
90 (define-obsolete-function-alias |
e5d9e1e9c1b4
(displayed-month, displayed-year): Move declarations where needed.
Glenn Morris <rgm@gnu.org>
parents:
92842
diff
changeset
|
91 'list-calendar-holidays 'calendar-list-holidays "23.1") |
e5d9e1e9c1b4
(displayed-month, displayed-year): Move declarations where needed.
Glenn Morris <rgm@gnu.org>
parents:
92842
diff
changeset
|
92 |
37631
00c265302412
(holidays): Add an autoload cookie. From Pavel Jank <Pavel@Janik.cz>.
Eli Zaretskii <eliz@gnu.org>
parents:
37001
diff
changeset
|
93 ;;;###autoload |
957 | 94 (defun holidays (&optional arg) |
406 | 95 "Display the holidays for last month, this month, and next month. |
92650 | 96 If called with an optional prefix argument ARG, prompts for month and year. |
406 | 97 This function is suitable for execution in a .emacs file." |
957 | 98 (interactive "P") |
406 | 99 (save-excursion |
957 | 100 (let* ((completion-ignore-case t) |
92922
e5d9e1e9c1b4
(displayed-month, displayed-year): Move declarations where needed.
Glenn Morris <rgm@gnu.org>
parents:
92842
diff
changeset
|
101 (date (if arg (calendar-read-date t) |
9712
275845a98fa8
Use new form of calendar-read-date.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
7639
diff
changeset
|
102 (calendar-current-date))) |
93809
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93712
diff
changeset
|
103 (displayed-month (calendar-extract-month date)) |
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93712
diff
changeset
|
104 (displayed-year (calendar-extract-year date))) |
84356
357b5ff720d4
(holiday-list, calendar-check-holidays, calendar-mark-holidays)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78216
diff
changeset
|
105 (calendar-list-holidays)))) |
406 | 106 |
84576
1b5ca22699c0
(holiday-list): Rename it back to `list-holidays', but leave
Glenn Morris <rgm@gnu.org>
parents:
84556
diff
changeset
|
107 ;; rms: "Emacs commands to display a list of something generally start |
1b5ca22699c0
(holiday-list): Rename it back to `list-holidays', but leave
Glenn Morris <rgm@gnu.org>
parents:
84556
diff
changeset
|
108 ;; with `list-'. Please make `list-holidays' the principal name." |
17388
5c4602f0c45d
(list-holidays): Add autoload cookie.
Richard M. Stallman <rms@gnu.org>
parents:
17385
diff
changeset
|
109 ;;;###autoload |
93238
a2947a0dab56
(list-holidays): Make Y2 optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93228
diff
changeset
|
110 (defun list-holidays (y1 &optional y2 l label) |
17385
259d4c9aae0e
(list-holidays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14687
diff
changeset
|
111 "Display holidays for years Y1 to Y2 (inclusive). |
93282 | 112 Y2 defaults to Y1. The optional list of holidays L defaults to |
113 `calendar-holidays'. If you want to control what holidays are | |
114 displayed, use a different list. For example, | |
69373 | 115 |
116 (list-holidays 2006 2006 | |
93809
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93712
diff
changeset
|
117 (append holiday-general-holidays holiday-local-holidays)) |
69373 | 118 |
93809
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93712
diff
changeset
|
119 will display holidays for the year 2006 defined in the two |
69373 | 120 mentioned lists, and nothing else. |
121 | |
69352 | 122 When called interactively, this command offers a choice of |
93809
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93712
diff
changeset
|
123 holidays, based on the variables `holiday-solar-holidays' etc. See the |
69352 | 124 documentation of `calendar-holidays' for a list of the variables |
125 that control the choices, as well as a description of the format | |
126 of a holiday list. | |
17385
259d4c9aae0e
(list-holidays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14687
diff
changeset
|
127 |
259d4c9aae0e
(list-holidays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14687
diff
changeset
|
128 The optional LABEL is used to label the buffer created." |
259d4c9aae0e
(list-holidays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14687
diff
changeset
|
129 (interactive |
259d4c9aae0e
(list-holidays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14687
diff
changeset
|
130 (let* ((start-year (calendar-read |
259d4c9aae0e
(list-holidays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14687
diff
changeset
|
131 "Starting year of holidays (>0): " |
92596 | 132 (lambda (x) (> x 0)) |
93844
bf9ef749c23e
Replace int-to-string with number-to-string.
Glenn Morris <rgm@gnu.org>
parents:
93809
diff
changeset
|
133 (number-to-string (calendar-extract-year |
17385
259d4c9aae0e
(list-holidays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14687
diff
changeset
|
134 (calendar-current-date))))) |
259d4c9aae0e
(list-holidays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14687
diff
changeset
|
135 (end-year (calendar-read |
92922
e5d9e1e9c1b4
(displayed-month, displayed-year): Move declarations where needed.
Glenn Morris <rgm@gnu.org>
parents:
92842
diff
changeset
|
136 (format "Ending year (inclusive) of holidays (>=%s): " |
e5d9e1e9c1b4
(displayed-month, displayed-year): Move declarations where needed.
Glenn Morris <rgm@gnu.org>
parents:
92842
diff
changeset
|
137 start-year) |
e5d9e1e9c1b4
(displayed-month, displayed-year): Move declarations where needed.
Glenn Morris <rgm@gnu.org>
parents:
92842
diff
changeset
|
138 (lambda (x) (>= x start-year)) |
93844
bf9ef749c23e
Replace int-to-string with number-to-string.
Glenn Morris <rgm@gnu.org>
parents:
93809
diff
changeset
|
139 (number-to-string start-year))) |
17385
259d4c9aae0e
(list-holidays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14687
diff
changeset
|
140 (completion-ignore-case t) |
259d4c9aae0e
(list-holidays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14687
diff
changeset
|
141 (lists |
259d4c9aae0e
(list-holidays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14687
diff
changeset
|
142 (list |
259d4c9aae0e
(list-holidays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14687
diff
changeset
|
143 (cons "All" calendar-holidays) |
93228
3f12945a840c
(list-holidays): Assume atan always bound.
Glenn Morris <rgm@gnu.org>
parents:
93024
diff
changeset
|
144 (cons "Equinoxes/Solstices" |
3f12945a840c
(list-holidays): Assume atan always bound.
Glenn Morris <rgm@gnu.org>
parents:
93024
diff
changeset
|
145 (list (list 'solar-equinoxes-solstices))) |
93809
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93712
diff
changeset
|
146 (if holiday-general-holidays |
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93712
diff
changeset
|
147 (cons "General" holiday-general-holidays)) |
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93712
diff
changeset
|
148 (if holiday-local-holidays |
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93712
diff
changeset
|
149 (cons "Local" holiday-local-holidays)) |
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93712
diff
changeset
|
150 (if holiday-other-holidays |
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93712
diff
changeset
|
151 (cons "Other" holiday-other-holidays)) |
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93712
diff
changeset
|
152 (if holiday-christian-holidays |
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93712
diff
changeset
|
153 (cons "Christian" holiday-christian-holidays)) |
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93712
diff
changeset
|
154 (if holiday-hebrew-holidays |
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93712
diff
changeset
|
155 (cons "Hebrew" holiday-hebrew-holidays)) |
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93712
diff
changeset
|
156 (if holiday-islamic-holidays |
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93712
diff
changeset
|
157 (cons "Islamic" holiday-islamic-holidays)) |
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93712
diff
changeset
|
158 (if holiday-bahai-holidays |
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93712
diff
changeset
|
159 (cons "Baha'i" holiday-bahai-holidays)) |
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93712
diff
changeset
|
160 (if holiday-oriental-holidays |
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93712
diff
changeset
|
161 (cons "Oriental" holiday-oriental-holidays)) |
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93712
diff
changeset
|
162 (if holiday-solar-holidays |
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93712
diff
changeset
|
163 (cons "Solar" holiday-solar-holidays)) |
17385
259d4c9aae0e
(list-holidays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14687
diff
changeset
|
164 (cons "Ask" nil))) |
259d4c9aae0e
(list-holidays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14687
diff
changeset
|
165 (choice (capitalize |
259d4c9aae0e
(list-holidays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14687
diff
changeset
|
166 (completing-read "List (TAB for choices): " lists nil t))) |
259d4c9aae0e
(list-holidays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14687
diff
changeset
|
167 (which (if (string-equal choice "Ask") |
259d4c9aae0e
(list-holidays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14687
diff
changeset
|
168 (eval (read-variable "Enter list name: ")) |
259d4c9aae0e
(list-holidays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14687
diff
changeset
|
169 (cdr (assoc choice lists)))) |
259d4c9aae0e
(list-holidays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14687
diff
changeset
|
170 (name (if (string-equal choice "Equinoxes/Solstices") |
259d4c9aae0e
(list-holidays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14687
diff
changeset
|
171 choice |
17643
fd27882450bd
(list-holidays): Fix buffer title when list is
Richard M. Stallman <rms@gnu.org>
parents:
17388
diff
changeset
|
172 (if (member choice '("Ask" "")) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
37631
diff
changeset
|
173 "Holidays" |
17385
259d4c9aae0e
(list-holidays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14687
diff
changeset
|
174 (format "%s Holidays" choice))))) |
259d4c9aae0e
(list-holidays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14687
diff
changeset
|
175 (list start-year end-year which name))) |
93238
a2947a0dab56
(list-holidays): Make Y2 optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93228
diff
changeset
|
176 (unless y2 (setq y2 y1)) |
17385
259d4c9aae0e
(list-holidays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14687
diff
changeset
|
177 (message "Computing holidays...") |
93494
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
178 (let ((calendar-holidays (or l calendar-holidays)) |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
179 (title (or label "Holidays")) |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
180 (s (calendar-absolute-from-gregorian (list 2 1 y1))) |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
181 (e (calendar-absolute-from-gregorian (list 11 1 y2))) |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
182 (displayed-month 2) |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
183 (displayed-year y1) |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
184 holiday-list) |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
185 (while (<= s e) |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
186 (setq holiday-list (append holiday-list (calendar-holiday-list))) |
93809
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93712
diff
changeset
|
187 (calendar-increment-month displayed-month displayed-year 3) |
93494
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
188 (setq s (calendar-absolute-from-gregorian |
17385
259d4c9aae0e
(list-holidays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14687
diff
changeset
|
189 (list displayed-month 1 displayed-year)))) |
17643
fd27882450bd
(list-holidays): Fix buffer title when list is
Richard M. Stallman <rms@gnu.org>
parents:
17388
diff
changeset
|
190 (save-excursion |
93024
efee212e0b17
(calendar-list-holidays, list-holidays, calendar-cursor-holidays):
Glenn Morris <rgm@gnu.org>
parents:
92960
diff
changeset
|
191 (calendar-in-read-only-buffer holiday-buffer |
efee212e0b17
(calendar-list-holidays, list-holidays, calendar-cursor-holidays):
Glenn Morris <rgm@gnu.org>
parents:
92960
diff
changeset
|
192 (calendar-set-mode-line |
efee212e0b17
(calendar-list-holidays, list-holidays, calendar-cursor-holidays):
Glenn Morris <rgm@gnu.org>
parents:
92960
diff
changeset
|
193 (if (= y1 y2) |
efee212e0b17
(calendar-list-holidays, list-holidays, calendar-cursor-holidays):
Glenn Morris <rgm@gnu.org>
parents:
92960
diff
changeset
|
194 (format "%s for %s" title y1) |
efee212e0b17
(calendar-list-holidays, list-holidays, calendar-cursor-holidays):
Glenn Morris <rgm@gnu.org>
parents:
92960
diff
changeset
|
195 (format "%s for %s-%s" title y1 y2))) |
efee212e0b17
(calendar-list-holidays, list-holidays, calendar-cursor-holidays):
Glenn Morris <rgm@gnu.org>
parents:
92960
diff
changeset
|
196 (insert |
efee212e0b17
(calendar-list-holidays, list-holidays, calendar-cursor-holidays):
Glenn Morris <rgm@gnu.org>
parents:
92960
diff
changeset
|
197 (mapconcat |
efee212e0b17
(calendar-list-holidays, list-holidays, calendar-cursor-holidays):
Glenn Morris <rgm@gnu.org>
parents:
92960
diff
changeset
|
198 (lambda (x) (concat (calendar-date-string (car x)) |
efee212e0b17
(calendar-list-holidays, list-holidays, calendar-cursor-holidays):
Glenn Morris <rgm@gnu.org>
parents:
92960
diff
changeset
|
199 ": " (cadr x))) |
efee212e0b17
(calendar-list-holidays, list-holidays, calendar-cursor-holidays):
Glenn Morris <rgm@gnu.org>
parents:
92960
diff
changeset
|
200 holiday-list "\n"))) |
17643
fd27882450bd
(list-holidays): Fix buffer title when list is
Richard M. Stallman <rms@gnu.org>
parents:
17388
diff
changeset
|
201 (message "Computing holidays...done")))) |
fd27882450bd
(list-holidays): Fix buffer title when list is
Richard M. Stallman <rms@gnu.org>
parents:
17388
diff
changeset
|
202 |
86294
7962d9c627d8
(holiday-list): Add autoload cookie.
Glenn Morris <rgm@gnu.org>
parents:
84606
diff
changeset
|
203 ;;;###autoload |
84576
1b5ca22699c0
(holiday-list): Rename it back to `list-holidays', but leave
Glenn Morris <rgm@gnu.org>
parents:
84556
diff
changeset
|
204 (defalias 'holiday-list 'list-holidays) |
17385
259d4c9aae0e
(list-holidays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14687
diff
changeset
|
205 |
92842
aa76c7bffc0d
(hol-loaddefs): Load this rather than explicit autoloads.
Glenn Morris <rgm@gnu.org>
parents:
92650
diff
changeset
|
206 ;;;###diary-autoload |
84356
357b5ff720d4
(holiday-list, calendar-check-holidays, calendar-mark-holidays)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78216
diff
changeset
|
207 (defun calendar-check-holidays (date) |
406 | 208 "Check the list of holidays for any that occur on DATE. |
209 The value returned is a list of strings of relevant holiday descriptions. | |
84356
357b5ff720d4
(holiday-list, calendar-check-holidays, calendar-mark-holidays)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78216
diff
changeset
|
210 The holidays are those in the list `calendar-holidays'." |
93809
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93712
diff
changeset
|
211 (let ((displayed-month (calendar-extract-month date)) |
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93712
diff
changeset
|
212 (displayed-year (calendar-extract-year date)) |
93494
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
213 holiday-list) |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
214 (dolist (h (calendar-holiday-list) holiday-list) |
84356
357b5ff720d4
(holiday-list, calendar-check-holidays, calendar-mark-holidays)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78216
diff
changeset
|
215 (if (calendar-date-equal date (car h)) |
93494
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
216 (setq holiday-list (append holiday-list (cdr h))))))) |
406 | 217 |
92922
e5d9e1e9c1b4
(displayed-month, displayed-year): Move declarations where needed.
Glenn Morris <rgm@gnu.org>
parents:
92842
diff
changeset
|
218 (define-obsolete-function-alias |
e5d9e1e9c1b4
(displayed-month, displayed-year): Move declarations where needed.
Glenn Morris <rgm@gnu.org>
parents:
92842
diff
changeset
|
219 'check-calendar-holidays 'calendar-check-holidays "23.1") |
e5d9e1e9c1b4
(displayed-month, displayed-year): Move declarations where needed.
Glenn Morris <rgm@gnu.org>
parents:
92842
diff
changeset
|
220 |
92842
aa76c7bffc0d
(hol-loaddefs): Load this rather than explicit autoloads.
Glenn Morris <rgm@gnu.org>
parents:
92650
diff
changeset
|
221 ;;;###cal-autoload |
406 | 222 (defun calendar-cursor-holidays () |
223 "Find holidays for the date specified by the cursor in the calendar window." | |
224 (interactive) | |
225 (message "Checking holidays...") | |
5831
7a4647230b22
(calendar-cursor-holidays): Use new error arg
Richard M. Stallman <rms@gnu.org>
parents:
5696
diff
changeset
|
226 (let* ((date (calendar-cursor-to-date t)) |
406 | 227 (date-string (calendar-date-string date)) |
84356
357b5ff720d4
(holiday-list, calendar-check-holidays, calendar-mark-holidays)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78216
diff
changeset
|
228 (holiday-list (calendar-check-holidays date)) |
406 | 229 (holiday-string (mapconcat 'identity holiday-list "; ")) |
230 (msg (format "%s: %s" date-string holiday-string))) | |
231 (if (not holiday-list) | |
232 (message "No holidays known for %s" date-string) | |
3870
4acdfdf2a7c9
* holidays.el (calendar-holiday-function-fixed,
Jim Blandy <jimb@redhat.com>
parents:
3728
diff
changeset
|
233 (if (<= (length msg) (frame-width)) |
14318
faae84d059c1
(calendar-cursor-holidays): Pass proper format string to message.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
234 (message "%s" msg) |
93024
efee212e0b17
(calendar-list-holidays, list-holidays, calendar-cursor-holidays):
Glenn Morris <rgm@gnu.org>
parents:
92960
diff
changeset
|
235 (calendar-in-read-only-buffer holiday-buffer |
efee212e0b17
(calendar-list-holidays, list-holidays, calendar-cursor-holidays):
Glenn Morris <rgm@gnu.org>
parents:
92960
diff
changeset
|
236 (calendar-set-mode-line date-string) |
efee212e0b17
(calendar-list-holidays, list-holidays, calendar-cursor-holidays):
Glenn Morris <rgm@gnu.org>
parents:
92960
diff
changeset
|
237 (insert (mapconcat 'identity holiday-list "\n"))) |
406 | 238 (message "Checking holidays...done"))))) |
239 | |
93844
bf9ef749c23e
Replace int-to-string with number-to-string.
Glenn Morris <rgm@gnu.org>
parents:
93809
diff
changeset
|
240 ;; FIXME move to calendar? |
92842
aa76c7bffc0d
(hol-loaddefs): Load this rather than explicit autoloads.
Glenn Morris <rgm@gnu.org>
parents:
92650
diff
changeset
|
241 ;;;###cal-autoload |
84356
357b5ff720d4
(holiday-list, calendar-check-holidays, calendar-mark-holidays)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78216
diff
changeset
|
242 (defun calendar-mark-holidays () |
406 | 243 "Mark notable days in the calendar window." |
244 (interactive) | |
93809
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93712
diff
changeset
|
245 (setq calendar-mark-holidays-flag t) |
406 | 246 (message "Marking holidays...") |
84356
357b5ff720d4
(holiday-list, calendar-check-holidays, calendar-mark-holidays)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78216
diff
changeset
|
247 (dolist (holiday (calendar-holiday-list)) |
93809
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93712
diff
changeset
|
248 (calendar-mark-visible-date (car holiday) calendar-holiday-marker)) |
406 | 249 (message "Marking holidays...done")) |
250 | |
92922
e5d9e1e9c1b4
(displayed-month, displayed-year): Move declarations where needed.
Glenn Morris <rgm@gnu.org>
parents:
92842
diff
changeset
|
251 (define-obsolete-function-alias |
e5d9e1e9c1b4
(displayed-month, displayed-year): Move declarations where needed.
Glenn Morris <rgm@gnu.org>
parents:
92842
diff
changeset
|
252 'mark-calendar-holidays 'calendar-mark-holidays "23.1") |
406 | 253 |
254 ;; Below are the functions that calculate the dates of holidays; these | |
3870
4acdfdf2a7c9
* holidays.el (calendar-holiday-function-fixed,
Jim Blandy <jimb@redhat.com>
parents:
3728
diff
changeset
|
255 ;; are eval'ed in the function calendar-holiday-list. If you |
4acdfdf2a7c9
* holidays.el (calendar-holiday-function-fixed,
Jim Blandy <jimb@redhat.com>
parents:
3728
diff
changeset
|
256 ;; write other such functions, be sure to imitate the style used below. |
4acdfdf2a7c9
* holidays.el (calendar-holiday-function-fixed,
Jim Blandy <jimb@redhat.com>
parents:
3728
diff
changeset
|
257 ;; Remember that each function must return a list of items of the form |
4acdfdf2a7c9
* holidays.el (calendar-holiday-function-fixed,
Jim Blandy <jimb@redhat.com>
parents:
3728
diff
changeset
|
258 ;; ((month day year) string) of VISIBLE dates in the calendar window. |
406 | 259 |
3870
4acdfdf2a7c9
* holidays.el (calendar-holiday-function-fixed,
Jim Blandy <jimb@redhat.com>
parents:
3728
diff
changeset
|
260 (defun holiday-fixed (month day string) |
4acdfdf2a7c9
* holidays.el (calendar-holiday-function-fixed,
Jim Blandy <jimb@redhat.com>
parents:
3728
diff
changeset
|
261 "Holiday on MONTH, DAY (Gregorian) called STRING. |
4acdfdf2a7c9
* holidays.el (calendar-holiday-function-fixed,
Jim Blandy <jimb@redhat.com>
parents:
3728
diff
changeset
|
262 If MONTH, DAY is visible, the value returned is the list (((MONTH DAY year) |
4acdfdf2a7c9
* holidays.el (calendar-holiday-function-fixed,
Jim Blandy <jimb@redhat.com>
parents:
3728
diff
changeset
|
263 STRING)). Returns nil if it is not visible in the current calendar window." |
93438 | 264 ;; This determines whether a given month is visible in the calendar. |
265 ;; cf calendar-date-is-visible-p (which also checks the year part). | |
266 ;; The day is irrelevant since only full months are displayed. | |
267 ;; Since the calendar displays three months at a time, month N | |
268 ;; is visible if displayed-month = N-1, N, N+1. | |
269 ;; In particular, November is visible if d-m = 10, 11, 12. | |
270 ;; This is useful, because we can do a one-sided test: | |
271 ;; November is visible if d-m > 9. (Similarly, February is visible if | |
272 ;; d-m < 4.) | |
273 ;; To determine if December is visible, we can shift the calendar | |
274 ;; back a month and ask if November is visible; to determine if | |
275 ;; October is visible, we can shift it forward a month and ask if | |
276 ;; November is visible; etc. | |
3870
4acdfdf2a7c9
* holidays.el (calendar-holiday-function-fixed,
Jim Blandy <jimb@redhat.com>
parents:
3728
diff
changeset
|
277 (let ((m displayed-month) |
4acdfdf2a7c9
* holidays.el (calendar-holiday-function-fixed,
Jim Blandy <jimb@redhat.com>
parents:
3728
diff
changeset
|
278 (y displayed-year)) |
93809
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93712
diff
changeset
|
279 (calendar-increment-month m y (- 11 month)) |
93438 | 280 (if (> m 9) ; is november visible? |
92922
e5d9e1e9c1b4
(displayed-month, displayed-year): Move declarations where needed.
Glenn Morris <rgm@gnu.org>
parents:
92842
diff
changeset
|
281 (list (list (list month day y) string))))) |
406 | 282 |
3870
4acdfdf2a7c9
* holidays.el (calendar-holiday-function-fixed,
Jim Blandy <jimb@redhat.com>
parents:
3728
diff
changeset
|
283 (defun holiday-float (month dayname n string &optional day) |
17891
6eb7095ca7ab
(holiday-float): Rewritten to fix bug when base date
Richard M. Stallman <rms@gnu.org>
parents:
17643
diff
changeset
|
284 "Holiday on MONTH, DAYNAME (Nth occurrence) called STRING. |
3870
4acdfdf2a7c9
* holidays.el (calendar-holiday-function-fixed,
Jim Blandy <jimb@redhat.com>
parents:
3728
diff
changeset
|
285 If the Nth DAYNAME in MONTH is visible, the value returned is the list |
7639 | 286 \(((MONTH DAY year) STRING)). |
3870
4acdfdf2a7c9
* holidays.el (calendar-holiday-function-fixed,
Jim Blandy <jimb@redhat.com>
parents:
3728
diff
changeset
|
287 |
4acdfdf2a7c9
* holidays.el (calendar-holiday-function-fixed,
Jim Blandy <jimb@redhat.com>
parents:
3728
diff
changeset
|
288 If N<0, count backward from the end of MONTH. |
4acdfdf2a7c9
* holidays.el (calendar-holiday-function-fixed,
Jim Blandy <jimb@redhat.com>
parents:
3728
diff
changeset
|
289 |
17891
6eb7095ca7ab
(holiday-float): Rewritten to fix bug when base date
Richard M. Stallman <rms@gnu.org>
parents:
17643
diff
changeset
|
290 An optional parameter DAY means the Nth DAYNAME on or after/before MONTH DAY. |
3870
4acdfdf2a7c9
* holidays.el (calendar-holiday-function-fixed,
Jim Blandy <jimb@redhat.com>
parents:
3728
diff
changeset
|
291 |
406 | 292 Returns nil if it is not visible in the current calendar window." |
93494
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
293 ;; This is messy because the holiday may be visible, while the date |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
294 ;; on which it is based is not. For example, the first Monday after |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
295 ;; December 30 may be visible when January is not. For large values |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
296 ;; of |n| the problem is more grotesque. If we didn't have to worry |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
297 ;; about such cases, we could just use the original version of this |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
298 ;; function: |
92922
e5d9e1e9c1b4
(displayed-month, displayed-year): Move declarations where needed.
Glenn Morris <rgm@gnu.org>
parents:
92842
diff
changeset
|
299 ;; (let ((m displayed-month) |
e5d9e1e9c1b4
(displayed-month, displayed-year): Move declarations where needed.
Glenn Morris <rgm@gnu.org>
parents:
92842
diff
changeset
|
300 ;; (y displayed-year)) |
93809
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93712
diff
changeset
|
301 ;; (calendar-increment-month m y (- 11 month)) |
92922
e5d9e1e9c1b4
(displayed-month, displayed-year): Move declarations where needed.
Glenn Morris <rgm@gnu.org>
parents:
92842
diff
changeset
|
302 ;; (if (> m 9); month in year y is visible |
e5d9e1e9c1b4
(displayed-month, displayed-year): Move declarations where needed.
Glenn Morris <rgm@gnu.org>
parents:
92842
diff
changeset
|
303 ;; (list (list (calendar-nth-named-day n dayname month y day) string))))) |
17891
6eb7095ca7ab
(holiday-float): Rewritten to fix bug when base date
Richard M. Stallman <rms@gnu.org>
parents:
17643
diff
changeset
|
304 (let* ((m1 displayed-month) |
6eb7095ca7ab
(holiday-float): Rewritten to fix bug when base date
Richard M. Stallman <rms@gnu.org>
parents:
17643
diff
changeset
|
305 (y1 displayed-year) |
93494
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
306 (m2 displayed-month) |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
307 (y2 displayed-year) |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
308 (d1 (progn ; first possible base date for holiday |
93809
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93712
diff
changeset
|
309 (calendar-increment-month m1 y1 -1) |
93494
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
310 (+ (calendar-nth-named-absday 1 dayname m1 y1) |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
311 (* -7 n) |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
312 (if (> n 0) 1 -7)))) |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
313 (d2 ; last possible base date for holiday |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
314 (progn |
93809
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93712
diff
changeset
|
315 (calendar-increment-month m2 y2 1) |
17891
6eb7095ca7ab
(holiday-float): Rewritten to fix bug when base date
Richard M. Stallman <rms@gnu.org>
parents:
17643
diff
changeset
|
316 (+ (calendar-nth-named-absday -1 dayname m2 y2) |
6eb7095ca7ab
(holiday-float): Rewritten to fix bug when base date
Richard M. Stallman <rms@gnu.org>
parents:
17643
diff
changeset
|
317 (* -7 n) |
93494
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
318 (if (> n 0) 7 -1)))) |
93809
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93712
diff
changeset
|
319 (y1 (calendar-extract-year (calendar-gregorian-from-absolute d1))) |
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93712
diff
changeset
|
320 (y2 (calendar-extract-year (calendar-gregorian-from-absolute d2))) |
93494
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
321 (y ; year of base date |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
322 (if (or (= y1 y2) (> month 9)) |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
323 y1 |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
324 y2)) |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
325 (d ; day of base date |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
326 (or day (if (> n 0) |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
327 1 |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
328 (calendar-last-day-of-month month y)))) |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
329 (date ; base date for holiday |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
330 (calendar-absolute-from-gregorian (list month d y)))) |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
331 (and (<= d1 date) (<= date d2) |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
332 (list (list (calendar-nth-named-day n dayname month y d) |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
333 string))))) |
406 | 334 |
93580
b6cea5b391eb
(calendar-holiday-list): Fix previous change.
Glenn Morris <rgm@gnu.org>
parents:
93494
diff
changeset
|
335 (defun holiday-filter-visible-calendar (hlist) |
b6cea5b391eb
(calendar-holiday-list): Fix previous change.
Glenn Morris <rgm@gnu.org>
parents:
93494
diff
changeset
|
336 "Filter list of holidays HLIST, and return only the visible ones. |
b6cea5b391eb
(calendar-holiday-list): Fix previous change.
Glenn Morris <rgm@gnu.org>
parents:
93494
diff
changeset
|
337 HLIST is a list of elements of the form (DATE) TEXT." |
b6cea5b391eb
(calendar-holiday-list): Fix previous change.
Glenn Morris <rgm@gnu.org>
parents:
93494
diff
changeset
|
338 (delq nil (mapcar (lambda (p) |
b6cea5b391eb
(calendar-holiday-list): Fix previous change.
Glenn Morris <rgm@gnu.org>
parents:
93494
diff
changeset
|
339 (and (car p) (calendar-date-is-visible-p (car p)) p)) |
b6cea5b391eb
(calendar-holiday-list): Fix previous change.
Glenn Morris <rgm@gnu.org>
parents:
93494
diff
changeset
|
340 hlist))) |
92922
e5d9e1e9c1b4
(displayed-month, displayed-year): Move declarations where needed.
Glenn Morris <rgm@gnu.org>
parents:
92842
diff
changeset
|
341 |
e5d9e1e9c1b4
(displayed-month, displayed-year): Move declarations where needed.
Glenn Morris <rgm@gnu.org>
parents:
92842
diff
changeset
|
342 (define-obsolete-function-alias |
e5d9e1e9c1b4
(displayed-month, displayed-year): Move declarations where needed.
Glenn Morris <rgm@gnu.org>
parents:
92842
diff
changeset
|
343 'filter-visible-calendar-holidays 'holiday-filter-visible-calendar "23.1") |
e5d9e1e9c1b4
(displayed-month, displayed-year): Move declarations where needed.
Glenn Morris <rgm@gnu.org>
parents:
92842
diff
changeset
|
344 |
3870
4acdfdf2a7c9
* holidays.el (calendar-holiday-function-fixed,
Jim Blandy <jimb@redhat.com>
parents:
3728
diff
changeset
|
345 (defun holiday-sexp (sexp string) |
4acdfdf2a7c9
* holidays.el (calendar-holiday-function-fixed,
Jim Blandy <jimb@redhat.com>
parents:
3728
diff
changeset
|
346 "Sexp holiday for dates in the calendar window. |
93494
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
347 SEXP is an expression in variable `year' that is evaluated to |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
348 give `date'. STRING is an expression in `date' that evaluates to |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
349 the holiday description of `date'. If `date' is visible in the |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
350 calendar window, the holiday STRING is on that date. If date is |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
351 nil, or if the date is not visible, there is no holiday." |
957 | 352 (let ((m displayed-month) |
93494
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
353 (y displayed-year) |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
354 year date) |
93809
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93712
diff
changeset
|
355 (calendar-increment-month m y -1) |
84356
357b5ff720d4
(holiday-list, calendar-check-holidays, calendar-mark-holidays)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78216
diff
changeset
|
356 (holiday-filter-visible-calendar |
357b5ff720d4
(holiday-list, calendar-check-holidays, calendar-mark-holidays)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78216
diff
changeset
|
357 (list |
93494
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
358 (progn |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
359 (setq year y |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
360 date (eval sexp)) |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
361 (list date (if date (eval string)))) |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
362 (progn |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
363 (setq year (1+ y) |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
364 date (eval sexp)) |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
365 (list date (if date (eval string)))))))) |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
366 |
957 | 367 |
58810
9fcc0f024a83
(holiday-advent): Make arguments optional for backwards
Glenn Morris <rgm@gnu.org>
parents:
58808
diff
changeset
|
368 (defun holiday-advent (&optional n string) |
9fcc0f024a83
(holiday-advent): Make arguments optional for backwards
Glenn Morris <rgm@gnu.org>
parents:
58808
diff
changeset
|
369 "Date of Nth day after advent (named STRING), if visible in calendar window. |
9fcc0f024a83
(holiday-advent): Make arguments optional for backwards
Glenn Morris <rgm@gnu.org>
parents:
58808
diff
changeset
|
370 Negative values of N are interpreted as days before advent. |
9fcc0f024a83
(holiday-advent): Make arguments optional for backwards
Glenn Morris <rgm@gnu.org>
parents:
58808
diff
changeset
|
371 STRING is used purely for display purposes. The return value has |
9fcc0f024a83
(holiday-advent): Make arguments optional for backwards
Glenn Morris <rgm@gnu.org>
parents:
58808
diff
changeset
|
372 the form ((MONTH DAY YEAR) STRING), where the date is that of the |
9fcc0f024a83
(holiday-advent): Make arguments optional for backwards
Glenn Morris <rgm@gnu.org>
parents:
58808
diff
changeset
|
373 Nth day before or after advent. |
9fcc0f024a83
(holiday-advent): Make arguments optional for backwards
Glenn Morris <rgm@gnu.org>
parents:
58808
diff
changeset
|
374 |
58823
46becd97b4c5
Fix spelling mistake in previous changes.
Glenn Morris <rgm@gnu.org>
parents:
58810
diff
changeset
|
375 For backwards compatibility, if this function is called with no |
58810
9fcc0f024a83
(holiday-advent): Make arguments optional for backwards
Glenn Morris <rgm@gnu.org>
parents:
58808
diff
changeset
|
376 arguments, then it returns the value appropriate for advent itself." |
58823
46becd97b4c5
Fix spelling mistake in previous changes.
Glenn Morris <rgm@gnu.org>
parents:
58810
diff
changeset
|
377 ;; Backwards compatibility layer. |
58810
9fcc0f024a83
(holiday-advent): Make arguments optional for backwards
Glenn Morris <rgm@gnu.org>
parents:
58808
diff
changeset
|
378 (if (not n) |
9fcc0f024a83
(holiday-advent): Make arguments optional for backwards
Glenn Morris <rgm@gnu.org>
parents:
58808
diff
changeset
|
379 (holiday-advent 0 "Advent") |
93494
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
380 (let* ((year displayed-year) |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
381 (month displayed-month) |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
382 (advent (progn |
93809
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93712
diff
changeset
|
383 (calendar-increment-month month year -1) |
93494
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
384 (calendar-gregorian-from-absolute |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
385 (+ n |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
386 (calendar-dayname-on-or-before |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
387 0 |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
388 (calendar-absolute-from-gregorian |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
389 (list 12 3 year)))))))) |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
390 (if (calendar-date-is-visible-p advent) |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
391 (list (list advent string)))))) |
406 | 392 |
58808
7d719c317dab
(holiday-easter-etc): Make arguments optional for backwards
Glenn Morris <rgm@gnu.org>
parents:
57197
diff
changeset
|
393 (defun holiday-easter-etc (&optional n string) |
7d719c317dab
(holiday-easter-etc): Make arguments optional for backwards
Glenn Morris <rgm@gnu.org>
parents:
57197
diff
changeset
|
394 "Date of Nth day after Easter (named STRING), if visible in calendar window. |
7d719c317dab
(holiday-easter-etc): Make arguments optional for backwards
Glenn Morris <rgm@gnu.org>
parents:
57197
diff
changeset
|
395 Negative values of N are interpreted as days before Easter. |
7d719c317dab
(holiday-easter-etc): Make arguments optional for backwards
Glenn Morris <rgm@gnu.org>
parents:
57197
diff
changeset
|
396 STRING is used purely for display purposes. The return value has |
7d719c317dab
(holiday-easter-etc): Make arguments optional for backwards
Glenn Morris <rgm@gnu.org>
parents:
57197
diff
changeset
|
397 the form ((MONTH DAY YEAR) STRING), where the date is that of the |
7d719c317dab
(holiday-easter-etc): Make arguments optional for backwards
Glenn Morris <rgm@gnu.org>
parents:
57197
diff
changeset
|
398 Nth day before or after Easter. |
7d719c317dab
(holiday-easter-etc): Make arguments optional for backwards
Glenn Morris <rgm@gnu.org>
parents:
57197
diff
changeset
|
399 |
58823
46becd97b4c5
Fix spelling mistake in previous changes.
Glenn Morris <rgm@gnu.org>
parents:
58810
diff
changeset
|
400 For backwards compatibility, if this function is called with no |
58808
7d719c317dab
(holiday-easter-etc): Make arguments optional for backwards
Glenn Morris <rgm@gnu.org>
parents:
57197
diff
changeset
|
401 arguments, then it returns a list of \"standard\" Easter-related |
93633
f0a60a0ac089
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93580
diff
changeset
|
402 holidays (with more entries if `calendar-christian-all-holidays-flag' |
58808
7d719c317dab
(holiday-easter-etc): Make arguments optional for backwards
Glenn Morris <rgm@gnu.org>
parents:
57197
diff
changeset
|
403 is non-nil)." |
58823
46becd97b4c5
Fix spelling mistake in previous changes.
Glenn Morris <rgm@gnu.org>
parents:
58810
diff
changeset
|
404 ;; Backwards compatibility layer. |
58808
7d719c317dab
(holiday-easter-etc): Make arguments optional for backwards
Glenn Morris <rgm@gnu.org>
parents:
57197
diff
changeset
|
405 (if (not n) |
93580
b6cea5b391eb
(calendar-holiday-list): Fix previous change.
Glenn Morris <rgm@gnu.org>
parents:
93494
diff
changeset
|
406 (apply 'append |
b6cea5b391eb
(calendar-holiday-list): Fix previous change.
Glenn Morris <rgm@gnu.org>
parents:
93494
diff
changeset
|
407 (mapcar (lambda (e) |
b6cea5b391eb
(calendar-holiday-list): Fix previous change.
Glenn Morris <rgm@gnu.org>
parents:
93494
diff
changeset
|
408 (apply 'holiday-easter-etc e)) |
b6cea5b391eb
(calendar-holiday-list): Fix previous change.
Glenn Morris <rgm@gnu.org>
parents:
93494
diff
changeset
|
409 ;; The combined list is not in order. |
b6cea5b391eb
(calendar-holiday-list): Fix previous change.
Glenn Morris <rgm@gnu.org>
parents:
93494
diff
changeset
|
410 (append |
93633
f0a60a0ac089
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93580
diff
changeset
|
411 (if calendar-christian-all-holidays-flag |
93580
b6cea5b391eb
(calendar-holiday-list): Fix previous change.
Glenn Morris <rgm@gnu.org>
parents:
93494
diff
changeset
|
412 '((-63 "Septuagesima Sunday") |
b6cea5b391eb
(calendar-holiday-list): Fix previous change.
Glenn Morris <rgm@gnu.org>
parents:
93494
diff
changeset
|
413 (-56 "Sexagesima Sunday") |
b6cea5b391eb
(calendar-holiday-list): Fix previous change.
Glenn Morris <rgm@gnu.org>
parents:
93494
diff
changeset
|
414 (-49 "Shrove Sunday") |
b6cea5b391eb
(calendar-holiday-list): Fix previous change.
Glenn Morris <rgm@gnu.org>
parents:
93494
diff
changeset
|
415 (-48 "Shrove Monday") |
b6cea5b391eb
(calendar-holiday-list): Fix previous change.
Glenn Morris <rgm@gnu.org>
parents:
93494
diff
changeset
|
416 (-47 "Shrove Tuesday") |
b6cea5b391eb
(calendar-holiday-list): Fix previous change.
Glenn Morris <rgm@gnu.org>
parents:
93494
diff
changeset
|
417 (-14 "Passion Sunday") |
b6cea5b391eb
(calendar-holiday-list): Fix previous change.
Glenn Morris <rgm@gnu.org>
parents:
93494
diff
changeset
|
418 (-7 "Palm Sunday") |
b6cea5b391eb
(calendar-holiday-list): Fix previous change.
Glenn Morris <rgm@gnu.org>
parents:
93494
diff
changeset
|
419 (-3 "Maundy Thursday") |
b6cea5b391eb
(calendar-holiday-list): Fix previous change.
Glenn Morris <rgm@gnu.org>
parents:
93494
diff
changeset
|
420 (35 "Rogation Sunday") |
b6cea5b391eb
(calendar-holiday-list): Fix previous change.
Glenn Morris <rgm@gnu.org>
parents:
93494
diff
changeset
|
421 (39 "Ascension Day") |
b6cea5b391eb
(calendar-holiday-list): Fix previous change.
Glenn Morris <rgm@gnu.org>
parents:
93494
diff
changeset
|
422 (49 "Pentecost (Whitsunday)") |
b6cea5b391eb
(calendar-holiday-list): Fix previous change.
Glenn Morris <rgm@gnu.org>
parents:
93494
diff
changeset
|
423 (50 "Whitmonday") |
b6cea5b391eb
(calendar-holiday-list): Fix previous change.
Glenn Morris <rgm@gnu.org>
parents:
93494
diff
changeset
|
424 (56 "Trinity Sunday") |
b6cea5b391eb
(calendar-holiday-list): Fix previous change.
Glenn Morris <rgm@gnu.org>
parents:
93494
diff
changeset
|
425 (60 "Corpus Christi"))) |
b6cea5b391eb
(calendar-holiday-list): Fix previous change.
Glenn Morris <rgm@gnu.org>
parents:
93494
diff
changeset
|
426 '((-46 "Ash Wednesday") |
b6cea5b391eb
(calendar-holiday-list): Fix previous change.
Glenn Morris <rgm@gnu.org>
parents:
93494
diff
changeset
|
427 (-2 "Good Friday") |
b6cea5b391eb
(calendar-holiday-list): Fix previous change.
Glenn Morris <rgm@gnu.org>
parents:
93494
diff
changeset
|
428 (0 "Easter Sunday"))))) |
58808
7d719c317dab
(holiday-easter-etc): Make arguments optional for backwards
Glenn Morris <rgm@gnu.org>
parents:
57197
diff
changeset
|
429 (let* ((century (1+ (/ displayed-year 100))) |
92649 | 430 (shifted-epact ; age of moon for April 5... |
92960
5a10f6dafd69
(displayed-month, displayed-year): Move declarations where needed.
Glenn Morris <rgm@gnu.org>
parents:
92922
diff
changeset
|
431 (% (+ 14 (* 11 (% displayed-year 19)) ; ...by Nicaean rule |
92649 | 432 (- ; ...corrected for the Gregorian century rule |
58808
7d719c317dab
(holiday-easter-etc): Make arguments optional for backwards
Glenn Morris <rgm@gnu.org>
parents:
57197
diff
changeset
|
433 (/ (* 3 century) 4)) |
92922
e5d9e1e9c1b4
(displayed-month, displayed-year): Move declarations where needed.
Glenn Morris <rgm@gnu.org>
parents:
92842
diff
changeset
|
434 (/ ; ...corrected for Metonic cycle inaccuracy |
58808
7d719c317dab
(holiday-easter-etc): Make arguments optional for backwards
Glenn Morris <rgm@gnu.org>
parents:
57197
diff
changeset
|
435 (+ 5 (* 8 century)) 25) |
92960
5a10f6dafd69
(displayed-month, displayed-year): Move declarations where needed.
Glenn Morris <rgm@gnu.org>
parents:
92922
diff
changeset
|
436 (* 30 century)) ; keeps value positive |
58808
7d719c317dab
(holiday-easter-etc): Make arguments optional for backwards
Glenn Morris <rgm@gnu.org>
parents:
57197
diff
changeset
|
437 30)) |
92960
5a10f6dafd69
(displayed-month, displayed-year): Move declarations where needed.
Glenn Morris <rgm@gnu.org>
parents:
92922
diff
changeset
|
438 (adjusted-epact ; adjust for 29.5 day month |
58808
7d719c317dab
(holiday-easter-etc): Make arguments optional for backwards
Glenn Morris <rgm@gnu.org>
parents:
57197
diff
changeset
|
439 (if (or (zerop shifted-epact) |
7d719c317dab
(holiday-easter-etc): Make arguments optional for backwards
Glenn Morris <rgm@gnu.org>
parents:
57197
diff
changeset
|
440 (and (= shifted-epact 1) (< 10 (% displayed-year 19)))) |
7d719c317dab
(holiday-easter-etc): Make arguments optional for backwards
Glenn Morris <rgm@gnu.org>
parents:
57197
diff
changeset
|
441 (1+ shifted-epact) |
7d719c317dab
(holiday-easter-etc): Make arguments optional for backwards
Glenn Morris <rgm@gnu.org>
parents:
57197
diff
changeset
|
442 shifted-epact)) |
92649 | 443 (paschal-moon ; day after the full moon on or after March 21 |
58808
7d719c317dab
(holiday-easter-etc): Make arguments optional for backwards
Glenn Morris <rgm@gnu.org>
parents:
57197
diff
changeset
|
444 (- (calendar-absolute-from-gregorian (list 4 19 displayed-year)) |
7d719c317dab
(holiday-easter-etc): Make arguments optional for backwards
Glenn Morris <rgm@gnu.org>
parents:
57197
diff
changeset
|
445 adjusted-epact)) |
93580
b6cea5b391eb
(calendar-holiday-list): Fix previous change.
Glenn Morris <rgm@gnu.org>
parents:
93494
diff
changeset
|
446 (abs-easter (calendar-dayname-on-or-before 0 (+ paschal-moon 7))) |
b6cea5b391eb
(calendar-holiday-list): Fix previous change.
Glenn Morris <rgm@gnu.org>
parents:
93494
diff
changeset
|
447 (greg (calendar-gregorian-from-absolute (+ abs-easter n)))) |
b6cea5b391eb
(calendar-holiday-list): Fix previous change.
Glenn Morris <rgm@gnu.org>
parents:
93494
diff
changeset
|
448 (if (calendar-date-is-visible-p greg) |
b6cea5b391eb
(calendar-holiday-list): Fix previous change.
Glenn Morris <rgm@gnu.org>
parents:
93494
diff
changeset
|
449 (list (list greg string)))))) |
406 | 450 |
86494
d3d37fadd367
(calendar-absolute-from-julian): Declare as a function.
Glenn Morris <rgm@gnu.org>
parents:
86294
diff
changeset
|
451 ;; Prior call to calendar-julian-from-absolute will autoload cal-julian. |
93639
d4a308909857
Update for cal-julian name changes.
Glenn Morris <rgm@gnu.org>
parents:
93633
diff
changeset
|
452 (declare-function calendar-julian-to-absolute "cal-julian" (date)) |
86494
d3d37fadd367
(calendar-absolute-from-julian): Declare as a function.
Glenn Morris <rgm@gnu.org>
parents:
86294
diff
changeset
|
453 |
3870
4acdfdf2a7c9
* holidays.el (calendar-holiday-function-fixed,
Jim Blandy <jimb@redhat.com>
parents:
3728
diff
changeset
|
454 (defun holiday-greek-orthodox-easter () |
4acdfdf2a7c9
* holidays.el (calendar-holiday-function-fixed,
Jim Blandy <jimb@redhat.com>
parents:
3728
diff
changeset
|
455 "Date of Easter according to the rule of the Council of Nicaea." |
93494
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
456 (let* ((m displayed-month) |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
457 (y displayed-year) |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
458 (julian-year (progn |
93809
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93712
diff
changeset
|
459 (calendar-increment-month m y 1) |
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93712
diff
changeset
|
460 (calendar-extract-year |
93494
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
461 (calendar-julian-from-absolute |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
462 (calendar-absolute-from-gregorian |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
463 (list m (calendar-last-day-of-month m y) y)))))) |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
464 (shifted-epact ; age of moon for April 5 |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
465 (% (+ 14 |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
466 (* 11 (% julian-year 19))) |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
467 30)) |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
468 (paschal-moon ; day after full moon on or after March 21 |
93639
d4a308909857
Update for cal-julian name changes.
Glenn Morris <rgm@gnu.org>
parents:
93633
diff
changeset
|
469 (- (calendar-julian-to-absolute (list 4 19 julian-year)) |
93494
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
470 shifted-epact)) |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
471 (nicaean-easter ; Sunday following the Paschal moon |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
472 (calendar-gregorian-from-absolute |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
473 (calendar-dayname-on-or-before 0 (+ paschal-moon 7))))) |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
474 (if (calendar-date-is-visible-p nicaean-easter) |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
475 (list (list nicaean-easter "Pascha (Greek Orthodox Easter)"))))) |
957 | 476 |
584 | 477 (provide 'holidays) |
478 | |
84356
357b5ff720d4
(holiday-list, calendar-check-holidays, calendar-mark-holidays)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78216
diff
changeset
|
479 ;; arch-tag: 48eb3117-75a7-4dbe-8fd9-873c3cbb0d37 |
660
08eb386dd0f3
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
584
diff
changeset
|
480 ;;; holidays.el ends here |