Mercurial > emacs
annotate lisp/calendar/holidays.el @ 112453:06719a229a46 default tip
* calc/calc.el (calc-default-power-reference-level)
(calc-default-field-reference-level): New variables.
* calc/calc-units.el (math-standard-units): Add dB and Np.
(math-logunits): New variable.
(math-extract-logunits, math-logcombine, calcFunc-luplus)
(calcFunc-luminus, calc-luplus, calc-luminus, math-logunit-level)
(calcFunc-fieldlevel, calcFunc-powerlevel, calc-level): New
functions.
(math-find-base-units-rec): Add entry for ln(10).
* calc/calc-help.el (calc-u-prefix-help): Add logarithmic help.
(calc-ul-prefix-help): New function.
* calc/calc-ext.el (calc-init-extensions): Autoload new units
functions. Add keybindings for new units functions.
author | Jay Belanger <jay.p.belanger@gmail.com> |
---|---|
date | Sun, 23 Jan 2011 23:08:04 -0600 |
parents | 61f7601898b1 |
children |
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, |
112284
61f7601898b1
Refill some copyright headers.
Glenn Morris <rgm@gnu.org>
parents:
112228
diff
changeset
|
4 ;; 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 |
61f7601898b1
Refill some copyright headers.
Glenn Morris <rgm@gnu.org>
parents:
112228
diff
changeset
|
5 ;; Free Software Foundation, Inc. |
846
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
811
diff
changeset
|
6 |
793
6fb68a1460a6
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
778
diff
changeset
|
7 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu> |
65919
5c09efcfc1d9
Update maintainer email address.
Glenn Morris <rgm@gnu.org>
parents:
64085
diff
changeset
|
8 ;; Maintainer: Glenn Morris <rgm@gnu.org> |
957 | 9 ;; Keywords: holidays, calendar |
110015
280c8ae2476d
Add "Package:" file headers to denote built-in packages.
Chong Yidong <cyd@stupidchicken.com>
parents:
106815
diff
changeset
|
10 ;; Package: calendar |
793
6fb68a1460a6
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
778
diff
changeset
|
11 |
406 | 12 ;; This file is part of GNU Emacs. |
13 | |
94653
e49abd957e81
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94456
diff
changeset
|
14 ;; GNU Emacs is free software: you can redistribute it and/or modify |
6736
3e1323443b1a
Fix copying conditions for current GPL version.
Richard M. Stallman <rms@gnu.org>
parents:
5831
diff
changeset
|
15 ;; it under the terms of the GNU General Public License as published by |
94653
e49abd957e81
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94456
diff
changeset
|
16 ;; the Free Software Foundation, either version 3 of the License, or |
e49abd957e81
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94456
diff
changeset
|
17 ;; (at your option) any later version. |
3870
4acdfdf2a7c9
* holidays.el (calendar-holiday-function-fixed,
Jim Blandy <jimb@redhat.com>
parents:
3728
diff
changeset
|
18 |
406 | 19 ;; 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
|
20 ;; 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
|
21 ;; 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
|
22 ;; GNU General Public License for more details. |
406 | 23 |
6736
3e1323443b1a
Fix copying conditions for current GPL version.
Richard M. Stallman <rms@gnu.org>
parents:
5831
diff
changeset
|
24 ;; You should have received a copy of the GNU General Public License |
94653
e49abd957e81
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94456
diff
changeset
|
25 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
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) |
105933
8f110099da5c
Update x-popup-menu declaration.
Glenn Morris <rgm@gnu.org>
parents:
105870
diff
changeset
|
34 (load "hol-loaddefs" nil t) |
957 | 35 |
93996
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
36 (defgroup holidays nil |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
37 "Holidays support in calendar." |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
38 :group 'calendar |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
39 :prefix "holidays-" |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
40 :group 'local) |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
41 |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
42 ;; The various holiday variables are autoloaded because people |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
43 ;; are used to using them to set calendar-holidays without having to |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
44 ;; explicitly load this file. |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
45 |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
46 ;;;###autoload |
111306
d86b7e0aed88
Reposition some aliases in holidays.el.
Glenn Morris <rgm@gnu.org>
parents:
110015
diff
changeset
|
47 (define-obsolete-variable-alias 'general-holidays |
d86b7e0aed88
Reposition some aliases in holidays.el.
Glenn Morris <rgm@gnu.org>
parents:
110015
diff
changeset
|
48 'holiday-general-holidays "23.1") |
d86b7e0aed88
Reposition some aliases in holidays.el.
Glenn Morris <rgm@gnu.org>
parents:
110015
diff
changeset
|
49 ;;;###autoload |
93996
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
50 (defcustom holiday-general-holidays |
105870
26baacb565b0
* textmodes/tex-mode.el (tex-alt-dvi-print-command)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105844
diff
changeset
|
51 (mapcar 'purecopy |
93996
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
52 '((holiday-fixed 1 1 "New Year's Day") |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
53 (holiday-float 1 1 3 "Martin Luther King Day") |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
54 (holiday-fixed 2 2 "Groundhog Day") |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
55 (holiday-fixed 2 14 "Valentine's Day") |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
56 (holiday-float 2 1 3 "President's Day") |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
57 (holiday-fixed 3 17 "St. Patrick's Day") |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
58 (holiday-fixed 4 1 "April Fools' Day") |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
59 (holiday-float 5 0 2 "Mother's Day") |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
60 (holiday-float 5 1 -1 "Memorial Day") |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
61 (holiday-fixed 6 14 "Flag Day") |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
62 (holiday-float 6 0 3 "Father's Day") |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
63 (holiday-fixed 7 4 "Independence Day") |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
64 (holiday-float 9 1 1 "Labor Day") |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
65 (holiday-float 10 1 2 "Columbus Day") |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
66 (holiday-fixed 10 31 "Halloween") |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
67 (holiday-fixed 11 11 "Veteran's Day") |
105870
26baacb565b0
* textmodes/tex-mode.el (tex-alt-dvi-print-command)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105844
diff
changeset
|
68 (holiday-float 11 4 4 "Thanksgiving"))) |
93996
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
69 "General holidays. Default value is for the United States. |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
70 See the documentation for `calendar-holidays' for details." |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
71 :type 'sexp |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
72 :group 'holidays) |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
73 ;;;###autoload |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
74 (put 'holiday-general-holidays 'risky-local-variable t) |
111306
d86b7e0aed88
Reposition some aliases in holidays.el.
Glenn Morris <rgm@gnu.org>
parents:
110015
diff
changeset
|
75 |
93996
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
76 ;;;###autoload |
111306
d86b7e0aed88
Reposition some aliases in holidays.el.
Glenn Morris <rgm@gnu.org>
parents:
110015
diff
changeset
|
77 (define-obsolete-variable-alias 'oriental-holidays |
d86b7e0aed88
Reposition some aliases in holidays.el.
Glenn Morris <rgm@gnu.org>
parents:
110015
diff
changeset
|
78 'holiday-oriental-holidays "23.1") |
93996
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
79 ;;;###autoload |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
80 (defcustom holiday-oriental-holidays |
105870
26baacb565b0
* textmodes/tex-mode.el (tex-alt-dvi-print-command)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105844
diff
changeset
|
81 (mapcar 'purecopy |
94281
0cbedba0ce0d
(holiday-oriental-holidays): Add more holidays.
Glenn Morris <rgm@gnu.org>
parents:
93996
diff
changeset
|
82 '((holiday-chinese-new-year) |
0cbedba0ce0d
(holiday-oriental-holidays): Add more holidays.
Glenn Morris <rgm@gnu.org>
parents:
93996
diff
changeset
|
83 (if calendar-chinese-all-holidays-flag |
0cbedba0ce0d
(holiday-oriental-holidays): Add more holidays.
Glenn Morris <rgm@gnu.org>
parents:
93996
diff
changeset
|
84 (append |
0cbedba0ce0d
(holiday-oriental-holidays): Add more holidays.
Glenn Morris <rgm@gnu.org>
parents:
93996
diff
changeset
|
85 (holiday-chinese 1 15 "Lantern Festival") |
0cbedba0ce0d
(holiday-oriental-holidays): Add more holidays.
Glenn Morris <rgm@gnu.org>
parents:
93996
diff
changeset
|
86 (holiday-chinese-qingming) |
0cbedba0ce0d
(holiday-oriental-holidays): Add more holidays.
Glenn Morris <rgm@gnu.org>
parents:
93996
diff
changeset
|
87 (holiday-chinese 5 5 "Dragon Boat Festival") |
0cbedba0ce0d
(holiday-oriental-holidays): Add more holidays.
Glenn Morris <rgm@gnu.org>
parents:
93996
diff
changeset
|
88 (holiday-chinese 7 7 "Double Seventh Festival") |
0cbedba0ce0d
(holiday-oriental-holidays): Add more holidays.
Glenn Morris <rgm@gnu.org>
parents:
93996
diff
changeset
|
89 (holiday-chinese 8 15 "Mid-Autumn Festival") |
0cbedba0ce0d
(holiday-oriental-holidays): Add more holidays.
Glenn Morris <rgm@gnu.org>
parents:
93996
diff
changeset
|
90 (holiday-chinese 9 9 "Double Ninth Festival") |
0cbedba0ce0d
(holiday-oriental-holidays): Add more holidays.
Glenn Morris <rgm@gnu.org>
parents:
93996
diff
changeset
|
91 (holiday-chinese-winter-solstice) |
105870
26baacb565b0
* textmodes/tex-mode.el (tex-alt-dvi-print-command)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105844
diff
changeset
|
92 )))) |
93996
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
93 "Oriental holidays. |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
94 See the documentation for `calendar-holidays' for details." |
94281
0cbedba0ce0d
(holiday-oriental-holidays): Add more holidays.
Glenn Morris <rgm@gnu.org>
parents:
93996
diff
changeset
|
95 :version "23.1" ; added more holidays |
93996
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
96 :type 'sexp |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
97 :group 'holidays) |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
98 ;;;###autoload |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
99 (put 'holiday-oriental-holidays 'risky-local-variable t) |
111306
d86b7e0aed88
Reposition some aliases in holidays.el.
Glenn Morris <rgm@gnu.org>
parents:
110015
diff
changeset
|
100 |
93996
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
101 ;;;###autoload |
111306
d86b7e0aed88
Reposition some aliases in holidays.el.
Glenn Morris <rgm@gnu.org>
parents:
110015
diff
changeset
|
102 (define-obsolete-variable-alias 'local-holidays 'holiday-local-holidays "23.1") |
93996
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
103 ;;;###autoload |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
104 (defcustom holiday-local-holidays nil |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
105 "Local holidays. |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
106 See the documentation for `calendar-holidays' for details." |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
107 :type 'sexp |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
108 :group 'holidays) |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
109 ;;;###autoload |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
110 (put 'holiday-local-holidays 'risky-local-variable t) |
111306
d86b7e0aed88
Reposition some aliases in holidays.el.
Glenn Morris <rgm@gnu.org>
parents:
110015
diff
changeset
|
111 |
93996
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
112 ;;;###autoload |
111306
d86b7e0aed88
Reposition some aliases in holidays.el.
Glenn Morris <rgm@gnu.org>
parents:
110015
diff
changeset
|
113 (define-obsolete-variable-alias 'other-holidays 'holiday-other-holidays "23.1") |
93996
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
114 ;;;###autoload |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
115 (defcustom holiday-other-holidays nil |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
116 "User defined holidays. |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
117 See the documentation for `calendar-holidays' for details." |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
118 :type 'sexp |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
119 :group 'holidays) |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
120 ;;;###autoload |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
121 (put 'holiday-other-holidays 'risky-local-variable t) |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
122 |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
123 ;;;###autoload |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
124 (defvar hebrew-holidays-1 |
105870
26baacb565b0
* textmodes/tex-mode.el (tex-alt-dvi-print-command)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105844
diff
changeset
|
125 (mapcar 'purecopy |
93996
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
126 '((holiday-hebrew-rosh-hashanah) |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
127 (if calendar-hebrew-all-holidays-flag |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
128 (holiday-julian |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
129 11 |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
130 (let ((m displayed-month) |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
131 (y displayed-year) |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
132 year) |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
133 (calendar-increment-month m y -1) |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
134 (setq year (calendar-extract-year |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
135 (calendar-julian-from-absolute |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
136 (calendar-absolute-from-gregorian (list m 1 y))))) |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
137 (if (zerop (% (1+ year) 4)) |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
138 22 |
105870
26baacb565b0
* textmodes/tex-mode.el (tex-alt-dvi-print-command)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105844
diff
changeset
|
139 21)) "\"Tal Umatar\" (evening)")))) |
93996
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
140 "Component of the old default value of `holiday-hebrew-holidays'.") |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
141 ;;;###autoload |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
142 (put 'hebrew-holidays-1 'risky-local-variable t) |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
143 (make-obsolete-variable 'hebrew-holidays-1 'hebrew-holidays "23.1") |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
144 |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
145 ;;;###autoload |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
146 (defvar hebrew-holidays-2 |
105870
26baacb565b0
* textmodes/tex-mode.el (tex-alt-dvi-print-command)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105844
diff
changeset
|
147 (mapcar 'purecopy |
93996
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
148 '((holiday-hebrew-hanukkah) ; respects calendar-hebrew-all-holidays-flag |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
149 (if calendar-hebrew-all-holidays-flag |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
150 (holiday-hebrew |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
151 10 |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
152 (let ((h-year (calendar-extract-year |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
153 (calendar-hebrew-from-absolute |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
154 (calendar-absolute-from-gregorian |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
155 (list displayed-month 28 displayed-year)))))) |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
156 (if (= 6 (% (calendar-hebrew-to-absolute (list 10 10 h-year)) |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
157 7)) |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
158 11 10)) |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
159 "Tzom Teveth")) |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
160 (if calendar-hebrew-all-holidays-flag |
105870
26baacb565b0
* textmodes/tex-mode.el (tex-alt-dvi-print-command)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105844
diff
changeset
|
161 (holiday-hebrew 11 15 "Tu B'Shevat")))) |
93996
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
162 "Component of the old default value of `holiday-hebrew-holidays'.") |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
163 ;;;###autoload |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
164 (put 'hebrew-holidays-2 'risky-local-variable t) |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
165 (make-obsolete-variable 'hebrew-holidays-2 'hebrew-holidays "23.1") |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
166 |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
167 ;;;###autoload |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
168 (defvar hebrew-holidays-3 |
105870
26baacb565b0
* textmodes/tex-mode.el (tex-alt-dvi-print-command)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105844
diff
changeset
|
169 (mapcar 'purecopy |
93996
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
170 '((if calendar-hebrew-all-holidays-flag |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
171 (holiday-hebrew |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
172 11 |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
173 (let* ((m displayed-month) |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
174 (y displayed-year) |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
175 (h-year (progn |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
176 (calendar-increment-month m y 1) |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
177 (calendar-extract-year |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
178 (calendar-hebrew-from-absolute |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
179 (calendar-absolute-from-gregorian |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
180 (list m (calendar-last-day-of-month m y) y)))))) |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
181 (s-s |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
182 (calendar-hebrew-from-absolute |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
183 (if (= 6 |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
184 (% (calendar-hebrew-to-absolute |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
185 (list 7 1 h-year)) |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
186 7)) |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
187 (calendar-dayname-on-or-before |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
188 6 (calendar-hebrew-to-absolute |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
189 (list 11 17 h-year))) |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
190 (calendar-dayname-on-or-before |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
191 6 (calendar-hebrew-to-absolute |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
192 (list 11 16 h-year)))))) |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
193 (day (calendar-extract-day s-s))) |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
194 day) |
105870
26baacb565b0
* textmodes/tex-mode.el (tex-alt-dvi-print-command)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105844
diff
changeset
|
195 "Shabbat Shirah")))) |
93996
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
196 "Component of the old default value of `holiday-hebrew-holidays'.") |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
197 ;;;###autoload |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
198 (put 'hebrew-holidays-3 'risky-local-variable t) |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
199 (make-obsolete-variable 'hebrew-holidays-3 'hebrew-holidays "23.1") |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
200 |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
201 ;;;###autoload |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
202 (defvar hebrew-holidays-4 |
105870
26baacb565b0
* textmodes/tex-mode.el (tex-alt-dvi-print-command)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105844
diff
changeset
|
203 (mapcar 'purecopy |
93996
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
204 '((holiday-hebrew-passover) |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
205 (and calendar-hebrew-all-holidays-flag |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
206 (let* ((m displayed-month) |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
207 (y displayed-year) |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
208 (year (progn |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
209 (calendar-increment-month m y -1) |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
210 (calendar-extract-year |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
211 (calendar-julian-from-absolute |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
212 (calendar-absolute-from-gregorian (list m 1 y))))))) |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
213 (= 21 (% year 28))) |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
214 (holiday-julian 3 26 "Kiddush HaHamah")) |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
215 (if calendar-hebrew-all-holidays-flag |
105870
26baacb565b0
* textmodes/tex-mode.el (tex-alt-dvi-print-command)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105844
diff
changeset
|
216 (holiday-hebrew-tisha-b-av)))) |
93996
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
217 "Component of the old default value of `holiday-hebrew-holidays'.") |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
218 ;;;###autoload |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
219 (put 'hebrew-holidays-4 'risky-local-variable t) |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
220 (make-obsolete-variable 'hebrew-holidays-4 'hebrew-holidays "23.1") |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
221 |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
222 ;;;###autoload |
111306
d86b7e0aed88
Reposition some aliases in holidays.el.
Glenn Morris <rgm@gnu.org>
parents:
110015
diff
changeset
|
223 (define-obsolete-variable-alias 'hebrew-holidays |
d86b7e0aed88
Reposition some aliases in holidays.el.
Glenn Morris <rgm@gnu.org>
parents:
110015
diff
changeset
|
224 'holiday-hebrew-holidays "23.1") |
d86b7e0aed88
Reposition some aliases in holidays.el.
Glenn Morris <rgm@gnu.org>
parents:
110015
diff
changeset
|
225 ;;;###autoload |
93996
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
226 (defcustom holiday-hebrew-holidays |
105870
26baacb565b0
* textmodes/tex-mode.el (tex-alt-dvi-print-command)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105844
diff
changeset
|
227 (mapcar 'purecopy |
93996
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
228 '((holiday-hebrew-passover) |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
229 (holiday-hebrew-rosh-hashanah) |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
230 (holiday-hebrew-hanukkah) |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
231 (if calendar-hebrew-all-holidays-flag |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
232 (append |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
233 (holiday-hebrew-tisha-b-av) |
105870
26baacb565b0
* textmodes/tex-mode.el (tex-alt-dvi-print-command)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105844
diff
changeset
|
234 (holiday-hebrew-misc))))) |
93996
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
235 "Jewish holidays. |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
236 See the documentation for `calendar-holidays' for details." |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
237 :type 'sexp |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
238 :version "23.1" ; removed dependency on hebrew-holidays-N |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
239 :group 'holidays) |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
240 ;;;###autoload |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
241 (put 'holiday-hebrew-holidays 'risky-local-variable t) |
111306
d86b7e0aed88
Reposition some aliases in holidays.el.
Glenn Morris <rgm@gnu.org>
parents:
110015
diff
changeset
|
242 |
93996
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
243 ;;;###autoload |
111306
d86b7e0aed88
Reposition some aliases in holidays.el.
Glenn Morris <rgm@gnu.org>
parents:
110015
diff
changeset
|
244 (define-obsolete-variable-alias 'christian-holidays |
d86b7e0aed88
Reposition some aliases in holidays.el.
Glenn Morris <rgm@gnu.org>
parents:
110015
diff
changeset
|
245 'holiday-christian-holidays "23.1") |
93996
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
246 ;;;###autoload |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
247 (defcustom holiday-christian-holidays |
105870
26baacb565b0
* textmodes/tex-mode.el (tex-alt-dvi-print-command)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105844
diff
changeset
|
248 (mapcar 'purecopy |
93996
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
249 '((holiday-easter-etc) ; respects calendar-christian-all-holidays-flag |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
250 (holiday-fixed 12 25 "Christmas") |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
251 (if calendar-christian-all-holidays-flag |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
252 (append |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
253 (holiday-fixed 1 6 "Epiphany") |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
254 (holiday-julian 12 25 "Eastern Orthodox Christmas") |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
255 (holiday-greek-orthodox-easter) |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
256 (holiday-fixed 8 15 "Assumption") |
105870
26baacb565b0
* textmodes/tex-mode.el (tex-alt-dvi-print-command)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105844
diff
changeset
|
257 (holiday-advent 0 "Advent"))))) |
93996
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
258 "Christian holidays. |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
259 See the documentation for `calendar-holidays' for details." |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
260 :type 'sexp |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
261 :group 'holidays) |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
262 ;;;###autoload |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
263 (put 'holiday-christian-holidays 'risky-local-variable t) |
111306
d86b7e0aed88
Reposition some aliases in holidays.el.
Glenn Morris <rgm@gnu.org>
parents:
110015
diff
changeset
|
264 |
93996
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
265 ;;;###autoload |
111306
d86b7e0aed88
Reposition some aliases in holidays.el.
Glenn Morris <rgm@gnu.org>
parents:
110015
diff
changeset
|
266 (define-obsolete-variable-alias 'islamic-holidays |
d86b7e0aed88
Reposition some aliases in holidays.el.
Glenn Morris <rgm@gnu.org>
parents:
110015
diff
changeset
|
267 'holiday-islamic-holidays "23.1") |
93996
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
268 ;;;###autoload |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
269 (defcustom holiday-islamic-holidays |
105870
26baacb565b0
* textmodes/tex-mode.el (tex-alt-dvi-print-command)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105844
diff
changeset
|
270 (mapcar 'purecopy |
93996
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
271 '((holiday-islamic-new-year) |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
272 (holiday-islamic 9 1 "Ramadan Begins") |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
273 (if calendar-islamic-all-holidays-flag |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
274 (append |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
275 (holiday-islamic 1 10 "Ashura") |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
276 (holiday-islamic 3 12 "Mulad-al-Nabi") |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
277 (holiday-islamic 7 26 "Shab-e-Mi'raj") |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
278 (holiday-islamic 8 15 "Shab-e-Bara't") |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
279 (holiday-islamic 9 27 "Shab-e Qadr") |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
280 (holiday-islamic 10 1 "Id-al-Fitr") |
105870
26baacb565b0
* textmodes/tex-mode.el (tex-alt-dvi-print-command)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105844
diff
changeset
|
281 (holiday-islamic 12 10 "Id-al-Adha"))))) |
93996
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
282 "Islamic holidays. |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
283 See the documentation for `calendar-holidays' for details." |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
284 :type 'sexp |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
285 :group 'holidays) |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
286 ;;;###autoload |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
287 (put 'holiday-islamic-holidays 'risky-local-variable t) |
111306
d86b7e0aed88
Reposition some aliases in holidays.el.
Glenn Morris <rgm@gnu.org>
parents:
110015
diff
changeset
|
288 |
93996
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
289 ;;;###autoload |
111306
d86b7e0aed88
Reposition some aliases in holidays.el.
Glenn Morris <rgm@gnu.org>
parents:
110015
diff
changeset
|
290 (define-obsolete-variable-alias 'bahai-holidays 'holiday-bahai-holidays "23.1") |
93996
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
291 ;;;###autoload |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
292 (defcustom holiday-bahai-holidays |
105870
26baacb565b0
* textmodes/tex-mode.el (tex-alt-dvi-print-command)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105844
diff
changeset
|
293 (mapcar 'purecopy |
93996
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
294 '((holiday-bahai-new-year) |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
295 (holiday-bahai-ridvan) ; respects calendar-bahai-all-holidays-flag |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
296 (holiday-fixed 5 23 "Declaration of the Bab") |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
297 (holiday-fixed 5 29 "Ascension of Baha'u'llah") |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
298 (holiday-fixed 7 9 "Martyrdom of the Bab") |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
299 (holiday-fixed 10 20 "Birth of the Bab") |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
300 (holiday-fixed 11 12 "Birth of Baha'u'llah") |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
301 (if calendar-bahai-all-holidays-flag |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
302 (append |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
303 (holiday-fixed 11 26 "Day of the Covenant") |
105870
26baacb565b0
* textmodes/tex-mode.el (tex-alt-dvi-print-command)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105844
diff
changeset
|
304 (holiday-fixed 11 28 "Ascension of `Abdu'l-Baha"))))) |
93996
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
305 "Baha'i holidays. |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
306 See the documentation for `calendar-holidays' for details." |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
307 :type 'sexp |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
308 :group 'holidays) |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
309 ;;;###autoload |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
310 (put 'holiday-bahai-holidays 'risky-local-variable t) |
111306
d86b7e0aed88
Reposition some aliases in holidays.el.
Glenn Morris <rgm@gnu.org>
parents:
110015
diff
changeset
|
311 |
93996
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
312 ;;;###autoload |
111306
d86b7e0aed88
Reposition some aliases in holidays.el.
Glenn Morris <rgm@gnu.org>
parents:
110015
diff
changeset
|
313 (define-obsolete-variable-alias 'solar-holidays 'holiday-solar-holidays "23.1") |
93996
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
314 ;;;###autoload |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
315 (defcustom holiday-solar-holidays |
105870
26baacb565b0
* textmodes/tex-mode.el (tex-alt-dvi-print-command)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105844
diff
changeset
|
316 (mapcar 'purecopy |
93996
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
317 '((solar-equinoxes-solstices) |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
318 (holiday-sexp calendar-daylight-savings-starts |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
319 (format "Daylight Saving Time Begins %s" |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
320 (solar-time-string |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
321 (/ calendar-daylight-savings-starts-time (float 60)) |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
322 calendar-standard-time-zone-name))) |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
323 (holiday-sexp calendar-daylight-savings-ends |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
324 (format "Daylight Saving Time Ends %s" |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
325 (solar-time-string |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
326 (/ calendar-daylight-savings-ends-time (float 60)) |
105870
26baacb565b0
* textmodes/tex-mode.el (tex-alt-dvi-print-command)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105844
diff
changeset
|
327 calendar-daylight-time-zone-name))))) |
93996
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
328 "Sun-related holidays. |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
329 See the documentation for `calendar-holidays' for details." |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
330 :type 'sexp |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
331 :group 'holidays) |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
332 ;;;###autoload |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
333 (put 'holiday-solar-holidays 'risky-local-variable t) |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
334 |
102819
6cae903fcecf
(calendar-holidays): Don't autoload it. (Bug#2811)
Glenn Morris <rgm@gnu.org>
parents:
101083
diff
changeset
|
335 ;; This one should not be autoloaded, else .emacs changes of |
6cae903fcecf
(calendar-holidays): Don't autoload it. (Bug#2811)
Glenn Morris <rgm@gnu.org>
parents:
101083
diff
changeset
|
336 ;; holiday-general-holidays etc have no effect. |
6cae903fcecf
(calendar-holidays): Don't autoload it. (Bug#2811)
Glenn Morris <rgm@gnu.org>
parents:
101083
diff
changeset
|
337 ;; FIXME should have some :set-after. |
93996
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
338 (defcustom calendar-holidays |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
339 (append holiday-general-holidays holiday-local-holidays |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
340 holiday-other-holidays holiday-christian-holidays |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
341 holiday-hebrew-holidays holiday-islamic-holidays |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
342 holiday-bahai-holidays holiday-oriental-holidays |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
343 holiday-solar-holidays) |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
344 "List of notable days for the command \\[holidays]. |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
345 |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
346 Additional holidays are easy to add to the list, just put them in the |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
347 list `holiday-other-holidays' in your .emacs file. Similarly, by setting |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
348 any of `holiday-general-holidays', `holiday-local-holidays', |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
349 `holiday-christian-holidays', `holiday-hebrew-holidays', |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
350 `holiday-islamic-holidays', `holiday-bahai-holidays', |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
351 `holiday-oriental-holidays', or `holiday-solar-holidays' to nil in your |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
352 .emacs file, you can eliminate unwanted categories of holidays. |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
353 |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
354 The aforementioned variables control the holiday choices offered |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
355 by the function `holiday-list' when it is called interactively. |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
356 |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
357 They also initialize the default value of `calendar-holidays', |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
358 which is the default list of holidays used by the function |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
359 `holiday-list' in the non-interactive case. Note that these |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
360 variables have no effect on `calendar-holidays' after it has been |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
361 set (e.g. after the calendar is loaded). In that case, customize |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
362 `calendar-holidays' directly. |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
363 |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
364 The intention is that (in the US) `holiday-local-holidays' be set in |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
365 site-init.el and `holiday-other-holidays' be set by the user. |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
366 |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
367 Entries on the list are expressions that return (possibly empty) lists of |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
368 items of the form ((month day year) string) of a holiday in the |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
369 three-month period centered around `displayed-month' of `displayed-year'. |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
370 Several basic functions are provided for this purpose: |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
371 |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
372 (holiday-fixed MONTH DAY STRING) is a fixed date on the Gregorian calendar |
97722 | 373 (holiday-float MONTH DAYNAME K STRING &optional DAY) is the Kth DAYNAME |
374 (0 for Sunday, etc.) after/before Gregorian | |
375 MONTH DAY. K<0 means count back from the end | |
376 of the month. Optional DAY defaults to 1 if | |
377 K>0, and MONTH's last day otherwise. | |
93996
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
378 (holiday-hebrew MONTH DAY STRING) a fixed date on the Hebrew calendar |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
379 (holiday-islamic MONTH DAY STRING) a fixed date on the Islamic calendar |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
380 (holiday-bahai MONTH DAY STRING) a fixed date on the Baha'i calendar |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
381 (holiday-julian MONTH DAY STRING) a fixed date on the Julian calendar |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
382 (holiday-sexp SEXP STRING) SEXP is a Gregorian-date-valued expression |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
383 in the variable `year'; if it evaluates to |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
384 a visible date, that's the holiday; if it |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
385 evaluates to nil, there's no holiday. STRING |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
386 is an expression in the variable `date'. |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
387 |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
388 For example, to add Bastille Day, celebrated in France on July 14, add |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
389 |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
390 (holiday-fixed 7 14 \"Bastille Day\") |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
391 |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
392 to the list. To add Hurricane Supplication Day, celebrated in the Virgin |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
393 Islands on the fourth Monday in August, add |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
394 |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
395 (holiday-float 8 1 4 \"Hurricane Supplication Day\") |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
396 |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
397 to the list (the last Monday would be specified with `-1' instead of `4'). |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
398 To add the last day of Hanukkah to the list, use |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
399 |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
400 (holiday-hebrew 10 2 \"Last day of Hanukkah\") |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
401 |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
402 since the Hebrew months are numbered with 1 starting from Nisan. |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
403 To add the Islamic feast celebrating Mohammed's birthday, use |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
404 |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
405 (holiday-islamic 3 12 \"Mohammed's Birthday\") |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
406 |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
407 since the Islamic months are numbered from 1 starting with Muharram. |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
408 To add an entry for the Baha'i festival of Ridvan, use |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
409 |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
410 (holiday-bahai 2 13 \"Festival of Ridvan\") |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
411 |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
412 since the Baha'i months are numbered from 1 starting with Baha. |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
413 To add Thomas Jefferson's birthday, April 2, 1743 (Julian), use |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
414 |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
415 (holiday-julian 4 2 \"Jefferson's Birthday\") |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
416 |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
417 To include a holiday conditionally, use the sexp form or a conditional. For |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
418 example, to include American presidential elections, which occur on the first |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
419 Tuesday after the first Monday in November of years divisible by 4, add |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
420 |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
421 (holiday-sexp |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
422 '(if (zerop (% year 4)) |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
423 (calendar-gregorian-from-absolute |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
424 (1+ (calendar-dayname-on-or-before |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
425 1 (+ 6 (calendar-absolute-from-gregorian |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
426 (list 11 1 year))))))) |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
427 \"US Presidential Election\") |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
428 |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
429 or |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
430 |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
431 (if (zerop (% displayed-year 4)) |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
432 (holiday-fixed 11 |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
433 (calendar-extract-day |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
434 (calendar-gregorian-from-absolute |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
435 (1+ (calendar-dayname-on-or-before |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
436 1 (+ 6 (calendar-absolute-from-gregorian |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
437 (list 11 1 displayed-year))))))) |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
438 \"US Presidential Election\")) |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
439 |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
440 to the list. To include the phases of the moon, add |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
441 |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
442 (lunar-phases) |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
443 |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
444 to the holiday list, where `lunar-phases' is an Emacs-Lisp function that |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
445 you've written to return a (possibly empty) list of the relevant VISIBLE dates |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
446 with descriptive strings such as |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
447 |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
448 (((2 6 1989) \"New Moon\") ((2 12 1989) \"First Quarter Moon\") ... )." |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
449 :type 'sexp |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
450 :group 'holidays) |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
451 ;;;###autoload |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
452 (put 'calendar-holidays 'risky-local-variable t) |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
453 |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
454 ;;; End of user options. |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
455 |
d76c0fd8ef0c
(holidays): Move custom groups here from calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
456 |
93844
bf9ef749c23e
Replace int-to-string with number-to-string.
Glenn Morris <rgm@gnu.org>
parents:
93809
diff
changeset
|
457 ;; FIXME name that makes sense |
92922
e5d9e1e9c1b4
(displayed-month, displayed-year): Move declarations where needed.
Glenn Morris <rgm@gnu.org>
parents:
92842
diff
changeset
|
458 ;;;###diary-autoload |
e5d9e1e9c1b4
(displayed-month, displayed-year): Move declarations where needed.
Glenn Morris <rgm@gnu.org>
parents:
92842
diff
changeset
|
459 (defun calendar-holiday-list () |
e5d9e1e9c1b4
(displayed-month, displayed-year): Move declarations where needed.
Glenn Morris <rgm@gnu.org>
parents:
92842
diff
changeset
|
460 "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
|
461 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
|
462 (let (res h) |
b6cea5b391eb
(calendar-holiday-list): Fix previous change.
Glenn Morris <rgm@gnu.org>
parents:
93494
diff
changeset
|
463 (sort |
b6cea5b391eb
(calendar-holiday-list): Fix previous change.
Glenn Morris <rgm@gnu.org>
parents:
93494
diff
changeset
|
464 (dolist (p calendar-holidays res) |
b6cea5b391eb
(calendar-holiday-list): Fix previous change.
Glenn Morris <rgm@gnu.org>
parents:
93494
diff
changeset
|
465 (if (setq h (if calendar-debug-sexp |
b6cea5b391eb
(calendar-holiday-list): Fix previous change.
Glenn Morris <rgm@gnu.org>
parents:
93494
diff
changeset
|
466 (let ((stack-trace-on-error t)) |
b6cea5b391eb
(calendar-holiday-list): Fix previous change.
Glenn Morris <rgm@gnu.org>
parents:
93494
diff
changeset
|
467 (eval p)) |
b6cea5b391eb
(calendar-holiday-list): Fix previous change.
Glenn Morris <rgm@gnu.org>
parents:
93494
diff
changeset
|
468 (condition-case nil |
b6cea5b391eb
(calendar-holiday-list): Fix previous change.
Glenn Morris <rgm@gnu.org>
parents:
93494
diff
changeset
|
469 (eval p) |
b6cea5b391eb
(calendar-holiday-list): Fix previous change.
Glenn Morris <rgm@gnu.org>
parents:
93494
diff
changeset
|
470 (error (beep) |
b6cea5b391eb
(calendar-holiday-list): Fix previous change.
Glenn Morris <rgm@gnu.org>
parents:
93494
diff
changeset
|
471 (message "Bad holiday list item: %s" p) |
b6cea5b391eb
(calendar-holiday-list): Fix previous change.
Glenn Morris <rgm@gnu.org>
parents:
93494
diff
changeset
|
472 (sleep-for 2))))) |
b6cea5b391eb
(calendar-holiday-list): Fix previous change.
Glenn Morris <rgm@gnu.org>
parents:
93494
diff
changeset
|
473 (setq res (append h res)))) |
b6cea5b391eb
(calendar-holiday-list): Fix previous change.
Glenn Morris <rgm@gnu.org>
parents:
93494
diff
changeset
|
474 'calendar-date-compare))) |
92922
e5d9e1e9c1b4
(displayed-month, displayed-year): Move declarations where needed.
Glenn Morris <rgm@gnu.org>
parents:
92842
diff
changeset
|
475 |
93809
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93712
diff
changeset
|
476 (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
|
477 (defvar displayed-year) |
5a10f6dafd69
(displayed-month, displayed-year): Move declarations where needed.
Glenn Morris <rgm@gnu.org>
parents:
92922
diff
changeset
|
478 |
93844
bf9ef749c23e
Replace int-to-string with number-to-string.
Glenn Morris <rgm@gnu.org>
parents:
93809
diff
changeset
|
479 ;; FIXME name that makes sense |
92922
e5d9e1e9c1b4
(displayed-month, displayed-year): Move declarations where needed.
Glenn Morris <rgm@gnu.org>
parents:
92842
diff
changeset
|
480 ;;;###cal-autoload |
101083
27e9141ce15b
(calendar-list-holidays, calendar-mark-holidays): Add event handling,
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
481 (defun calendar-list-holidays (&optional event) |
92922
e5d9e1e9c1b4
(displayed-month, displayed-year): Move declarations where needed.
Glenn Morris <rgm@gnu.org>
parents:
92842
diff
changeset
|
482 "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
|
483 The holidays are those in the list `calendar-notable-days'. |
101083
27e9141ce15b
(calendar-list-holidays, calendar-mark-holidays): Add event handling,
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
484 Returns non-nil if any holidays are found. |
27e9141ce15b
(calendar-list-holidays, calendar-mark-holidays): Add event handling,
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
485 If EVENT is non-nil, it's an event indicating the buffer position to |
27e9141ce15b
(calendar-list-holidays, calendar-mark-holidays): Add event handling,
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
486 use instead of point." |
27e9141ce15b
(calendar-list-holidays, calendar-mark-holidays): Add event handling,
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
487 (interactive (list last-nonmenu-event)) |
27e9141ce15b
(calendar-list-holidays, calendar-mark-holidays): Add event handling,
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
488 ;; If called from a menu, with the calendar window not selected. |
27e9141ce15b
(calendar-list-holidays, calendar-mark-holidays): Add event handling,
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
489 (with-current-buffer |
27e9141ce15b
(calendar-list-holidays, calendar-mark-holidays): Add event handling,
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
490 (if event (window-buffer (posn-window (event-start event))) |
27e9141ce15b
(calendar-list-holidays, calendar-mark-holidays): Add event handling,
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
491 (current-buffer)) |
27e9141ce15b
(calendar-list-holidays, calendar-mark-holidays): Add event handling,
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
492 (message "Looking up holidays...") |
27e9141ce15b
(calendar-list-holidays, calendar-mark-holidays): Add event handling,
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
493 (let ((holiday-list (calendar-holiday-list)) |
27e9141ce15b
(calendar-list-holidays, calendar-mark-holidays): Add event handling,
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
494 (m1 displayed-month) |
27e9141ce15b
(calendar-list-holidays, calendar-mark-holidays): Add event handling,
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
495 (y1 displayed-year) |
27e9141ce15b
(calendar-list-holidays, calendar-mark-holidays): Add event handling,
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
496 (m2 displayed-month) |
27e9141ce15b
(calendar-list-holidays, calendar-mark-holidays): Add event handling,
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
497 (y2 displayed-year)) |
27e9141ce15b
(calendar-list-holidays, calendar-mark-holidays): Add event handling,
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
498 (if (not holiday-list) |
27e9141ce15b
(calendar-list-holidays, calendar-mark-holidays): Add event handling,
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
499 (message "Looking up holidays...none found") |
27e9141ce15b
(calendar-list-holidays, calendar-mark-holidays): Add event handling,
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
500 (calendar-in-read-only-buffer holiday-buffer |
27e9141ce15b
(calendar-list-holidays, calendar-mark-holidays): Add event handling,
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
501 (calendar-increment-month m1 y1 -1) |
27e9141ce15b
(calendar-list-holidays, calendar-mark-holidays): Add event handling,
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
502 (calendar-increment-month m2 y2 1) |
27e9141ce15b
(calendar-list-holidays, calendar-mark-holidays): Add event handling,
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
503 (calendar-set-mode-line |
27e9141ce15b
(calendar-list-holidays, calendar-mark-holidays): Add event handling,
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
504 (if (= y1 y2) |
27e9141ce15b
(calendar-list-holidays, calendar-mark-holidays): Add event handling,
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
505 (format "Notable Dates from %s to %s, %d%%-" |
27e9141ce15b
(calendar-list-holidays, calendar-mark-holidays): Add event handling,
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
506 (calendar-month-name m1) (calendar-month-name m2) y2) |
27e9141ce15b
(calendar-list-holidays, calendar-mark-holidays): Add event handling,
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
507 (format "Notable Dates from %s, %d to %s, %d%%-" |
27e9141ce15b
(calendar-list-holidays, calendar-mark-holidays): Add event handling,
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
508 (calendar-month-name m1) y1 (calendar-month-name m2) y2))) |
27e9141ce15b
(calendar-list-holidays, calendar-mark-holidays): Add event handling,
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
509 (insert |
27e9141ce15b
(calendar-list-holidays, calendar-mark-holidays): Add event handling,
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
510 (mapconcat |
27e9141ce15b
(calendar-list-holidays, calendar-mark-holidays): Add event handling,
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
511 (lambda (x) (concat (calendar-date-string (car x)) |
27e9141ce15b
(calendar-list-holidays, calendar-mark-holidays): Add event handling,
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
512 ": " (cadr x))) |
27e9141ce15b
(calendar-list-holidays, calendar-mark-holidays): Add event handling,
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
513 holiday-list "\n"))) |
27e9141ce15b
(calendar-list-holidays, calendar-mark-holidays): Add event handling,
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
514 (message "Looking up holidays...done")) |
27e9141ce15b
(calendar-list-holidays, calendar-mark-holidays): Add event handling,
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
515 holiday-list))) |
92922
e5d9e1e9c1b4
(displayed-month, displayed-year): Move declarations where needed.
Glenn Morris <rgm@gnu.org>
parents:
92842
diff
changeset
|
516 |
e5d9e1e9c1b4
(displayed-month, displayed-year): Move declarations where needed.
Glenn Morris <rgm@gnu.org>
parents:
92842
diff
changeset
|
517 (define-obsolete-function-alias |
e5d9e1e9c1b4
(displayed-month, displayed-year): Move declarations where needed.
Glenn Morris <rgm@gnu.org>
parents:
92842
diff
changeset
|
518 '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
|
519 |
37631
00c265302412
(holidays): Add an autoload cookie. From Pavel Jank <Pavel@Janik.cz>.
Eli Zaretskii <eliz@gnu.org>
parents:
37001
diff
changeset
|
520 ;;;###autoload |
957 | 521 (defun holidays (&optional arg) |
406 | 522 "Display the holidays for last month, this month, and next month. |
92650 | 523 If called with an optional prefix argument ARG, prompts for month and year. |
406 | 524 This function is suitable for execution in a .emacs file." |
957 | 525 (interactive "P") |
406 | 526 (save-excursion |
957 | 527 (let* ((completion-ignore-case t) |
92922
e5d9e1e9c1b4
(displayed-month, displayed-year): Move declarations where needed.
Glenn Morris <rgm@gnu.org>
parents:
92842
diff
changeset
|
528 (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
|
529 (calendar-current-date))) |
93809
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93712
diff
changeset
|
530 (displayed-month (calendar-extract-month date)) |
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93712
diff
changeset
|
531 (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
|
532 (calendar-list-holidays)))) |
406 | 533 |
84576
1b5ca22699c0
(holiday-list): Rename it back to `list-holidays', but leave
Glenn Morris <rgm@gnu.org>
parents:
84556
diff
changeset
|
534 ;; 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
|
535 ;; 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
|
536 ;;;###autoload |
93238
a2947a0dab56
(list-holidays): Make Y2 optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93228
diff
changeset
|
537 (defun list-holidays (y1 &optional y2 l label) |
17385
259d4c9aae0e
(list-holidays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14687
diff
changeset
|
538 "Display holidays for years Y1 to Y2 (inclusive). |
93282 | 539 Y2 defaults to Y1. The optional list of holidays L defaults to |
540 `calendar-holidays'. If you want to control what holidays are | |
541 displayed, use a different list. For example, | |
69373 | 542 |
543 (list-holidays 2006 2006 | |
93809
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93712
diff
changeset
|
544 (append holiday-general-holidays holiday-local-holidays)) |
69373 | 545 |
93809
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93712
diff
changeset
|
546 will display holidays for the year 2006 defined in the two |
69373 | 547 mentioned lists, and nothing else. |
548 | |
69352 | 549 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
|
550 holidays, based on the variables `holiday-solar-holidays' etc. See the |
69352 | 551 documentation of `calendar-holidays' for a list of the variables |
552 that control the choices, as well as a description of the format | |
553 of a holiday list. | |
17385
259d4c9aae0e
(list-holidays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14687
diff
changeset
|
554 |
259d4c9aae0e
(list-holidays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14687
diff
changeset
|
555 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
|
556 (interactive |
259d4c9aae0e
(list-holidays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14687
diff
changeset
|
557 (let* ((start-year (calendar-read |
259d4c9aae0e
(list-holidays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14687
diff
changeset
|
558 "Starting year of holidays (>0): " |
92596 | 559 (lambda (x) (> x 0)) |
93844
bf9ef749c23e
Replace int-to-string with number-to-string.
Glenn Morris <rgm@gnu.org>
parents:
93809
diff
changeset
|
560 (number-to-string (calendar-extract-year |
17385
259d4c9aae0e
(list-holidays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14687
diff
changeset
|
561 (calendar-current-date))))) |
259d4c9aae0e
(list-holidays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14687
diff
changeset
|
562 (end-year (calendar-read |
92922
e5d9e1e9c1b4
(displayed-month, displayed-year): Move declarations where needed.
Glenn Morris <rgm@gnu.org>
parents:
92842
diff
changeset
|
563 (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
|
564 start-year) |
e5d9e1e9c1b4
(displayed-month, displayed-year): Move declarations where needed.
Glenn Morris <rgm@gnu.org>
parents:
92842
diff
changeset
|
565 (lambda (x) (>= x start-year)) |
93844
bf9ef749c23e
Replace int-to-string with number-to-string.
Glenn Morris <rgm@gnu.org>
parents:
93809
diff
changeset
|
566 (number-to-string start-year))) |
17385
259d4c9aae0e
(list-holidays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14687
diff
changeset
|
567 (completion-ignore-case t) |
259d4c9aae0e
(list-holidays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14687
diff
changeset
|
568 (lists |
259d4c9aae0e
(list-holidays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14687
diff
changeset
|
569 (list |
259d4c9aae0e
(list-holidays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14687
diff
changeset
|
570 (cons "All" calendar-holidays) |
93228
3f12945a840c
(list-holidays): Assume atan always bound.
Glenn Morris <rgm@gnu.org>
parents:
93024
diff
changeset
|
571 (cons "Equinoxes/Solstices" |
3f12945a840c
(list-holidays): Assume atan always bound.
Glenn Morris <rgm@gnu.org>
parents:
93024
diff
changeset
|
572 (list (list 'solar-equinoxes-solstices))) |
93809
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93712
diff
changeset
|
573 (if holiday-general-holidays |
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93712
diff
changeset
|
574 (cons "General" holiday-general-holidays)) |
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93712
diff
changeset
|
575 (if holiday-local-holidays |
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93712
diff
changeset
|
576 (cons "Local" holiday-local-holidays)) |
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93712
diff
changeset
|
577 (if holiday-other-holidays |
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93712
diff
changeset
|
578 (cons "Other" holiday-other-holidays)) |
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93712
diff
changeset
|
579 (if holiday-christian-holidays |
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93712
diff
changeset
|
580 (cons "Christian" holiday-christian-holidays)) |
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93712
diff
changeset
|
581 (if holiday-hebrew-holidays |
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93712
diff
changeset
|
582 (cons "Hebrew" holiday-hebrew-holidays)) |
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93712
diff
changeset
|
583 (if holiday-islamic-holidays |
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93712
diff
changeset
|
584 (cons "Islamic" holiday-islamic-holidays)) |
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93712
diff
changeset
|
585 (if holiday-bahai-holidays |
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93712
diff
changeset
|
586 (cons "Baha'i" holiday-bahai-holidays)) |
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93712
diff
changeset
|
587 (if holiday-oriental-holidays |
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93712
diff
changeset
|
588 (cons "Oriental" holiday-oriental-holidays)) |
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93712
diff
changeset
|
589 (if holiday-solar-holidays |
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93712
diff
changeset
|
590 (cons "Solar" holiday-solar-holidays)) |
17385
259d4c9aae0e
(list-holidays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14687
diff
changeset
|
591 (cons "Ask" nil))) |
259d4c9aae0e
(list-holidays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14687
diff
changeset
|
592 (choice (capitalize |
259d4c9aae0e
(list-holidays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14687
diff
changeset
|
593 (completing-read "List (TAB for choices): " lists nil t))) |
259d4c9aae0e
(list-holidays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14687
diff
changeset
|
594 (which (if (string-equal choice "Ask") |
259d4c9aae0e
(list-holidays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14687
diff
changeset
|
595 (eval (read-variable "Enter list name: ")) |
259d4c9aae0e
(list-holidays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14687
diff
changeset
|
596 (cdr (assoc choice lists)))) |
259d4c9aae0e
(list-holidays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14687
diff
changeset
|
597 (name (if (string-equal choice "Equinoxes/Solstices") |
259d4c9aae0e
(list-holidays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14687
diff
changeset
|
598 choice |
17643
fd27882450bd
(list-holidays): Fix buffer title when list is
Richard M. Stallman <rms@gnu.org>
parents:
17388
diff
changeset
|
599 (if (member choice '("Ask" "")) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
37631
diff
changeset
|
600 "Holidays" |
17385
259d4c9aae0e
(list-holidays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14687
diff
changeset
|
601 (format "%s Holidays" choice))))) |
259d4c9aae0e
(list-holidays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14687
diff
changeset
|
602 (list start-year end-year which name))) |
93238
a2947a0dab56
(list-holidays): Make Y2 optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93228
diff
changeset
|
603 (unless y2 (setq y2 y1)) |
17385
259d4c9aae0e
(list-holidays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14687
diff
changeset
|
604 (message "Computing holidays...") |
93494
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
605 (let ((calendar-holidays (or l calendar-holidays)) |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
606 (title (or label "Holidays")) |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
607 (s (calendar-absolute-from-gregorian (list 2 1 y1))) |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
608 (e (calendar-absolute-from-gregorian (list 11 1 y2))) |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
609 (displayed-month 2) |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
610 (displayed-year y1) |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
611 holiday-list) |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
612 (while (<= s e) |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
613 (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
|
614 (calendar-increment-month displayed-month displayed-year 3) |
93494
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
615 (setq s (calendar-absolute-from-gregorian |
17385
259d4c9aae0e
(list-holidays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14687
diff
changeset
|
616 (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
|
617 (save-excursion |
93024
efee212e0b17
(calendar-list-holidays, list-holidays, calendar-cursor-holidays):
Glenn Morris <rgm@gnu.org>
parents:
92960
diff
changeset
|
618 (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
|
619 (calendar-set-mode-line |
efee212e0b17
(calendar-list-holidays, list-holidays, calendar-cursor-holidays):
Glenn Morris <rgm@gnu.org>
parents:
92960
diff
changeset
|
620 (if (= y1 y2) |
efee212e0b17
(calendar-list-holidays, list-holidays, calendar-cursor-holidays):
Glenn Morris <rgm@gnu.org>
parents:
92960
diff
changeset
|
621 (format "%s for %s" title y1) |
efee212e0b17
(calendar-list-holidays, list-holidays, calendar-cursor-holidays):
Glenn Morris <rgm@gnu.org>
parents:
92960
diff
changeset
|
622 (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
|
623 (insert |
efee212e0b17
(calendar-list-holidays, list-holidays, calendar-cursor-holidays):
Glenn Morris <rgm@gnu.org>
parents:
92960
diff
changeset
|
624 (mapconcat |
efee212e0b17
(calendar-list-holidays, list-holidays, calendar-cursor-holidays):
Glenn Morris <rgm@gnu.org>
parents:
92960
diff
changeset
|
625 (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
|
626 ": " (cadr x))) |
efee212e0b17
(calendar-list-holidays, list-holidays, calendar-cursor-holidays):
Glenn Morris <rgm@gnu.org>
parents:
92960
diff
changeset
|
627 holiday-list "\n"))) |
17643
fd27882450bd
(list-holidays): Fix buffer title when list is
Richard M. Stallman <rms@gnu.org>
parents:
17388
diff
changeset
|
628 (message "Computing holidays...done")))) |
fd27882450bd
(list-holidays): Fix buffer title when list is
Richard M. Stallman <rms@gnu.org>
parents:
17388
diff
changeset
|
629 |
86294
7962d9c627d8
(holiday-list): Add autoload cookie.
Glenn Morris <rgm@gnu.org>
parents:
84606
diff
changeset
|
630 ;;;###autoload |
84576
1b5ca22699c0
(holiday-list): Rename it back to `list-holidays', but leave
Glenn Morris <rgm@gnu.org>
parents:
84556
diff
changeset
|
631 (defalias 'holiday-list 'list-holidays) |
17385
259d4c9aae0e
(list-holidays): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14687
diff
changeset
|
632 |
92842
aa76c7bffc0d
(hol-loaddefs): Load this rather than explicit autoloads.
Glenn Morris <rgm@gnu.org>
parents:
92650
diff
changeset
|
633 ;;;###diary-autoload |
84356
357b5ff720d4
(holiday-list, calendar-check-holidays, calendar-mark-holidays)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78216
diff
changeset
|
634 (defun calendar-check-holidays (date) |
406 | 635 "Check the list of holidays for any that occur on DATE. |
636 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
|
637 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
|
638 (let ((displayed-month (calendar-extract-month date)) |
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93712
diff
changeset
|
639 (displayed-year (calendar-extract-year date)) |
93494
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
640 holiday-list) |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
641 (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
|
642 (if (calendar-date-equal date (car h)) |
93494
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
643 (setq holiday-list (append holiday-list (cdr h))))))) |
406 | 644 |
92922
e5d9e1e9c1b4
(displayed-month, displayed-year): Move declarations where needed.
Glenn Morris <rgm@gnu.org>
parents:
92842
diff
changeset
|
645 (define-obsolete-function-alias |
e5d9e1e9c1b4
(displayed-month, displayed-year): Move declarations where needed.
Glenn Morris <rgm@gnu.org>
parents:
92842
diff
changeset
|
646 '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
|
647 |
105933
8f110099da5c
Update x-popup-menu declaration.
Glenn Morris <rgm@gnu.org>
parents:
105870
diff
changeset
|
648 (declare-function x-popup-menu "menu.c" (position menu)) |
97422
6e551caf98f6
Add declarations for builds without X.
Glenn Morris <rgm@gnu.org>
parents:
96305
diff
changeset
|
649 |
92842
aa76c7bffc0d
(hol-loaddefs): Load this rather than explicit autoloads.
Glenn Morris <rgm@gnu.org>
parents:
92650
diff
changeset
|
650 ;;;###cal-autoload |
96305
017ec6527a01
(calendar-cursor-holidays): Handle mouse events.
Glenn Morris <rgm@gnu.org>
parents:
96066
diff
changeset
|
651 (defun calendar-cursor-holidays (&optional date event) |
96066
f0d44d21e743
(calendar-cursor-holidays): Accept optional date.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
652 "Find holidays for the date specified by the cursor in the calendar window. |
f0d44d21e743
(calendar-cursor-holidays): Accept optional date.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
653 Optional DATE is a list (month day year) to use instead of the |
96305
017ec6527a01
(calendar-cursor-holidays): Handle mouse events.
Glenn Morris <rgm@gnu.org>
parents:
96066
diff
changeset
|
654 cursor position. EVENT specifies a buffer position to use for a date." |
017ec6527a01
(calendar-cursor-holidays): Handle mouse events.
Glenn Morris <rgm@gnu.org>
parents:
96066
diff
changeset
|
655 (interactive (list nil last-nonmenu-event)) |
406 | 656 (message "Checking holidays...") |
96305
017ec6527a01
(calendar-cursor-holidays): Handle mouse events.
Glenn Morris <rgm@gnu.org>
parents:
96066
diff
changeset
|
657 (or date (setq date (calendar-cursor-to-date t event))) |
017ec6527a01
(calendar-cursor-holidays): Handle mouse events.
Glenn Morris <rgm@gnu.org>
parents:
96066
diff
changeset
|
658 (let ((date-string (calendar-date-string date)) |
017ec6527a01
(calendar-cursor-holidays): Handle mouse events.
Glenn Morris <rgm@gnu.org>
parents:
96066
diff
changeset
|
659 (holiday-list (calendar-check-holidays date)) |
017ec6527a01
(calendar-cursor-holidays): Handle mouse events.
Glenn Morris <rgm@gnu.org>
parents:
96066
diff
changeset
|
660 selection msg) |
017ec6527a01
(calendar-cursor-holidays): Handle mouse events.
Glenn Morris <rgm@gnu.org>
parents:
96066
diff
changeset
|
661 (if (mouse-event-p event) |
017ec6527a01
(calendar-cursor-holidays): Handle mouse events.
Glenn Morris <rgm@gnu.org>
parents:
96066
diff
changeset
|
662 (and (setq selection (cal-menu-x-popup-menu event |
017ec6527a01
(calendar-cursor-holidays): Handle mouse events.
Glenn Morris <rgm@gnu.org>
parents:
96066
diff
changeset
|
663 (format "Holidays for %s" date-string) |
017ec6527a01
(calendar-cursor-holidays): Handle mouse events.
Glenn Morris <rgm@gnu.org>
parents:
96066
diff
changeset
|
664 (if holiday-list |
017ec6527a01
(calendar-cursor-holidays): Handle mouse events.
Glenn Morris <rgm@gnu.org>
parents:
96066
diff
changeset
|
665 (mapcar 'list holiday-list) |
017ec6527a01
(calendar-cursor-holidays): Handle mouse events.
Glenn Morris <rgm@gnu.org>
parents:
96066
diff
changeset
|
666 '("None")))) |
017ec6527a01
(calendar-cursor-holidays): Handle mouse events.
Glenn Morris <rgm@gnu.org>
parents:
96066
diff
changeset
|
667 (call-interactively selection)) |
406 | 668 (if (not holiday-list) |
669 (message "No holidays known for %s" date-string) | |
96305
017ec6527a01
(calendar-cursor-holidays): Handle mouse events.
Glenn Morris <rgm@gnu.org>
parents:
96066
diff
changeset
|
670 (if (<= (length (setq msg |
017ec6527a01
(calendar-cursor-holidays): Handle mouse events.
Glenn Morris <rgm@gnu.org>
parents:
96066
diff
changeset
|
671 (format "%s: %s" date-string |
017ec6527a01
(calendar-cursor-holidays): Handle mouse events.
Glenn Morris <rgm@gnu.org>
parents:
96066
diff
changeset
|
672 (mapconcat 'identity holiday-list "; ")))) |
017ec6527a01
(calendar-cursor-holidays): Handle mouse events.
Glenn Morris <rgm@gnu.org>
parents:
96066
diff
changeset
|
673 (frame-width)) |
14318
faae84d059c1
(calendar-cursor-holidays): Pass proper format string to message.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
674 (message "%s" msg) |
93024
efee212e0b17
(calendar-list-holidays, list-holidays, calendar-cursor-holidays):
Glenn Morris <rgm@gnu.org>
parents:
92960
diff
changeset
|
675 (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
|
676 (calendar-set-mode-line date-string) |
efee212e0b17
(calendar-list-holidays, list-holidays, calendar-cursor-holidays):
Glenn Morris <rgm@gnu.org>
parents:
92960
diff
changeset
|
677 (insert (mapconcat 'identity holiday-list "\n"))) |
96305
017ec6527a01
(calendar-cursor-holidays): Handle mouse events.
Glenn Morris <rgm@gnu.org>
parents:
96066
diff
changeset
|
678 (message "Checking holidays...done")))))) |
406 | 679 |
93844
bf9ef749c23e
Replace int-to-string with number-to-string.
Glenn Morris <rgm@gnu.org>
parents:
93809
diff
changeset
|
680 ;; FIXME move to calendar? |
92842
aa76c7bffc0d
(hol-loaddefs): Load this rather than explicit autoloads.
Glenn Morris <rgm@gnu.org>
parents:
92650
diff
changeset
|
681 ;;;###cal-autoload |
101083
27e9141ce15b
(calendar-list-holidays, calendar-mark-holidays): Add event handling,
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
682 (defun calendar-mark-holidays (&optional event) |
27e9141ce15b
(calendar-list-holidays, calendar-mark-holidays): Add event handling,
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
683 "Mark notable days in the calendar window. |
27e9141ce15b
(calendar-list-holidays, calendar-mark-holidays): Add event handling,
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
684 If EVENT is non-nil, it's an event indicating the buffer position to |
27e9141ce15b
(calendar-list-holidays, calendar-mark-holidays): Add event handling,
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
685 use instead of point." |
27e9141ce15b
(calendar-list-holidays, calendar-mark-holidays): Add event handling,
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
686 (interactive (list last-nonmenu-event)) |
27e9141ce15b
(calendar-list-holidays, calendar-mark-holidays): Add event handling,
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
687 ;; If called from a menu, with the calendar window not selected. |
27e9141ce15b
(calendar-list-holidays, calendar-mark-holidays): Add event handling,
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
688 (with-current-buffer |
27e9141ce15b
(calendar-list-holidays, calendar-mark-holidays): Add event handling,
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
689 (if event (window-buffer (posn-window (event-start event))) |
27e9141ce15b
(calendar-list-holidays, calendar-mark-holidays): Add event handling,
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
690 (current-buffer)) |
27e9141ce15b
(calendar-list-holidays, calendar-mark-holidays): Add event handling,
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
691 (setq calendar-mark-holidays-flag t) |
27e9141ce15b
(calendar-list-holidays, calendar-mark-holidays): Add event handling,
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
692 (message "Marking holidays...") |
27e9141ce15b
(calendar-list-holidays, calendar-mark-holidays): Add event handling,
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
693 (dolist (holiday (calendar-holiday-list)) |
27e9141ce15b
(calendar-list-holidays, calendar-mark-holidays): Add event handling,
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
694 (calendar-mark-visible-date (car holiday) calendar-holiday-marker)) |
27e9141ce15b
(calendar-list-holidays, calendar-mark-holidays): Add event handling,
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
695 (message "Marking holidays...done"))) |
406 | 696 |
92922
e5d9e1e9c1b4
(displayed-month, displayed-year): Move declarations where needed.
Glenn Morris <rgm@gnu.org>
parents:
92842
diff
changeset
|
697 (define-obsolete-function-alias |
e5d9e1e9c1b4
(displayed-month, displayed-year): Move declarations where needed.
Glenn Morris <rgm@gnu.org>
parents:
92842
diff
changeset
|
698 'mark-calendar-holidays 'calendar-mark-holidays "23.1") |
406 | 699 |
700 ;; 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
|
701 ;; 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
|
702 ;; 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
|
703 ;; 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
|
704 ;; ((month day year) string) of VISIBLE dates in the calendar window. |
406 | 705 |
3870
4acdfdf2a7c9
* holidays.el (calendar-holiday-function-fixed,
Jim Blandy <jimb@redhat.com>
parents:
3728
diff
changeset
|
706 (defun holiday-fixed (month day string) |
4acdfdf2a7c9
* holidays.el (calendar-holiday-function-fixed,
Jim Blandy <jimb@redhat.com>
parents:
3728
diff
changeset
|
707 "Holiday on MONTH, DAY (Gregorian) called STRING. |
4acdfdf2a7c9
* holidays.el (calendar-holiday-function-fixed,
Jim Blandy <jimb@redhat.com>
parents:
3728
diff
changeset
|
708 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
|
709 STRING)). Returns nil if it is not visible in the current calendar window." |
93438 | 710 ;; This determines whether a given month is visible in the calendar. |
711 ;; cf calendar-date-is-visible-p (which also checks the year part). | |
712 ;; The day is irrelevant since only full months are displayed. | |
713 ;; Since the calendar displays three months at a time, month N | |
714 ;; is visible if displayed-month = N-1, N, N+1. | |
715 ;; In particular, November is visible if d-m = 10, 11, 12. | |
716 ;; This is useful, because we can do a one-sided test: | |
717 ;; November is visible if d-m > 9. (Similarly, February is visible if | |
718 ;; d-m < 4.) | |
719 ;; To determine if December is visible, we can shift the calendar | |
720 ;; back a month and ask if November is visible; to determine if | |
721 ;; October is visible, we can shift it forward a month and ask if | |
722 ;; November is visible; etc. | |
3870
4acdfdf2a7c9
* holidays.el (calendar-holiday-function-fixed,
Jim Blandy <jimb@redhat.com>
parents:
3728
diff
changeset
|
723 (let ((m displayed-month) |
4acdfdf2a7c9
* holidays.el (calendar-holiday-function-fixed,
Jim Blandy <jimb@redhat.com>
parents:
3728
diff
changeset
|
724 (y displayed-year)) |
93809
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93712
diff
changeset
|
725 (calendar-increment-month m y (- 11 month)) |
93438 | 726 (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
|
727 (list (list (list month day y) string))))) |
406 | 728 |
3870
4acdfdf2a7c9
* holidays.el (calendar-holiday-function-fixed,
Jim Blandy <jimb@redhat.com>
parents:
3728
diff
changeset
|
729 (defun holiday-float (month dayname n string &optional day) |
94456 | 730 "Holiday called STRING on the Nth DAYNAME after/before MONTH DAY. |
731 DAYNAME=0 means Sunday, DAYNAME=1 means Monday, and so on. | |
732 If N>0, use the Nth DAYNAME after MONTH DAY. | |
733 If N<0, use the Nth DAYNAME before MONTH DAY. | |
734 DAY defaults to 1 if N>0, and MONTH's last day otherwise. | |
735 If the holiday is visible in the calendar window, returns a | |
736 list (((month day year) STRING)). Otherwise returns nil." | |
93494
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
737 ;; 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
|
738 ;; 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
|
739 ;; 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
|
740 ;; 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
|
741 ;; 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
|
742 ;; function: |
92922
e5d9e1e9c1b4
(displayed-month, displayed-year): Move declarations where needed.
Glenn Morris <rgm@gnu.org>
parents:
92842
diff
changeset
|
743 ;; (let ((m displayed-month) |
e5d9e1e9c1b4
(displayed-month, displayed-year): Move declarations where needed.
Glenn Morris <rgm@gnu.org>
parents:
92842
diff
changeset
|
744 ;; (y displayed-year)) |
93809
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93712
diff
changeset
|
745 ;; (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
|
746 ;; (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
|
747 ;; (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
|
748 (let* ((m1 displayed-month) |
6eb7095ca7ab
(holiday-float): Rewritten to fix bug when base date
Richard M. Stallman <rms@gnu.org>
parents:
17643
diff
changeset
|
749 (y1 displayed-year) |
93494
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
750 (m2 displayed-month) |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
751 (y2 displayed-year) |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
752 (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
|
753 (calendar-increment-month m1 y1 -1) |
93494
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
754 (+ (calendar-nth-named-absday 1 dayname m1 y1) |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
755 (* -7 n) |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
756 (if (> n 0) 1 -7)))) |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
757 (d2 ; last possible base date for holiday |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
758 (progn |
93809
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93712
diff
changeset
|
759 (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
|
760 (+ (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
|
761 (* -7 n) |
93494
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
762 (if (> n 0) 7 -1)))) |
93809
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93712
diff
changeset
|
763 (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
|
764 (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
|
765 (y ; year of base date |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
766 (if (or (= y1 y2) (> month 9)) |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
767 y1 |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
768 y2)) |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
769 (d ; day of base date |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
770 (or day (if (> n 0) |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
771 1 |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
772 (calendar-last-day-of-month month y)))) |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
773 (date ; base date for holiday |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
774 (calendar-absolute-from-gregorian (list month d y)))) |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
775 (and (<= d1 date) (<= date d2) |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
776 (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
|
777 string))))) |
406 | 778 |
93580
b6cea5b391eb
(calendar-holiday-list): Fix previous change.
Glenn Morris <rgm@gnu.org>
parents:
93494
diff
changeset
|
779 (defun holiday-filter-visible-calendar (hlist) |
b6cea5b391eb
(calendar-holiday-list): Fix previous change.
Glenn Morris <rgm@gnu.org>
parents:
93494
diff
changeset
|
780 "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
|
781 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
|
782 (delq nil (mapcar (lambda (p) |
b6cea5b391eb
(calendar-holiday-list): Fix previous change.
Glenn Morris <rgm@gnu.org>
parents:
93494
diff
changeset
|
783 (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
|
784 hlist))) |
92922
e5d9e1e9c1b4
(displayed-month, displayed-year): Move declarations where needed.
Glenn Morris <rgm@gnu.org>
parents:
92842
diff
changeset
|
785 |
e5d9e1e9c1b4
(displayed-month, displayed-year): Move declarations where needed.
Glenn Morris <rgm@gnu.org>
parents:
92842
diff
changeset
|
786 (define-obsolete-function-alias |
e5d9e1e9c1b4
(displayed-month, displayed-year): Move declarations where needed.
Glenn Morris <rgm@gnu.org>
parents:
92842
diff
changeset
|
787 '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
|
788 |
3870
4acdfdf2a7c9
* holidays.el (calendar-holiday-function-fixed,
Jim Blandy <jimb@redhat.com>
parents:
3728
diff
changeset
|
789 (defun holiday-sexp (sexp string) |
4acdfdf2a7c9
* holidays.el (calendar-holiday-function-fixed,
Jim Blandy <jimb@redhat.com>
parents:
3728
diff
changeset
|
790 "Sexp holiday for dates in the calendar window. |
93494
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
791 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
|
792 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
|
793 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
|
794 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
|
795 nil, or if the date is not visible, there is no holiday." |
957 | 796 (let ((m displayed-month) |
93494
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
797 (y displayed-year) |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
798 year date) |
93809
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93712
diff
changeset
|
799 (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
|
800 (holiday-filter-visible-calendar |
357b5ff720d4
(holiday-list, calendar-check-holidays, calendar-mark-holidays)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78216
diff
changeset
|
801 (list |
93494
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
802 (progn |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
803 (setq year y |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
804 date (eval sexp)) |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
805 (list date (if date (eval string)))) |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
806 (progn |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
807 (setq year (1+ y) |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
808 date (eval sexp)) |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
809 (list date (if date (eval string)))))))) |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
810 |
957 | 811 |
58810
9fcc0f024a83
(holiday-advent): Make arguments optional for backwards
Glenn Morris <rgm@gnu.org>
parents:
58808
diff
changeset
|
812 (defun holiday-advent (&optional n string) |
9fcc0f024a83
(holiday-advent): Make arguments optional for backwards
Glenn Morris <rgm@gnu.org>
parents:
58808
diff
changeset
|
813 "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
|
814 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
|
815 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
|
816 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
|
817 Nth day before or after advent. |
9fcc0f024a83
(holiday-advent): Make arguments optional for backwards
Glenn Morris <rgm@gnu.org>
parents:
58808
diff
changeset
|
818 |
58823
46becd97b4c5
Fix spelling mistake in previous changes.
Glenn Morris <rgm@gnu.org>
parents:
58810
diff
changeset
|
819 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
|
820 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
|
821 ;; Backwards compatibility layer. |
58810
9fcc0f024a83
(holiday-advent): Make arguments optional for backwards
Glenn Morris <rgm@gnu.org>
parents:
58808
diff
changeset
|
822 (if (not n) |
9fcc0f024a83
(holiday-advent): Make arguments optional for backwards
Glenn Morris <rgm@gnu.org>
parents:
58808
diff
changeset
|
823 (holiday-advent 0 "Advent") |
93494
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
824 (let* ((year displayed-year) |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
825 (month displayed-month) |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
826 (advent (progn |
93809
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93712
diff
changeset
|
827 (calendar-increment-month month year -1) |
93494
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
828 (calendar-gregorian-from-absolute |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
829 (+ n |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
830 (calendar-dayname-on-or-before |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
831 0 |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
832 (calendar-absolute-from-gregorian |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
833 (list 12 3 year)))))))) |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
834 (if (calendar-date-is-visible-p advent) |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
835 (list (list advent string)))))) |
406 | 836 |
58808
7d719c317dab
(holiday-easter-etc): Make arguments optional for backwards
Glenn Morris <rgm@gnu.org>
parents:
57197
diff
changeset
|
837 (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
|
838 "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
|
839 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
|
840 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
|
841 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
|
842 Nth day before or after Easter. |
7d719c317dab
(holiday-easter-etc): Make arguments optional for backwards
Glenn Morris <rgm@gnu.org>
parents:
57197
diff
changeset
|
843 |
58823
46becd97b4c5
Fix spelling mistake in previous changes.
Glenn Morris <rgm@gnu.org>
parents:
58810
diff
changeset
|
844 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
|
845 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
|
846 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
|
847 is non-nil)." |
58823
46becd97b4c5
Fix spelling mistake in previous changes.
Glenn Morris <rgm@gnu.org>
parents:
58810
diff
changeset
|
848 ;; Backwards compatibility layer. |
58808
7d719c317dab
(holiday-easter-etc): Make arguments optional for backwards
Glenn Morris <rgm@gnu.org>
parents:
57197
diff
changeset
|
849 (if (not n) |
93580
b6cea5b391eb
(calendar-holiday-list): Fix previous change.
Glenn Morris <rgm@gnu.org>
parents:
93494
diff
changeset
|
850 (apply 'append |
b6cea5b391eb
(calendar-holiday-list): Fix previous change.
Glenn Morris <rgm@gnu.org>
parents:
93494
diff
changeset
|
851 (mapcar (lambda (e) |
b6cea5b391eb
(calendar-holiday-list): Fix previous change.
Glenn Morris <rgm@gnu.org>
parents:
93494
diff
changeset
|
852 (apply 'holiday-easter-etc e)) |
b6cea5b391eb
(calendar-holiday-list): Fix previous change.
Glenn Morris <rgm@gnu.org>
parents:
93494
diff
changeset
|
853 ;; The combined list is not in order. |
b6cea5b391eb
(calendar-holiday-list): Fix previous change.
Glenn Morris <rgm@gnu.org>
parents:
93494
diff
changeset
|
854 (append |
93633
f0a60a0ac089
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93580
diff
changeset
|
855 (if calendar-christian-all-holidays-flag |
93580
b6cea5b391eb
(calendar-holiday-list): Fix previous change.
Glenn Morris <rgm@gnu.org>
parents:
93494
diff
changeset
|
856 '((-63 "Septuagesima Sunday") |
b6cea5b391eb
(calendar-holiday-list): Fix previous change.
Glenn Morris <rgm@gnu.org>
parents:
93494
diff
changeset
|
857 (-56 "Sexagesima Sunday") |
b6cea5b391eb
(calendar-holiday-list): Fix previous change.
Glenn Morris <rgm@gnu.org>
parents:
93494
diff
changeset
|
858 (-49 "Shrove Sunday") |
b6cea5b391eb
(calendar-holiday-list): Fix previous change.
Glenn Morris <rgm@gnu.org>
parents:
93494
diff
changeset
|
859 (-48 "Shrove Monday") |
b6cea5b391eb
(calendar-holiday-list): Fix previous change.
Glenn Morris <rgm@gnu.org>
parents:
93494
diff
changeset
|
860 (-47 "Shrove Tuesday") |
b6cea5b391eb
(calendar-holiday-list): Fix previous change.
Glenn Morris <rgm@gnu.org>
parents:
93494
diff
changeset
|
861 (-14 "Passion Sunday") |
b6cea5b391eb
(calendar-holiday-list): Fix previous change.
Glenn Morris <rgm@gnu.org>
parents:
93494
diff
changeset
|
862 (-7 "Palm Sunday") |
b6cea5b391eb
(calendar-holiday-list): Fix previous change.
Glenn Morris <rgm@gnu.org>
parents:
93494
diff
changeset
|
863 (-3 "Maundy Thursday") |
b6cea5b391eb
(calendar-holiday-list): Fix previous change.
Glenn Morris <rgm@gnu.org>
parents:
93494
diff
changeset
|
864 (35 "Rogation Sunday") |
b6cea5b391eb
(calendar-holiday-list): Fix previous change.
Glenn Morris <rgm@gnu.org>
parents:
93494
diff
changeset
|
865 (39 "Ascension Day") |
b6cea5b391eb
(calendar-holiday-list): Fix previous change.
Glenn Morris <rgm@gnu.org>
parents:
93494
diff
changeset
|
866 (49 "Pentecost (Whitsunday)") |
b6cea5b391eb
(calendar-holiday-list): Fix previous change.
Glenn Morris <rgm@gnu.org>
parents:
93494
diff
changeset
|
867 (50 "Whitmonday") |
b6cea5b391eb
(calendar-holiday-list): Fix previous change.
Glenn Morris <rgm@gnu.org>
parents:
93494
diff
changeset
|
868 (56 "Trinity Sunday") |
b6cea5b391eb
(calendar-holiday-list): Fix previous change.
Glenn Morris <rgm@gnu.org>
parents:
93494
diff
changeset
|
869 (60 "Corpus Christi"))) |
b6cea5b391eb
(calendar-holiday-list): Fix previous change.
Glenn Morris <rgm@gnu.org>
parents:
93494
diff
changeset
|
870 '((-46 "Ash Wednesday") |
b6cea5b391eb
(calendar-holiday-list): Fix previous change.
Glenn Morris <rgm@gnu.org>
parents:
93494
diff
changeset
|
871 (-2 "Good Friday") |
b6cea5b391eb
(calendar-holiday-list): Fix previous change.
Glenn Morris <rgm@gnu.org>
parents:
93494
diff
changeset
|
872 (0 "Easter Sunday"))))) |
58808
7d719c317dab
(holiday-easter-etc): Make arguments optional for backwards
Glenn Morris <rgm@gnu.org>
parents:
57197
diff
changeset
|
873 (let* ((century (1+ (/ displayed-year 100))) |
92649 | 874 (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
|
875 (% (+ 14 (* 11 (% displayed-year 19)) ; ...by Nicaean rule |
92649 | 876 (- ; ...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
|
877 (/ (* 3 century) 4)) |
92922
e5d9e1e9c1b4
(displayed-month, displayed-year): Move declarations where needed.
Glenn Morris <rgm@gnu.org>
parents:
92842
diff
changeset
|
878 (/ ; ...corrected for Metonic cycle inaccuracy |
58808
7d719c317dab
(holiday-easter-etc): Make arguments optional for backwards
Glenn Morris <rgm@gnu.org>
parents:
57197
diff
changeset
|
879 (+ 5 (* 8 century)) 25) |
92960
5a10f6dafd69
(displayed-month, displayed-year): Move declarations where needed.
Glenn Morris <rgm@gnu.org>
parents:
92922
diff
changeset
|
880 (* 30 century)) ; keeps value positive |
58808
7d719c317dab
(holiday-easter-etc): Make arguments optional for backwards
Glenn Morris <rgm@gnu.org>
parents:
57197
diff
changeset
|
881 30)) |
92960
5a10f6dafd69
(displayed-month, displayed-year): Move declarations where needed.
Glenn Morris <rgm@gnu.org>
parents:
92922
diff
changeset
|
882 (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
|
883 (if (or (zerop shifted-epact) |
7d719c317dab
(holiday-easter-etc): Make arguments optional for backwards
Glenn Morris <rgm@gnu.org>
parents:
57197
diff
changeset
|
884 (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
|
885 (1+ shifted-epact) |
7d719c317dab
(holiday-easter-etc): Make arguments optional for backwards
Glenn Morris <rgm@gnu.org>
parents:
57197
diff
changeset
|
886 shifted-epact)) |
92649 | 887 (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
|
888 (- (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
|
889 adjusted-epact)) |
93580
b6cea5b391eb
(calendar-holiday-list): Fix previous change.
Glenn Morris <rgm@gnu.org>
parents:
93494
diff
changeset
|
890 (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
|
891 (greg (calendar-gregorian-from-absolute (+ abs-easter n)))) |
b6cea5b391eb
(calendar-holiday-list): Fix previous change.
Glenn Morris <rgm@gnu.org>
parents:
93494
diff
changeset
|
892 (if (calendar-date-is-visible-p greg) |
b6cea5b391eb
(calendar-holiday-list): Fix previous change.
Glenn Morris <rgm@gnu.org>
parents:
93494
diff
changeset
|
893 (list (list greg string)))))) |
406 | 894 |
86494
d3d37fadd367
(calendar-absolute-from-julian): Declare as a function.
Glenn Morris <rgm@gnu.org>
parents:
86294
diff
changeset
|
895 ;; 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
|
896 (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
|
897 |
3870
4acdfdf2a7c9
* holidays.el (calendar-holiday-function-fixed,
Jim Blandy <jimb@redhat.com>
parents:
3728
diff
changeset
|
898 (defun holiday-greek-orthodox-easter () |
4acdfdf2a7c9
* holidays.el (calendar-holiday-function-fixed,
Jim Blandy <jimb@redhat.com>
parents:
3728
diff
changeset
|
899 "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
|
900 (let* ((m displayed-month) |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
901 (y displayed-year) |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
902 (julian-year (progn |
93809
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93712
diff
changeset
|
903 (calendar-increment-month m y 1) |
3ff2b47de8f2
Update for calendar.el name changes.
Glenn Morris <rgm@gnu.org>
parents:
93712
diff
changeset
|
904 (calendar-extract-year |
93494
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
905 (calendar-julian-from-absolute |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
906 (calendar-absolute-from-gregorian |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
907 (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
|
908 (shifted-epact ; age of moon for April 5 |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
909 (% (+ 14 |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
910 (* 11 (% julian-year 19))) |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
911 30)) |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
912 (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
|
913 (- (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
|
914 shifted-epact)) |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
915 (nicaean-easter ; Sunday following the Paschal moon |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
916 (calendar-gregorian-from-absolute |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
917 (calendar-dayname-on-or-before 0 (+ paschal-moon 7))))) |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
918 (if (calendar-date-is-visible-p nicaean-easter) |
101c1d082feb
(Commentary): Point to calendar.el.
Glenn Morris <rgm@gnu.org>
parents:
93438
diff
changeset
|
919 (list (list nicaean-easter "Pascha (Greek Orthodox Easter)"))))) |
957 | 920 |
584 | 921 (provide 'holidays) |
922 | |
660
08eb386dd0f3
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
584
diff
changeset
|
923 ;;; holidays.el ends here |