annotate lisp/calendar/diary-lib.el @ 51:69ce12f60f55

Added tag r19-16b91 for changeset ee648375d8d6
author cvs
date Mon, 13 Aug 2007 08:56:44 +0200
parents 0293115a14e9
children 131b0175ea99
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1 ;;; diary-lib.el --- diary functions.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3 ;; Copyright (C) 1989, 1990, 1992, 1993, 1994 Free Software Foundation, Inc.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6 ;; Keywords: calendar
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8 ;; This file is part of XEmacs.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
9
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
10 ;; XEmacs is free software; you can redistribute it and/or modify it
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
11 ;; under the terms of the GNU General Public License as published by
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
12 ;; the Free Software Foundation; either version 2, or (at your option)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
13 ;; any later version.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
14
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
15 ;; XEmacs is distributed in the hope that it will be useful, but
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
16 ;; WITHOUT ANY WARRANTY; without even the implied warranty of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
18 ;; General Public License for more details.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
19
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
20 ;; You should have received a copy of the GNU General Public License
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 0
diff changeset
21 ;; along with XEmacs; see the file COPYING. If not, write to the
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 0
diff changeset
22 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 0
diff changeset
23 ;; Boston, MA 02111-1307, USA.
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
24
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
25 ;;; Commentary:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
26
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
27 ;; This collection of functions implements the diary features as described
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
28 ;; in calendar.el.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
29
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
30 ;; Comments, corrections, and improvements should be sent to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
31 ;; Edward M. Reingold Department of Computer Science
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
32 ;; (217) 333-6733 University of Illinois at Urbana-Champaign
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
33 ;; reingold@cs.uiuc.edu 1304 West Springfield Avenue
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
34 ;; Urbana, Illinois 61801
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
35
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
36 ;;; Code:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
37
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
38 (require 'calendar)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
39
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
40 ;;;###autoload
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
41 (defun diary (&optional arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
42 "Generate the diary window for ARG days starting with the current date.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
43 If no argument is provided, the number of days of diary entries is governed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
44 by the variable `number-of-diary-entries'. This function is suitable for
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
45 execution in a `.emacs' file."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
46 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
47 (let ((d-file (substitute-in-file-name diary-file))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
48 (date (calendar-current-date)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
49 (if (and d-file (file-exists-p d-file))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
50 (if (file-readable-p d-file)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
51 (list-diary-entries
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
52 date
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
53 (cond
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
54 (arg (prefix-numeric-value arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
55 ((vectorp number-of-diary-entries)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
56 (aref number-of-diary-entries (calendar-day-of-week date)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
57 (t number-of-diary-entries)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
58 (error "Your diary file is not readable!"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
59 (error "You don't have a diary file!"))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
60
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
61 (defun view-diary-entries (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
62 "Prepare and display a buffer with diary entries.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
63 Searches the file named in `diary-file' for entries that
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
64 match ARG days starting with the date indicated by the cursor position
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
65 in the displayed three-month calendar."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
66 (interactive "p")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
67 (let ((d-file (substitute-in-file-name diary-file)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
68 (if (and d-file (file-exists-p d-file))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
69 (if (file-readable-p d-file)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
70 (list-diary-entries (calendar-cursor-to-date t) arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
71 (error "Diary file is not readable!"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
72 (error "You don't have a diary file!"))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
73
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
74 (defun view-other-diary-entries (arg diary-file)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
75 "Prepare and display buffer of diary entries from an alternative diary file.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
76 Prompts for a file name and searches that file for entries that match ARG
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
77 days starting with the date indicated by the cursor position in the displayed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
78 three-month calendar."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
79 (interactive
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
80 (list (cond ((null current-prefix-arg) 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
81 ((listp current-prefix-arg) (car current-prefix-arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
82 (t current-prefix-arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
83 (setq diary-file (read-file-name "Enter diary file name: "
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
84 default-directory nil t))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
85 (view-diary-entries arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
86
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
87 (autoload 'check-calendar-holidays "holidays"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
88 "Check the list of holidays for any that occur on DATE.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
89 The value returned is a list of strings of relevant holiday descriptions.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
90 The holidays are those in the list `calendar-holidays'."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
91 t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
92
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
93 (autoload 'calendar-holiday-list "holidays"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
94 "Form the list of holidays that occur on dates in the calendar window.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
95 The holidays are those in the list `calendar-holidays'."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
96 t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
97
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
98 (autoload 'diary-french-date "cal-french"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
99 "French calendar equivalent of date diary entry."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
100 t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
101
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
102 (autoload 'diary-mayan-date "cal-mayan"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
103 "Mayan calendar equivalent of date diary entry."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
104 t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
105
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
106 (autoload 'diary-phases-of-moon "lunar" "Moon phases diary entry." t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
107
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
108 (autoload 'diary-sunrise-sunset "solar"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
109 "Local time of sunrise and sunset as a diary entry."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
110 t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
111
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
112 (autoload 'diary-sabbath-candles "solar"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
113 "Local time of candle lighting diary entry--applies if date is a Friday.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
114 No diary entry if there is no sunset on that date."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
115 t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
116
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
117 (defvar diary-syntax-table (copy-syntax-table (standard-syntax-table))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
118 "The syntax table used when parsing dates in the diary file.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
119 It is the standard syntax table used in Fundamental mode, but with the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
120 syntax of `*' changed to be a word constituent.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
121
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
122 (modify-syntax-entry ?* "w" diary-syntax-table)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
123
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
124 (defun list-diary-entries (date number)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
125 "Create and display a buffer containing the relevant lines in diary-file.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
126 The arguments are DATE and NUMBER; the entries selected are those
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
127 for NUMBER days starting with date DATE. The other entries are hidden
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
128 using selective display.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
129
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
130 Returns a list of all relevant diary entries found, if any, in order by date.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
131 The list entries have the form ((month day year) string). If the variable
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
132 `diary-list-include-blanks' is t, this list includes a dummy diary entry
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
133 \(consisting of the empty string) for a date with no diary entries.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
134
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
135 After the list is prepared, the hooks `nongregorian-diary-listing-hook',
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
136 `list-diary-entries-hook', `diary-display-hook', and `diary-hook' are run.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
137 These hooks have the following distinct roles:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
138
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
139 `nongregorian-diary-listing-hook' can cull dates from the diary
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
140 and each included file. Usually used for Hebrew or Islamic
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
141 diary entries in files. Applied to *each* file.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
142
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
143 `list-diary-entries-hook' adds or manipulates diary entries from
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
144 external sources. Used, for example, to include diary entries
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
145 from other files or to sort the diary entries. Invoked *once* only,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
146 before the display hook is run.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
147
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
148 `diary-display-hook' does the actual display of information. If this is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
149 nil, simple-diary-display will be used. Use add-hook to set this to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
150 fancy-diary-display, if desired. If you want no diary display, use
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
151 add-hook to set this to ignore.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
152
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
153 `diary-hook' is run last. This can be used for an appointment
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
154 notification function."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
155
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
156 (if (< 0 number)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
157 (let* ((original-date date);; save for possible use in the hooks
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
158 (old-diary-syntax-table)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
159 (diary-entries-list)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
160 (date-string (calendar-date-string date))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
161 (d-file (substitute-in-file-name diary-file)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
162 (message "Preparing diary...")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
163 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
164 (let ((diary-buffer (get-file-buffer d-file)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
165 (set-buffer (if diary-buffer
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
166 diary-buffer
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
167 (find-file-noselect d-file t))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
168 (setq selective-display t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
169 (setq selective-display-ellipses nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
170 (setq old-diary-syntax-table (syntax-table))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
171 (set-syntax-table diary-syntax-table)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
172 (unwind-protect
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
173 (let ((buffer-read-only nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
174 (diary-modified (buffer-modified-p))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
175 (mark (regexp-quote diary-nonmarking-symbol)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
176 (goto-char (1- (point-max)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
177 (if (not (looking-at "\^M\\|\n"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
178 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
179 (forward-char 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
180 (insert-string "\^M")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
181 (goto-char (point-min))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
182 (if (not (looking-at "\^M\\|\n"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
183 (insert-string "\^M"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
184 (subst-char-in-region (point-min) (point-max) ?\n ?\^M t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
185 (calendar-for-loop i from 1 to number do
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
186 (let ((d diary-date-forms)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
187 (month (extract-calendar-month date))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
188 (day (extract-calendar-day date))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
189 (year (extract-calendar-year date))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
190 (entry-found (list-sexp-diary-entries date)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
191 (while d
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
192 (let*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
193 ((date-form (if (equal (car (car d)) 'backup)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
194 (cdr (car d))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
195 (car d)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
196 (backup (equal (car (car d)) 'backup))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
197 (dayname
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
198 (concat
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
199 (calendar-day-name date) "\\|"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
200 (substring (calendar-day-name date) 0 3) ".?"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
201 (monthname
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
202 (concat
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
203 "\\*\\|"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
204 (calendar-month-name month) "\\|"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
205 (substring (calendar-month-name month) 0 3) ".?"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
206 (month (concat "\\*\\|0*" (int-to-string month)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
207 (day (concat "\\*\\|0*" (int-to-string day)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
208 (year
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
209 (concat
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
210 "\\*\\|0*" (int-to-string year)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
211 (if abbreviated-calendar-year
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
212 (concat "\\|" (int-to-string (% year 100)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
213 "")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
214 (regexp
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
215 (concat
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
216 "\\(\\`\\|\^M\\|\n\\)" mark "?\\("
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
217 (mapconcat 'eval date-form "\\)\\(")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
218 "\\)"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
219 (case-fold-search t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
220 (goto-char (point-min))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
221 (while (re-search-forward regexp nil t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
222 (if backup (re-search-backward "\\<" nil t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
223 (if (and (or (char-equal (preceding-char) ?\^M)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
224 (char-equal (preceding-char) ?\n))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
225 (not (looking-at " \\|\^I")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
226 ;; Diary entry that consists only of date.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
227 (backward-char 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
228 ;; Found a nonempty diary entry--make it visible and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
229 ;; add it to the list.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
230 (setq entry-found t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
231 (let ((entry-start (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
232 (date-start))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
233 (re-search-backward "\^M\\|\n\\|\\`")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
234 (setq date-start (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
235 (re-search-forward "\^M\\|\n" nil t 2)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
236 (while (looking-at " \\|\^I")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
237 (re-search-forward "\^M\\|\n" nil t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
238 (backward-char 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
239 (subst-char-in-region date-start
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
240 (point) ?\^M ?\n t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
241 (add-to-diary-list
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
242 date (buffer-substring entry-start (point)))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
243 (setq d (cdr d)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
244 (or entry-found
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
245 (not diary-list-include-blanks)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
246 (setq diary-entries-list
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
247 (append diary-entries-list
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
248 (list (list date "")))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
249 (setq date
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
250 (calendar-gregorian-from-absolute
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
251 (1+ (calendar-absolute-from-gregorian date))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
252 (setq entry-found nil)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
253 (set-buffer-modified-p diary-modified))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
254 (set-syntax-table old-diary-syntax-table))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
255 (goto-char (point-min))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
256 (run-hooks 'nongregorian-diary-listing-hook
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
257 'list-diary-entries-hook)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
258 (if diary-display-hook
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
259 (run-hooks 'diary-display-hook)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
260 (simple-diary-display))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
261 (run-hooks 'diary-hook)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
262 diary-entries-list))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
263
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
264 (defun include-other-diary-files ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
265 "Include the diary entries from other diary files with those of diary-file.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
266 This function is suitable for use in `list-diary-entries-hook';
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
267 it enables you to use shared diary files together with your own.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
268 The files included are specified in the diaryfile by lines of this form:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
269 #include \"filename\"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
270 This is recursive; that is, #include directives in diary files thus included
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
271 are obeyed. You can change the `#include' to some other string by
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
272 changing the variable `diary-include-string'."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
273 (goto-char (point-min))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
274 (while (re-search-forward
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
275 (concat
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
276 "\\(\\`\\|\^M\\|\n\\)"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
277 (regexp-quote diary-include-string)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
278 " \"\\([^\"]*\\)\"")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
279 nil t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
280 (let ((diary-file (substitute-in-file-name
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
281 (buffer-substring (match-beginning 2) (match-end 2))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
282 (diary-list-include-blanks nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
283 (list-diary-entries-hook 'include-other-diary-files)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
284 (diary-display-hook 'ignore)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
285 (diary-hook nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
286 (if (file-exists-p diary-file)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
287 (if (file-readable-p diary-file)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
288 (unwind-protect
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
289 (setq diary-entries-list
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
290 (append diary-entries-list
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
291 (list-diary-entries original-date number)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
292 (kill-buffer (get-file-buffer diary-file)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
293 (beep)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
294 (message "Can't read included diary file %s" diary-file)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
295 (sleep-for 2))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
296 (beep)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
297 (message "Can't find included diary file %s" diary-file)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
298 (sleep-for 2))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
299 (goto-char (point-min)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
300
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
301 (defun simple-diary-display ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
302 "Display the diary buffer if there are any relevant entries or holidays."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
303 (let* ((holiday-list (if holidays-in-diary-buffer
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
304 (check-calendar-holidays original-date)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
305 (msg (format "No diary entries for %s %s"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
306 (concat date-string (if holiday-list ":" ""))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
307 (mapconcat 'identity holiday-list "; "))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
308 (if (or (not diary-entries-list)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
309 (and (not (cdr diary-entries-list))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
310 (string-equal (car (cdr (car diary-entries-list))) "")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
311 (if (<= (length msg) (frame-width))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
312 (message msg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
313 (set-buffer (get-buffer-create holiday-buffer))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
314 (setq buffer-read-only nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
315 (calendar-set-mode-line date-string)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
316 (erase-buffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
317 (insert (mapconcat 'identity holiday-list "\n"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
318 (goto-char (point-min))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
319 (set-buffer-modified-p nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
320 (setq buffer-read-only t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
321 (display-buffer holiday-buffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
322 (message "No diary entries for %s" date-string))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
323 (calendar-set-mode-line
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
324 (concat "Diary for " date-string
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
325 (if holiday-list ": " "")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
326 (mapconcat 'identity holiday-list "; ")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
327 (display-buffer (get-file-buffer d-file))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
328 (message "Preparing diary...done"))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
329
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
330 (defun fancy-diary-display ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
331 "Prepare a diary buffer with relevant entries in a fancy, noneditable form.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
332 This function is provided for optional use as the `diary-display-hook'."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
333 (save-excursion;; Turn off selective-display in the diary file's buffer.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
334 (set-buffer (get-file-buffer (substitute-in-file-name diary-file)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
335 (let ((diary-modified (buffer-modified-p)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
336 (subst-char-in-region (point-min) (point-max) ?\^M ?\n t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
337 (setq selective-display nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
338 (kill-local-variable 'mode-line-format)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
339 (set-buffer-modified-p diary-modified)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
340 (if (or (not diary-entries-list)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
341 (and (not (cdr diary-entries-list))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
342 (string-equal (car (cdr (car diary-entries-list))) "")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
343 (let* ((holiday-list (if holidays-in-diary-buffer
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
344 (check-calendar-holidays original-date)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
345 (msg (format "No diary entries for %s %s"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
346 (concat date-string (if holiday-list ":" ""))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
347 (mapconcat 'identity holiday-list "; "))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
348 (if (<= (length msg) (frame-width))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
349 (message msg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
350 (set-buffer (get-buffer-create holiday-buffer))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
351 (setq buffer-read-only nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
352 (calendar-set-mode-line date-string)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
353 (erase-buffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
354 (insert (mapconcat 'identity holiday-list "\n"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
355 (goto-char (point-min))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
356 (set-buffer-modified-p nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
357 (setq buffer-read-only t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
358 (display-buffer holiday-buffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
359 (message "No diary entries for %s" date-string)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
360 (save-excursion;; Prepare the fancy diary buffer.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
361 (set-buffer (get-buffer-create fancy-diary-buffer))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
362 (setq buffer-read-only nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
363 (make-local-variable 'mode-line-format)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
364 (calendar-set-mode-line "Diary Entries")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
365 (erase-buffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
366 (let ((entry-list diary-entries-list)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
367 (holiday-list)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
368 (holiday-list-last-month 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
369 (holiday-list-last-year 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
370 (date (list 0 0 0)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
371 (while entry-list
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
372 (if (not (calendar-date-equal date (car (car entry-list))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
373 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
374 (setq date (car (car entry-list)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
375 (and holidays-in-diary-buffer
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
376 (calendar-date-compare
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
377 (list (list holiday-list-last-month
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
378 (calendar-last-day-of-month
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
379 holiday-list-last-month
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
380 holiday-list-last-year)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
381 holiday-list-last-year))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
382 (list date))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
383 ;; We need to get the holidays for the next 3 months.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
384 (setq holiday-list-last-month
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
385 (extract-calendar-month date))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
386 (setq holiday-list-last-year
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
387 (extract-calendar-year date))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
388 (increment-calendar-month
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
389 holiday-list-last-month holiday-list-last-year 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
390 (setq holiday-list
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
391 (let ((displayed-month holiday-list-last-month)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
392 (displayed-year holiday-list-last-year))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
393 (calendar-holiday-list)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
394 (increment-calendar-month
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
395 holiday-list-last-month holiday-list-last-year 1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
396 (let* ((date-string (calendar-date-string date))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
397 (date-holiday-list
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
398 (let ((h holiday-list)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
399 (d))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
400 ;; Make a list of all holidays for date.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
401 (while h
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
402 (if (calendar-date-equal date (car (car h)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
403 (setq d (append d (cdr (car h)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
404 (setq h (cdr h)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
405 d)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
406 (insert (if (= (point) (point-min)) "" ?\n) date-string)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
407 (if date-holiday-list (insert ": "))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
408 (let ((l (current-column)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
409 (insert (mapconcat 'identity date-holiday-list
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
410 (concat "\n" (make-string l ? )))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
411 (let ((l (current-column)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
412 (insert ?\n (make-string l ?=) ?\n)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
413 (if (< 0 (length (car (cdr (car entry-list)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
414 (insert (car (cdr (car entry-list))) ?\n))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
415 (setq entry-list (cdr entry-list))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
416 (set-buffer-modified-p nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
417 (goto-char (point-min))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
418 (setq buffer-read-only t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
419 (display-buffer fancy-diary-buffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
420 (message "Preparing diary...done"))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
421
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
422 (defun print-diary-entries ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
423 "Print a hard copy of the diary display.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
424
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
425 If the simple diary display is being used, prepare a temp buffer with the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
426 visible lines of the diary buffer, add a heading line composed from the mode
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
427 line, print the temp buffer, and destroy it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
428
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
429 If the fancy diary display is being used, just print the buffer.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
430
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
431 The hooks given by the variable `print-diary-entries-hook' are called to do
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
432 the actual printing."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
433 (interactive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
434 (if (bufferp (get-buffer fancy-diary-buffer))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
435 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
436 (set-buffer (get-buffer fancy-diary-buffer))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
437 (run-hooks 'print-diary-entries-hook))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
438 (let ((diary-buffer
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
439 (get-file-buffer (substitute-in-file-name diary-file))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
440 (if diary-buffer
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
441 (let ((temp-buffer (get-buffer-create "*Printable Diary Entries*"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
442 (heading))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
443 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
444 (set-buffer diary-buffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
445 (setq heading
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
446 (if (not (stringp mode-line-format))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
447 "All Diary Entries"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
448 (string-match "^-*\\([^-].*[^-]\\)-*$" mode-line-format)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
449 (substring mode-line-format
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
450 (match-beginning 1) (match-end 1))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
451 (copy-to-buffer temp-buffer (point-min) (point-max))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
452 (set-buffer temp-buffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
453 (while (re-search-forward "\^M.*$" nil t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
454 (replace-match ""))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
455 (goto-char (point-min))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
456 (insert heading "\n"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
457 (make-string (length heading) ?=) "\n")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
458 (run-hooks 'print-diary-entries-hook)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
459 (kill-buffer temp-buffer)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
460 (error "You don't have a diary buffer!")))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
461
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
462 (defun show-all-diary-entries ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
463 "Show all of the diary entries in the diary file.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
464 This function gets rid of the selective display of the diary file so that
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
465 all entries, not just some, are visible. If there is no diary buffer, one
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
466 is created."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
467 (interactive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
468 (let ((d-file (substitute-in-file-name diary-file)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
469 (if (and d-file (file-exists-p d-file))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
470 (if (file-readable-p d-file)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
471 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
472 (let ((diary-buffer (get-file-buffer d-file)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
473 (set-buffer (if diary-buffer
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
474 diary-buffer
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
475 (find-file-noselect d-file t)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
476 (let ((buffer-read-only nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
477 (diary-modified (buffer-modified-p)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
478 (subst-char-in-region (point-min) (point-max) ?\^M ?\n t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
479 (setq selective-display nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
480 (make-local-variable 'mode-line-format)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
481 (setq mode-line-format default-mode-line-format)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
482 (display-buffer (current-buffer))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
483 (set-buffer-modified-p diary-modified))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
484 (error "Your diary file is not readable!"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
485 (error "You don't have a diary file!"))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
486
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
487 (defun diary-name-pattern (string-array &optional fullname)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
488 "Convert an STRING-ARRAY, an array of strings to a pattern.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
489 The pattern will match any of the strings, either entirely or abbreviated
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
490 to three characters. An abbreviated form will match with or without a period;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
491 If the optional FULLNAME is t, abbreviations will not match, just the full
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
492 name."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
493 (let ((pattern ""))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
494 (calendar-for-loop i from 0 to (1- (length string-array)) do
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
495 (setq pattern
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
496 (concat
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
497 pattern
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
498 (if (string-equal pattern "") "" "\\|")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
499 (aref string-array i)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
500 (if fullname
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
501 ""
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
502 (concat
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
503 "\\|"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
504 (substring (aref string-array i) 0 3) ".?")))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
505 pattern))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
506
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
507 (defun mark-diary-entries ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
508 "Mark days in the calendar window that have diary entries.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
509 Each entry in the diary file visible in the calendar window is marked.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
510 After the entries are marked, the hooks `nongregorian-diary-marking-hook' and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
511 `mark-diary-entries-hook' are run."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
512 (interactive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
513 (setq mark-diary-entries-in-calendar t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
514 (let ((d-file (substitute-in-file-name diary-file)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
515 (if (and d-file (file-exists-p d-file))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
516 (if (file-readable-p d-file)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
517 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
518 (message "Marking diary entries...")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
519 (set-buffer (find-file-noselect d-file t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
520 (let ((d diary-date-forms)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
521 (old-diary-syntax-table))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
522 (setq old-diary-syntax-table (syntax-table))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
523 (set-syntax-table diary-syntax-table)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
524 (while d
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
525 (let*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
526 ((date-form (if (equal (car (car d)) 'backup)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
527 (cdr (car d))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
528 (car d)));; ignore 'backup directive
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
529 (dayname (diary-name-pattern calendar-day-name-array))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
530 (monthname
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
531 (concat
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
532 (diary-name-pattern calendar-month-name-array)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
533 "\\|\\*"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
534 (month "[0-9]+\\|\\*")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
535 (day "[0-9]+\\|\\*")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
536 (year "[0-9]+\\|\\*")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
537 (l (length date-form))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
538 (d-name-pos (- l (length (memq 'dayname date-form))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
539 (d-name-pos (if (/= l d-name-pos) (+ 2 d-name-pos)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
540 (m-name-pos (- l (length (memq 'monthname date-form))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
541 (m-name-pos (if (/= l m-name-pos) (+ 2 m-name-pos)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
542 (d-pos (- l (length (memq 'day date-form))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
543 (d-pos (if (/= l d-pos) (+ 2 d-pos)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
544 (m-pos (- l (length (memq 'month date-form))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
545 (m-pos (if (/= l m-pos) (+ 2 m-pos)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
546 (y-pos (- l (length (memq 'year date-form))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
547 (y-pos (if (/= l y-pos) (+ 2 y-pos)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
548 (regexp
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
549 (concat
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
550 "\\(\\`\\|\^M\\|\n\\)\\("
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
551 (mapconcat 'eval date-form "\\)\\(")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
552 "\\)"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
553 (case-fold-search t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
554 (goto-char (point-min))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
555 (while (re-search-forward regexp nil t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
556 (let* ((dd-name
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
557 (if d-name-pos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
558 (buffer-substring
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
559 (match-beginning d-name-pos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
560 (match-end d-name-pos))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
561 (mm-name
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
562 (if m-name-pos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
563 (buffer-substring
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
564 (match-beginning m-name-pos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
565 (match-end m-name-pos))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
566 (mm (string-to-int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
567 (if m-pos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
568 (buffer-substring
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
569 (match-beginning m-pos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
570 (match-end m-pos))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
571 "")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
572 (dd (string-to-int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
573 (if d-pos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
574 (buffer-substring
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
575 (match-beginning d-pos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
576 (match-end d-pos))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
577 "")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
578 (y-str (if y-pos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
579 (buffer-substring
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
580 (match-beginning y-pos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
581 (match-end y-pos))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
582 (yy (if (not y-str)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
583 0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
584 (if (and (= (length y-str) 2)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
585 abbreviated-calendar-year)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
586 (let* ((current-y
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
587 (extract-calendar-year
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
588 (calendar-current-date)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
589 (y (+ (string-to-int y-str)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
590 (* 100
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
591 (/ current-y 100)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
592 (if (> (- y current-y) 50)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
593 (- y 100)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
594 (if (> (- current-y y) 50)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
595 (+ y 100)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
596 y)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
597 (string-to-int y-str)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
598 (if dd-name
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
599 (mark-calendar-days-named
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
600 (cdr (assoc (capitalize (substring dd-name 0 3))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
601 (calendar-make-alist
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
602 calendar-day-name-array
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
603 0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
604 '(lambda (x) (substring x 0 3))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
605 (if mm-name
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
606 (if (string-equal mm-name "*")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
607 (setq mm 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
608 (setq mm
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
609 (cdr (assoc
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
610 (capitalize
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
611 (substring mm-name 0 3))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
612 (calendar-make-alist
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
613 calendar-month-name-array
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
614 1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
615 '(lambda (x) (substring x 0 3)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
616 )))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
617 (mark-calendar-date-pattern mm dd yy))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
618 (setq d (cdr d))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
619 (mark-sexp-diary-entries)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
620 (run-hooks 'nongregorian-diary-marking-hook
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
621 'mark-diary-entries-hook)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
622 (set-syntax-table old-diary-syntax-table)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
623 (message "Marking diary entries...done")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
624 (error "Your diary file is not readable!"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
625 (error "You don't have a diary file!"))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
626
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
627 (defun mark-sexp-diary-entries ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
628 "Mark days in the calendar window that have sexp diary entries.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
629 Each entry in the diary file (or included files) visible in the calendar window
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
630 is marked. See the documentation for the function `list-sexp-diary-entries'."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
631 (let* ((sexp-mark (regexp-quote sexp-diary-entry-symbol))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
632 (s-entry (concat "\\(\\`\\|\^M\\|\n\\)" sexp-mark "("))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
633 (m)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
634 (y)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
635 (first-date)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
636 (last-date))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
637 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
638 (set-buffer calendar-buffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
639 (setq m displayed-month)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
640 (setq y displayed-year))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
641 (increment-calendar-month m y -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
642 (setq first-date
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
643 (calendar-absolute-from-gregorian (list m 1 y)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
644 (increment-calendar-month m y 2)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
645 (setq last-date
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
646 (calendar-absolute-from-gregorian
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
647 (list m (calendar-last-day-of-month m y) y)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
648 (goto-char (point-min))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
649 (while (re-search-forward s-entry nil t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
650 (backward-char 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
651 (let ((sexp-start (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
652 (sexp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
653 (entry)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
654 (entry-start)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
655 (line-start))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
656 (forward-sexp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
657 (setq sexp (buffer-substring sexp-start (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
658 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
659 (re-search-backward "\^M\\|\n\\|\\`")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
660 (setq line-start (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
661 (forward-char 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
662 (if (and (or (char-equal (preceding-char) ?\^M)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
663 (char-equal (preceding-char) ?\n))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
664 (not (looking-at " \\|\^I")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
665 (progn;; Diary entry consists only of the sexp
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
666 (backward-char 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
667 (setq entry ""))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
668 (setq entry-start (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
669 (re-search-forward "\^M\\|\n" nil t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
670 (while (looking-at " \\|\^I")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
671 (re-search-forward "\^M\\|\n" nil t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
672 (backward-char 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
673 (setq entry (buffer-substring entry-start (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
674 (while (string-match "[\^M]" entry)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
675 (aset entry (match-beginning 0) ?\n )))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
676 (calendar-for-loop date from first-date to last-date do
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
677 (if (diary-sexp-entry sexp entry
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
678 (calendar-gregorian-from-absolute date))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
679 (mark-visible-calendar-date
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
680 (calendar-gregorian-from-absolute date))))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
681
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
682 (defun mark-included-diary-files ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
683 "Mark the diary entries from other diary files with those of the diary file.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
684 This function is suitable for use as the `mark-diary-entries-hook'; it enables
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
685 you to use shared diary files together with your own. The files included are
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
686 specified in the diary-file by lines of this form:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
687 #include \"filename\"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
688 This is recursive; that is, #include directives in diary files thus included
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
689 are obeyed. You can change the `#include' to some other string by
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
690 changing the variable `diary-include-string'."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
691 (goto-char (point-min))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
692 (while (re-search-forward
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
693 (concat
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
694 "\\(\\`\\|\^M\\|\n\\)"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
695 (regexp-quote diary-include-string)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
696 " \"\\([^\"]*\\)\"")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
697 nil t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
698 (let ((diary-file (substitute-in-file-name
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
699 (buffer-substring (match-beginning 2) (match-end 2))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
700 (mark-diary-entries-hook 'mark-included-diary-files))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
701 (if (file-exists-p diary-file)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
702 (if (file-readable-p diary-file)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
703 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
704 (mark-diary-entries)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
705 (kill-buffer (get-file-buffer diary-file)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
706 (beep)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
707 (message "Can't read included diary file %s" diary-file)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
708 (sleep-for 2))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
709 (beep)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
710 (message "Can't find included diary file %s" diary-file)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
711 (sleep-for 2))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
712 (goto-char (point-min)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
713
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
714 (defun mark-calendar-days-named (dayname)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
715 "Mark all dates in the calendar window that are day DAYNAME of the week.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
716 0 means all Sundays, 1 means all Mondays, and so on."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
717 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
718 (set-buffer calendar-buffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
719 (let ((prev-month displayed-month)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
720 (prev-year displayed-year)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
721 (succ-month displayed-month)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
722 (succ-year displayed-year)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
723 (last-day)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
724 (day))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
725 (increment-calendar-month succ-month succ-year 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
726 (increment-calendar-month prev-month prev-year -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
727 (setq day (calendar-absolute-from-gregorian
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
728 (calendar-nth-named-day 1 dayname prev-month prev-year)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
729 (setq last-day (calendar-absolute-from-gregorian
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
730 (calendar-nth-named-day -1 dayname succ-month succ-year)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
731 (while (<= day last-day)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
732 (mark-visible-calendar-date (calendar-gregorian-from-absolute day))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
733 (setq day (+ day 7))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
734
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
735 (defun mark-calendar-date-pattern (month day year)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
736 "Mark all dates in the calendar window that conform to MONTH/DAY/YEAR.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
737 A value of 0 in any position is a wildcard."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
738 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
739 (set-buffer calendar-buffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
740 (let ((m displayed-month)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
741 (y displayed-year))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
742 (increment-calendar-month m y -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
743 (calendar-for-loop i from 0 to 2 do
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
744 (mark-calendar-month m y month day year)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
745 (increment-calendar-month m y 1)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
746
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
747 (defun mark-calendar-month (month year p-month p-day p-year)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
748 "Mark dates in the MONTH/YEAR that conform to pattern P-MONTH/P_DAY/P-YEAR.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
749 A value of 0 in any position of the pattern is a wildcard."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
750 (if (or (and (= month p-month)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
751 (or (= p-year 0) (= year p-year)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
752 (and (= p-month 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
753 (or (= p-year 0) (= year p-year))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
754 (if (= p-day 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
755 (calendar-for-loop
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
756 i from 1 to (calendar-last-day-of-month month year) do
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
757 (mark-visible-calendar-date (list month i year)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
758 (mark-visible-calendar-date (list month p-day year)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
759
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
760 (defun sort-diary-entries ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
761 "Sort the list of diary entries by time of day."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
762 (setq diary-entries-list (sort diary-entries-list 'diary-entry-compare)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
763
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
764 (defun diary-entry-compare (e1 e2)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
765 "Returns t if E1 is earlier than E2."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
766 (or (calendar-date-compare e1 e2)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
767 (and (calendar-date-equal (car e1) (car e2))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
768 (< (diary-entry-time (car (cdr e1)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
769 (diary-entry-time (car (cdr e2)))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
770
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
771 (defun diary-entry-time (s)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
772 "Time at the beginning of the string S in a military-style integer.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
773 For example, returns 1325 for 1:25pm. Returns -9999 if no time is recognized.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
774 The recognized forms are XXXX or X:XX or XX:XX (military time), XXam or XXpm,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
775 and XX:XXam or XX:XXpm."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
776 (cond ((string-match;; Military time
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
777 "^[ \t]*\\([0-9]?[0-9]\\):?\\([0-9][0-9]\\)\\(\\>\\|[^ap]\\)" s)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
778 (+ (* 100 (string-to-int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
779 (substring s (match-beginning 1) (match-end 1))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
780 (string-to-int (substring s (match-beginning 2) (match-end 2)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
781 ((string-match;; Hour only XXam or XXpm
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
782 "^[ \t]*\\([0-9]?[0-9]\\)\\([ap]\\)m\\>" s)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
783 (+ (* 100 (% (string-to-int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
784 (substring s (match-beginning 1) (match-end 1)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
785 12))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
786 (if (string-equal "a"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
787 (substring s (match-beginning 2) (match-end 2)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
788 0 1200)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
789 ((string-match;; Hour and minute XX:XXam or XX:XXpm
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
790 "^[ \t]*\\([0-9]?[0-9]\\):\\([0-9][0-9]\\)\\([ap]\\)m\\>" s)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
791 (+ (* 100 (% (string-to-int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
792 (substring s (match-beginning 1) (match-end 1)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
793 12))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
794 (string-to-int (substring s (match-beginning 2) (match-end 2)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
795 (if (string-equal "a"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
796 (substring s (match-beginning 3) (match-end 3)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
797 0 1200)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
798 (t -9999)));; Unrecognizable
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
799
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
800 (defun list-hebrew-diary-entries ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
801 "Add any Hebrew date entries from the diary file to `diary-entries-list'.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
802 Hebrew date diary entries must be prefaced by `hebrew-diary-entry-symbol'
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
803 \(normally an `H'). The same diary date forms govern the style of the Hebrew
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
804 calendar entries, except that the Hebrew month names must be spelled in full.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
805 The Hebrew months are numbered from 1 to 13 with Nisan being 1, 12 being
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
806 Adar I and 13 being Adar II; you must use `Adar I' if you want Adar of a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
807 common Hebrew year. If a Hebrew date diary entry begins with a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
808 `diary-nonmarking-symbol', the entry will appear in the diary listing, but will
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
809 not be marked in the calendar. This function is provided for use with the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
810 `nongregorian-diary-listing-hook'."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
811 (if (< 0 number)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
812 (let ((buffer-read-only nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
813 (diary-modified (buffer-modified-p))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
814 (gdate original-date)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
815 (mark (regexp-quote diary-nonmarking-symbol)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
816 (calendar-for-loop i from 1 to number do
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
817 (let* ((d diary-date-forms)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
818 (hdate (calendar-hebrew-from-absolute
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
819 (calendar-absolute-from-gregorian gdate)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
820 (month (extract-calendar-month hdate))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
821 (day (extract-calendar-day hdate))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
822 (year (extract-calendar-year hdate)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
823 (while d
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
824 (let*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
825 ((date-form (if (equal (car (car d)) 'backup)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
826 (cdr (car d))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
827 (car d)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
828 (backup (equal (car (car d)) 'backup))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
829 (dayname
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
830 (concat
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
831 (calendar-day-name gdate) "\\|"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
832 (substring (calendar-day-name gdate) 0 3) ".?"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
833 (calendar-month-name-array
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
834 calendar-hebrew-month-name-array-leap-year)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
835 (monthname
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
836 (concat
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
837 "\\*\\|"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
838 (calendar-month-name month)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
839 (month (concat "\\*\\|0*" (int-to-string month)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
840 (day (concat "\\*\\|0*" (int-to-string day)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
841 (year
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
842 (concat
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
843 "\\*\\|0*" (int-to-string year)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
844 (if abbreviated-calendar-year
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
845 (concat "\\|" (int-to-string (% year 100)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
846 "")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
847 (regexp
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
848 (concat
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
849 "\\(\\`\\|\^M\\|\n\\)" mark "?"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
850 (regexp-quote hebrew-diary-entry-symbol)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
851 "\\("
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
852 (mapconcat 'eval date-form "\\)\\(")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
853 "\\)"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
854 (case-fold-search t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
855 (goto-char (point-min))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
856 (while (re-search-forward regexp nil t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
857 (if backup (re-search-backward "\\<" nil t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
858 (if (and (or (char-equal (preceding-char) ?\^M)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
859 (char-equal (preceding-char) ?\n))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
860 (not (looking-at " \\|\^I")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
861 ;; Diary entry that consists only of date.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
862 (backward-char 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
863 ;; Found a nonempty diary entry--make it visible and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
864 ;; add it to the list.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
865 (let ((entry-start (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
866 (date-start))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
867 (re-search-backward "\^M\\|\n\\|\\`")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
868 (setq date-start (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
869 (re-search-forward "\^M\\|\n" nil t 2)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
870 (while (looking-at " \\|\^I")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
871 (re-search-forward "\^M\\|\n" nil t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
872 (backward-char 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
873 (subst-char-in-region date-start (point) ?\^M ?\n t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
874 (add-to-diary-list
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
875 gdate (buffer-substring entry-start (point)))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
876 (setq d (cdr d))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
877 (setq gdate
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
878 (calendar-gregorian-from-absolute
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
879 (1+ (calendar-absolute-from-gregorian gdate)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
880 (set-buffer-modified-p diary-modified))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
881 (goto-char (point-min))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
882
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
883 (defun mark-hebrew-diary-entries ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
884 "Mark days in the calendar window that have Hebrew date diary entries.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
885 Each entry in diary-file (or included files) visible in the calendar window
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
886 is marked. Hebrew date entries are prefaced by a hebrew-diary-entry-symbol
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
887 \(normally an `H'). The same diary-date-forms govern the style of the Hebrew
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
888 calendar entries, except that the Hebrew month names must be spelled in full.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
889 The Hebrew months are numbered from 1 to 13 with Nisan being 1, 12 being
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
890 Adar I and 13 being Adar II; you must use `Adar I' if you want Adar of a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
891 common Hebrew year. Hebrew date diary entries that begin with a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
892 diary-nonmarking symbol will not be marked in the calendar. This function
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
893 is provided for use as part of the nongregorian-diary-marking-hook."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
894 (let ((d diary-date-forms))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
895 (while d
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
896 (let*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
897 ((date-form (if (equal (car (car d)) 'backup)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
898 (cdr (car d))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
899 (car d)));; ignore 'backup directive
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
900 (dayname (diary-name-pattern calendar-day-name-array))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
901 (monthname
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
902 (concat
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
903 (diary-name-pattern calendar-hebrew-month-name-array-leap-year t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
904 "\\|\\*"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
905 (month "[0-9]+\\|\\*")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
906 (day "[0-9]+\\|\\*")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
907 (year "[0-9]+\\|\\*")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
908 (l (length date-form))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
909 (d-name-pos (- l (length (memq 'dayname date-form))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
910 (d-name-pos (if (/= l d-name-pos) (+ 2 d-name-pos)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
911 (m-name-pos (- l (length (memq 'monthname date-form))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
912 (m-name-pos (if (/= l m-name-pos) (+ 2 m-name-pos)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
913 (d-pos (- l (length (memq 'day date-form))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
914 (d-pos (if (/= l d-pos) (+ 2 d-pos)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
915 (m-pos (- l (length (memq 'month date-form))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
916 (m-pos (if (/= l m-pos) (+ 2 m-pos)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
917 (y-pos (- l (length (memq 'year date-form))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
918 (y-pos (if (/= l y-pos) (+ 2 y-pos)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
919 (regexp
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
920 (concat
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
921 "\\(\\`\\|\^M\\|\n\\)"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
922 (regexp-quote hebrew-diary-entry-symbol)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
923 "\\("
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
924 (mapconcat 'eval date-form "\\)\\(")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
925 "\\)"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
926 (case-fold-search t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
927 (goto-char (point-min))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
928 (while (re-search-forward regexp nil t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
929 (let* ((dd-name
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
930 (if d-name-pos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
931 (buffer-substring
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
932 (match-beginning d-name-pos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
933 (match-end d-name-pos))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
934 (mm-name
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
935 (if m-name-pos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
936 (buffer-substring
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
937 (match-beginning m-name-pos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
938 (match-end m-name-pos))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
939 (mm (string-to-int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
940 (if m-pos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
941 (buffer-substring
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
942 (match-beginning m-pos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
943 (match-end m-pos))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
944 "")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
945 (dd (string-to-int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
946 (if d-pos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
947 (buffer-substring
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
948 (match-beginning d-pos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
949 (match-end d-pos))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
950 "")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
951 (y-str (if y-pos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
952 (buffer-substring
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
953 (match-beginning y-pos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
954 (match-end y-pos))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
955 (yy (if (not y-str)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
956 0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
957 (if (and (= (length y-str) 2)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
958 abbreviated-calendar-year)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
959 (let* ((current-y
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
960 (extract-calendar-year
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
961 (calendar-hebrew-from-absolute
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
962 (calendar-absolute-from-gregorian
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
963 (calendar-current-date)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
964 (y (+ (string-to-int y-str)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
965 (* 100 (/ current-y 100)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
966 (if (> (- y current-y) 50)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
967 (- y 100)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
968 (if (> (- current-y y) 50)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
969 (+ y 100)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
970 y)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
971 (string-to-int y-str)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
972 (if dd-name
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
973 (mark-calendar-days-named
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
974 (cdr (assoc (capitalize (substring dd-name 0 3))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
975 (calendar-make-alist
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
976 calendar-day-name-array
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
977 0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
978 '(lambda (x) (substring x 0 3))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
979 (if mm-name
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
980 (if (string-equal mm-name "*")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
981 (setq mm 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
982 (setq
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
983 mm
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
984 (cdr
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
985 (assoc
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
986 (capitalize mm-name)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
987 (calendar-make-alist
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
988 calendar-hebrew-month-name-array-leap-year))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
989 (mark-hebrew-calendar-date-pattern mm dd yy)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
990 (setq d (cdr d)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
991
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
992 (defun mark-hebrew-calendar-date-pattern (month day year)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
993 "Mark dates in calendar window that conform to Hebrew date MONTH/DAY/YEAR.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
994 A value of 0 in any position is a wildcard."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
995 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
996 (set-buffer calendar-buffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
997 (if (and (/= 0 month) (/= 0 day))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
998 (if (/= 0 year)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
999 ;; Fully specified Hebrew date.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1000 (let ((date (calendar-gregorian-from-absolute
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1001 (calendar-absolute-from-hebrew
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1002 (list month day year)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1003 (if (calendar-date-is-visible-p date)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1004 (mark-visible-calendar-date date)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1005 ;; Month and day in any year--this taken from the holiday stuff.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1006 (if (memq displayed-month;; This test is only to speed things up a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1007 (list ;; bit; it works fine without the test too.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1008 (if (< 11 month) (- month 11) (+ month 1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1009 (if (< 10 month) (- month 10) (+ month 2))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1010 (if (< 9 month) (- month 9) (+ month 3))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1011 (if (< 8 month) (- month 8) (+ month 4))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1012 (if (< 7 month) (- month 7) (+ month 5))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1013 (let ((m1 displayed-month)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1014 (y1 displayed-year)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1015 (m2 displayed-month)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1016 (y2 displayed-year)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1017 (year))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1018 (increment-calendar-month m1 y1 -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1019 (increment-calendar-month m2 y2 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1020 (let* ((start-date (calendar-absolute-from-gregorian
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1021 (list m1 1 y1)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1022 (end-date (calendar-absolute-from-gregorian
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1023 (list m2
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1024 (calendar-last-day-of-month m2 y2)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1025 y2)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1026 (hebrew-start
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1027 (calendar-hebrew-from-absolute start-date))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1028 (hebrew-end (calendar-hebrew-from-absolute end-date))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1029 (hebrew-y1 (extract-calendar-year hebrew-start))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1030 (hebrew-y2 (extract-calendar-year hebrew-end)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1031 (setq year (if (< 6 month) hebrew-y2 hebrew-y1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1032 (let ((date (calendar-gregorian-from-absolute
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1033 (calendar-absolute-from-hebrew
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1034 (list month day year)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1035 (if (calendar-date-is-visible-p date)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1036 (mark-visible-calendar-date date)))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1037 ;; Not one of the simple cases--check all visible dates for match.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1038 ;; Actually, the following code takes care of ALL of the cases, but
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1039 ;; it's much too slow to be used for the simple (common) cases.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1040 (let ((m displayed-month)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1041 (y displayed-year)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1042 (first-date)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1043 (last-date))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1044 (increment-calendar-month m y -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1045 (setq first-date
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1046 (calendar-absolute-from-gregorian
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1047 (list m 1 y)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1048 (increment-calendar-month m y 2)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1049 (setq last-date
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1050 (calendar-absolute-from-gregorian
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1051 (list m (calendar-last-day-of-month m y) y)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1052 (calendar-for-loop date from first-date to last-date do
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1053 (let* ((h-date (calendar-hebrew-from-absolute date))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1054 (h-month (extract-calendar-month h-date))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1055 (h-day (extract-calendar-day h-date))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1056 (h-year (extract-calendar-year h-date)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1057 (and (or (zerop month)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1058 (= month h-month))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1059 (or (zerop day)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1060 (= day h-day))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1061 (or (zerop year)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1062 (= year h-year))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1063 (mark-visible-calendar-date
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1064 (calendar-gregorian-from-absolute date)))))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1065
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1066 (defun list-sexp-diary-entries (date)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1067 "Add sexp entries for DATE from the diary file to `diary-entries-list'.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1068 Also, Make them visible in the diary file. Returns t if any entries were
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1069 found.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1070
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1071 Sexp diary entries must be prefaced by a `sexp-diary-entry-symbol' (normally
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1072 `%%'). The form of a sexp diary entry is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1073
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1074 %%(SEXP) ENTRY
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1075
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1076 Both ENTRY and DATE are globally available when the SEXP is evaluated. If the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1077 SEXP yields the value nil, the diary entry does not apply. If it yields a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1078 non-nil value, ENTRY will be taken to apply to DATE; if the non-nil value is a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1079 string, that string will be the diary entry in the fancy diary display.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1080
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1081 For example, the following diary entry will apply to the 21st of the month
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1082 if it is a weekday and the Friday before if the 21st is on a weekend:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1083
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1084 &%%(let ((dayname (calendar-day-of-week date))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1085 (day (extract-calendar-day date)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1086 (or
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1087 (and (= day 21) (memq dayname '(1 2 3 4 5)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1088 (and (memq day '(19 20)) (= dayname 5)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1089 ) UIUC pay checks deposited
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1090
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1091 A number of built-in functions are available for this type of diary entry:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1092
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1093 %%(diary-float MONTH DAYNAME N) text
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1094 Entry will appear on the Nth DAYNAME of MONTH.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1095 (DAYNAME=0 means Sunday, 1 means Monday, and so on;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1096 if N is negative it counts backward from the end of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1097 the month. MONTH can be a list of months, a single
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1098 month, or t to specify all months.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1099
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1100 %%(diary-block M1 D1 Y1 M2 D2 Y2) text
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1101 Entry will appear on dates between M1/D1/Y1 and M2/D2/Y2,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1102 inclusive. (If `european-calendar-style' is t, the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1103 order of the parameters should be changed to D1, M1, Y1,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1104 D2, M2, Y2.)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1105
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1106 %%(diary-anniversary MONTH DAY YEAR) text
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1107 Entry will appear on anniversary dates of MONTH DAY, YEAR.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1108 (If `european-calendar-style' is t, the order of the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1109 parameters should be changed to DAY, MONTH, YEAR.) Text
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1110 can contain %d or %d%s; %d will be replaced by the number
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1111 of years since the MONTH DAY, YEAR and %s will be replaced
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1112 by the ordinal ending of that number (that is, `st', `nd',
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1113 `rd' or `th', as appropriate. The anniversary of February
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1114 29 is considered to be March 1 in a non-leap year.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1115
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1116 %%(diary-cyclic N MONTH DAY YEAR) text
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1117 Entry will appear every N days, starting MONTH DAY, YEAR.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1118 (If `european-calendar-style' is t, the order of the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1119 parameters should be changed to N, DAY, MONTH, YEAR.) Text
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1120 can contain %d or %d%s; %d will be replaced by the number
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1121 of repetitions since the MONTH DAY, YEAR and %s will
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1122 be replaced by the ordinal ending of that number (that is,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1123 `st', `nd', `rd' or `th', as appropriate.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1124
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1125 %%(diary-day-of-year)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1126 Diary entries giving the day of the year and the number of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1127 days remaining in the year will be made every day. Note
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1128 that since there is no text, it makes sense only if the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1129 fancy diary display is used.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1130
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1131 %%(diary-iso-date)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1132 Diary entries giving the corresponding ISO commercial date
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1133 will be made every day. Note that since there is no text,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1134 it makes sense only if the fancy diary display is used.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1135
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1136 %%(diary-french-date)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1137 Diary entries giving the corresponding French Revolutionary
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1138 date will be made every day. Note that since there is no
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1139 text, it makes sense only if the fancy diary display is used.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1140
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1141 %%(diary-islamic-date)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1142 Diary entries giving the corresponding Islamic date will be
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1143 made every day. Note that since there is no text, it
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1144 makes sense only if the fancy diary display is used.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1145
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1146 %%(diary-hebrew-date)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1147 Diary entries giving the corresponding Hebrew date will be
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1148 made every day. Note that since there is no text, it
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1149 makes sense only if the fancy diary display is used.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1150
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1151 %%(diary-astro-day-number) Diary entries giving the corresponding
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1152 astronomical (Julian) day number will be made every day.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1153 Note that since there is no text, it makes sense only if the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1154 fancy diary display is used.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1155
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1156 %%(diary-julian-date) Diary entries giving the corresponding
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1157 Julian date will be made every day. Note that since
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1158 there is no text, it makes sense only if the fancy diary
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1159 display is used.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1160
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1161 %%(diary-sunrise-sunset)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1162 Diary entries giving the local times of sunrise and sunset
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1163 will be made every day. Note that since there is no text,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1164 it makes sense only if the fancy diary display is used.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1165 Floating point required.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1166
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1167 %%(diary-phases-of-moon)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1168 Diary entries giving the times of the phases of the moon
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1169 will be when appropriate. Note that since there is no text,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1170 it makes sense only if the fancy diary display is used.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1171 Floating point required.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1172
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1173 %%(diary-yahrzeit MONTH DAY YEAR) text
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1174 Text is assumed to be the name of the person; the date is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1175 the date of death on the *civil* calendar. The diary entry
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1176 will appear on the proper Hebrew-date anniversary and on the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1177 day before. (If `european-calendar-style' is t, the order
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1178 of the parameters should be changed to DAY, MONTH, YEAR.)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1179
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1180 %%(diary-rosh-hodesh)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1181 Diary entries will be made on the dates of Rosh Hodesh on
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1182 the Hebrew calendar. Note that since there is no text, it
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1183 makes sense only if the fancy diary display is used.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1184
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1185 %%(diary-parasha)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1186 Diary entries giving the weekly parasha will be made on
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1187 every Saturday. Note that since there is no text, it
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1188 makes sense only if the fancy diary display is used.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1189
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1190 %%(diary-omer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1191 Diary entries giving the omer count will be made every day
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1192 from Passover to Shavuoth. Note that since there is no text,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1193 it makes sense only if the fancy diary display is used.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1194
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1195 Marking these entries is *extremely* time consuming, so these entries are
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1196 best if they are nonmarking."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1197 (let* ((mark (regexp-quote diary-nonmarking-symbol))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1198 (sexp-mark (regexp-quote sexp-diary-entry-symbol))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1199 (s-entry (concat "\\(\\`\\|\^M\\|\n\\)" mark "?" sexp-mark "("))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1200 (entry-found))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1201 (goto-char (point-min))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1202 (while (re-search-forward s-entry nil t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1203 (backward-char 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1204 (let ((sexp-start (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1205 (sexp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1206 (entry)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1207 (entry-start)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1208 (line-start))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1209 (forward-sexp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1210 (setq sexp (buffer-substring sexp-start (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1211 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1212 (re-search-backward "\^M\\|\n\\|\\`")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1213 (setq line-start (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1214 (forward-char 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1215 (if (and (or (char-equal (preceding-char) ?\^M)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1216 (char-equal (preceding-char) ?\n))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1217 (not (looking-at " \\|\^I")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1218 (progn;; Diary entry consists only of the sexp
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1219 (backward-char 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1220 (setq entry ""))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1221 (setq entry-start (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1222 (re-search-forward "\^M\\|\n" nil t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1223 (while (looking-at " \\|\^I")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1224 (re-search-forward "\^M\\|\n" nil t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1225 (backward-char 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1226 (setq entry (buffer-substring entry-start (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1227 (while (string-match "[\^M]" entry)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1228 (aset entry (match-beginning 0) ?\n )))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1229 (let ((diary-entry (diary-sexp-entry sexp entry date)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1230 (if diary-entry
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1231 (subst-char-in-region line-start (point) ?\^M ?\n t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1232 (add-to-diary-list date diary-entry)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1233 (setq entry-found (or entry-found diary-entry)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1234 entry-found))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1235
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1236 (defun diary-sexp-entry (sexp entry date)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1237 "Process a SEXP diary ENTRY for DATE."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1238 (let ((result (if calendar-debug-sexp
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1239 (let ((stack-trace-on-error t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1240 (eval (car (read-from-string sexp))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1241 (condition-case nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1242 (eval (car (read-from-string sexp)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1243 (error
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1244 (beep)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1245 (message "Bad sexp at line %d in %s: %s"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1246 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1247 (save-restriction
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1248 (narrow-to-region 1 (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1249 (goto-char (point-min))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1250 (let ((lines 1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1251 (while (re-search-forward "\n\\|\^M" nil t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1252 (setq lines (1+ lines)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1253 lines)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1254 diary-file sexp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1255 (sleep-for 2))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1256 (if (stringp result)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1257 result
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1258 (if result
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1259 entry
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1260 nil))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1261
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1262 (defun diary-block (m1 d1 y1 m2 d2 y2)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1263 "Block diary entry.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1264 Entry applies if date is between two dates. Order of the parameters is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1265 M1, D1, Y1, M2, D2, Y2 `european-calendar-style' is nil, and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1266 D1, M1, Y1, D2, M2, Y2 if `european-calendar-style' is t."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1267 (let ((date1 (calendar-absolute-from-gregorian
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1268 (if european-calendar-style
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1269 (list d1 m1 y1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1270 (list m1 d1 y1))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1271 (date2 (calendar-absolute-from-gregorian
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1272 (if european-calendar-style
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1273 (list d2 m2 y2)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1274 (list m2 d2 y2))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1275 (d (calendar-absolute-from-gregorian date)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1276 (if (and (<= date1 d) (<= d date2))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1277 entry)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1278
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1279 (defun diary-float (month dayname n)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1280 "Floating diary entry--entry applies if date is the nth dayname of month.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1281 Parameters are MONTH, DAYNAME, N. MONTH can be a list of months, the constant
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1282 t, or an integer. The constant t means all months. If N is negative, count
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1283 backward from the end of the month."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1284 (let ((m (extract-calendar-month date))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1285 (y (extract-calendar-year date)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1286 (if (and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1287 (or (and (listp month) (memq m month))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1288 (equal m month)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1289 (eq month t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1290 (calendar-date-equal date (calendar-nth-named-day n dayname m y)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1291 entry)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1292
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1293 (defun diary-anniversary (month day year)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1294 "Anniversary diary entry.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1295 Entry applies if date is the anniversary of MONTH, DAY, YEAR if
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1296 `european-calendar-style' is nil, and DAY, MONTH, YEAR if
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1297 `european-calendar-style' is t. Diary entry can contain `%d' or `%d%s'; the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1298 %d will be replaced by the number of years since the MONTH DAY, YEAR and the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1299 %s will be replaced by the ordinal ending of that number (that is, `st', `nd',
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1300 `rd' or `th', as appropriate. The anniversary of February 29 is considered
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1301 to be March 1 in non-leap years."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1302 (let* ((d (if european-calendar-style
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1303 month
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1304 day))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1305 (m (if european-calendar-style
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1306 day
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1307 month))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1308 (y (extract-calendar-year date))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1309 (diff (- y year)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1310 (if (and (= m 2) (= d 29) (not (calendar-leap-year-p y)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1311 (setq m 3
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1312 d 1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1313 (if (and (> diff 0) (calendar-date-equal (list m d y) date))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1314 (format entry diff (diary-ordinal-suffix diff)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1315
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1316 (defun diary-cyclic (n month day year)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1317 "Cycle diary entry--entry applies every N days starting at MONTH, DAY, YEAR.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1318 If `european-calendar-style' is t, parameters are N, DAY, MONTH, YEAR.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1319 ENTRY can contain `%d' or `%d%s'; the %d will be replaced by the number of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1320 years since the MONTH DAY, YEAR and the %s will be replaced by the ordinal
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1321 ending of that number (that is, `st', `nd', `rd' or `th', as appropriate."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1322 (let* ((d (if european-calendar-style
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1323 month
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1324 day))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1325 (m (if european-calendar-style
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1326 day
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1327 month))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1328 (diff (- (calendar-absolute-from-gregorian date)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1329 (calendar-absolute-from-gregorian
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1330 (list m d year))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1331 (cycle (/ diff n)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1332 (if (and (>= diff 0) (zerop (% diff n)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1333 (format entry cycle (diary-ordinal-suffix cycle)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1334
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1335 (defun diary-ordinal-suffix (n)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1336 "Ordinal suffix for N. (That is, `st', `nd', `rd', or `th', as appropriate.)"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1337 (if (or (memq (% n 100) '(11 12 13))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1338 (< 3 (% n 10)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1339 "th"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1340 (aref ["th" "st" "nd" "rd"] (% n 10))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1341
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1342 (defun diary-day-of-year ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1343 "Day of year and number of days remaining in the year of date diary entry."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1344 (calendar-day-of-year-string date))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1345
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1346 (defun diary-iso-date ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1347 "ISO calendar equivalent of date diary entry."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1348 (format "ISO date: %s" (calendar-iso-date-string date)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1349
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1350 (defun diary-islamic-date ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1351 "Islamic calendar equivalent of date diary entry."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1352 (let ((i (calendar-islamic-date-string (calendar-cursor-to-date t))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1353 (if (string-equal i "")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1354 "Date is pre-Islamic"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1355 (format "Islamic date (until sunset): %s" i))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1356
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1357 (defun diary-hebrew-date ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1358 "Hebrew calendar equivalent of date diary entry."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1359 (format "Hebrew date (until sunset): %s" (calendar-hebrew-date-string date)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1360
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1361 (defun diary-julian-date ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1362 "Julian calendar equivalent of date diary entry."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1363 (format "Julian date: %s" (calendar-julian-date-string date)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1364
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1365 (defun diary-astro-day-number ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1366 "Astronomical (Julian) day number diary entry."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1367 (format "Astronomical (Julian) day number %s"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1368 (calendar-astro-date-string date)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1369
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1370 (defun diary-omer ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1371 "Omer count diary entry.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1372 Entry applies if date is within 50 days after Passover."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1373 (let* ((passover
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1374 (calendar-absolute-from-hebrew
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1375 (list 1 15 (+ (extract-calendar-year date) 3760))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1376 (omer (- (calendar-absolute-from-gregorian date) passover))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1377 (week (/ omer 7))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1378 (day (% omer 7)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1379 (if (and (> omer 0) (< omer 50))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1380 (format "Day %d%s of the omer (until sunset)"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1381 omer
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1382 (if (zerop week)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1383 ""
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1384 (format ", that is, %d week%s%s"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1385 week
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1386 (if (= week 1) "" "s")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1387 (if (zerop day)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1388 ""
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1389 (format " and %d day%s"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1390 day (if (= day 1) "" "s")))))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1391
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1392 (defun diary-yahrzeit (death-month death-day death-year)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1393 "Yahrzeit diary entry--entry applies if date is yahrzeit or the day before.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1394 Parameters are DEATH-MONTH, DEATH-DAY, DEATH-YEAR; the diary entry is assumed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1395 to be the name of the person. Date of death is on the *civil* calendar;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1396 although the date of death is specified by the civil calendar, the proper
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1397 Hebrew calendar yahrzeit is determined. If `european-calendar-style' is t, the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1398 order of the parameters is changed to DEATH-DAY, DEATH-MONTH, DEATH-YEAR."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1399 (let* ((h-date (calendar-hebrew-from-absolute
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1400 (calendar-absolute-from-gregorian
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1401 (if european-calendar-style
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1402 (list death-day death-month death-year)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1403 (list death-month death-day death-year)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1404 (h-month (extract-calendar-month h-date))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1405 (h-day (extract-calendar-day h-date))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1406 (h-year (extract-calendar-year h-date))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1407 (d (calendar-absolute-from-gregorian date))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1408 (yr (extract-calendar-year (calendar-hebrew-from-absolute d)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1409 (diff (- yr h-year))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1410 (y (hebrew-calendar-yahrzeit h-date yr)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1411 (if (and (> diff 0) (or (= y d) (= y (1+ d))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1412 (format "Yahrzeit of %s%s: %d%s anniversary"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1413 entry
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1414 (if (= y d) "" " (evening)")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1415 diff
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1416 (cond ((= (% diff 10) 1) "st")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1417 ((= (% diff 10) 2) "nd")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1418 ((= (% diff 10) 3) "rd")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1419 (t "th"))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1420
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1421 (defun diary-rosh-hodesh ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1422 "Rosh Hodesh diary entry.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1423 Entry applies if date is Rosh Hodesh, the day before, or the Saturday before."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1424 (let* ((d (calendar-absolute-from-gregorian date))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1425 (h-date (calendar-hebrew-from-absolute d))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1426 (h-month (extract-calendar-month h-date))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1427 (h-day (extract-calendar-day h-date))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1428 (h-year (extract-calendar-year h-date))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1429 (leap-year (hebrew-calendar-leap-year-p h-year))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1430 (last-day (hebrew-calendar-last-day-of-month h-month h-year))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1431 (h-month-names
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1432 (if leap-year
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1433 calendar-hebrew-month-name-array-leap-year
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1434 calendar-hebrew-month-name-array-common-year))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1435 (this-month (aref h-month-names (1- h-month)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1436 (h-yesterday (extract-calendar-day
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1437 (calendar-hebrew-from-absolute (1- d)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1438 (if (or (= h-day 30) (and (= h-day 1) (/= h-month 7)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1439 (format
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1440 "Rosh Hodesh %s"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1441 (if (= h-day 30)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1442 (format
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1443 "%s (first day)"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1444 ;; next month must be in the same year since this
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1445 ;; month can't be the last month of the year since
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1446 ;; it has 30 days
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1447 (aref h-month-names h-month))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1448 (if (= h-yesterday 30)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1449 (format "%s (second day)" this-month)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1450 this-month)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1451 (if (= (% d 7) 6);; Saturday--check for Shabbat Mevarhim
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1452 (cond ((and (> h-day 22) (/= h-month 6) (= 29 last-day))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1453 (format "Mevarhim Rosh Hodesh %s (%s)"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1454 (aref h-month-names
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1455 (if (= h-month
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1456 (hebrew-calendar-last-month-of-year
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1457 h-year))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1458 0 h-month))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1459 (aref calendar-day-name-array (- 29 h-day))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1460 ((and (< h-day 30) (> h-day 22) (= 30 last-day))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1461 (format "Mevarhim Rosh Hodesh %s (%s-%s)"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1462 (aref h-month-names h-month)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1463 (if (= h-day 29)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1464 "tomorrow"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1465 (aref calendar-day-name-array (- 29 h-day)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1466 (aref calendar-day-name-array
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1467 (% (- 30 h-day) 7)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1468 (if (and (= h-day 29) (/= h-month 6))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1469 (format "Erev Rosh Hodesh %s"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1470 (aref h-month-names
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1471 (if (= h-month
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1472 (hebrew-calendar-last-month-of-year
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1473 h-year))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1474 0 h-month))))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1475
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1476 (defun diary-parasha ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1477 "Parasha diary entry--entry applies if date is a Saturday."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1478 (let ((d (calendar-absolute-from-gregorian date)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1479 (if (= (% d 7) 6);; Saturday
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1480 (let*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1481 ((h-year (extract-calendar-year
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1482 (calendar-hebrew-from-absolute d)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1483 (rosh-hashannah
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1484 (calendar-absolute-from-hebrew (list 7 1 h-year)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1485 (passover
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1486 (calendar-absolute-from-hebrew (list 1 15 h-year)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1487 (rosh-hashannah-day
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1488 (aref calendar-day-name-array (% rosh-hashannah 7)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1489 (passover-day
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1490 (aref calendar-day-name-array (% passover 7)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1491 (long-h (hebrew-calendar-long-heshvan-p h-year))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1492 (short-k (hebrew-calendar-short-kislev-p h-year))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1493 (type (cond ((and long-h (not short-k)) "complete")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1494 ((and (not long-h) short-k) "incomplete")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1495 (t "regular")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1496 (year-format
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1497 (symbol-value
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1498 (intern (format "hebrew-calendar-year-%s-%s-%s";; keviah
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1499 rosh-hashannah-day type passover-day))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1500 (first-saturday;; of Hebrew year
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1501 (calendar-dayname-on-or-before 6 (+ 6 rosh-hashannah)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1502 (saturday;; which Saturday of the Hebrew year
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1503 (/ (- d first-saturday) 7))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1504 (parasha (aref year-format saturday)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1505 (if parasha
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1506 (format
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1507 "Parashat %s"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1508 (if (listp parasha);; Israel differs from diaspora
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1509 (if (car parasha)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1510 (format "%s (diaspora), %s (Israel)"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1511 (hebrew-calendar-parasha-name (car parasha))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1512 (hebrew-calendar-parasha-name (cdr parasha)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1513 (format "%s (Israel)"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1514 (hebrew-calendar-parasha-name (cdr parasha))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1515 (hebrew-calendar-parasha-name parasha))))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1516
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1517 (defun add-to-diary-list (date string)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1518 "Add the entry (DATE STRING) to `diary-entries-list'.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1519 Do nothing if DATE or STRING is nil."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1520 (and date string
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1521 (setq diary-entries-list
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1522 (append diary-entries-list (list (list date string))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1523
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1524 (defvar hebrew-calendar-parashiot-names
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1525 ["Bereshith" "Noah" "Lech L'cha" "Vayera" "Hayei Sarah" "Toledoth"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1526 "Vayetze" "Vayishlah" "Vayeshev" "Mikketz" "Vayiggash" "Vayhi"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1527 "Shemoth" "Vaera" "Bo" "Beshallah" "Yithro" "Mishpatim"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1528 "Terumah" "Tetzavveh" "Ki Tissa" "Vayakhel" "Pekudei" "Vayikra"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1529 "Tzav" "Shemini" "Tazria" "Metzora" "Aharei Moth" "Kedoshim"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1530 "Emor" "Behar" "Behukkotai" "Bemidbar" "Naso" "Behaalot'cha"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1531 "Shelah L'cha" "Korah" "Hukkath" "Balak" "Pinhas" "Mattoth"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1532 "Masei" "Devarim" "Vaethanan" "Ekev" "Reeh" "Shofetim"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1533 "Ki Tetze" "Ki Tavo" "Nitzavim" "Vayelech" "Haazinu"]
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1534 "The names of the parashiot in the Torah.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1535
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1536 ;; The seven ordinary year types (keviot)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1537
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1538 (defconst hebrew-calendar-year-Saturday-incomplete-Sunday
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1539 [nil 52 nil nil 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 [21 22]
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1540 23 24 nil 25 [26 27] [28 29] 30 [31 32] 33 34 35 36 37 38 39 40 [41 42]
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1541 43 44 45 46 47 48 49 50]
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1542 "The structure of the parashiot.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1543 Hebrew year starts on Saturday, is `incomplete' (Heshvan and Kislev each have
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1544 29 days), and has Passover start on Sunday.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1545
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1546 (defconst hebrew-calendar-year-Saturday-complete-Tuesday
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1547 [nil 52 nil nil 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 [21 22]
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1548 23 24 nil 25 [26 27] [28 29] 30 [31 32] 33 34 35 36 37 38 39 40 [41 42]
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1549 43 44 45 46 47 48 49 [50 51]]
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1550 "The structure of the parashiot.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1551 Hebrew year that starts on Saturday, is `complete' (Heshvan and Kislev each
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1552 have 30 days), and has Passover start on Tuesday.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1553
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1554 (defconst hebrew-calendar-year-Monday-incomplete-Tuesday
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1555 [51 52 nil 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 [21 22]
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1556 23 24 nil 25 [26 27] [28 29] 30 [31 32] 33 34 35 36 37 38 39 40 [41 42]
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1557 43 44 45 46 47 48 49 [50 51]]
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1558 "The structure of the parashiot.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1559 Hebrew year that starts on Monday, is `incomplete' (Heshvan and Kislev each
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1560 have 29 days), and has Passover start on Tuesday.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1561
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1562 (defconst hebrew-calendar-year-Monday-complete-Thursday
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1563 [51 52 nil 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 [21 22]
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1564 23 24 nil 25 [26 27] [28 29] 30 [31 32] 33 (nil . 34) (34 . 35) (35 . 36)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1565 (36 . 37) (37 . 38) ([38 39] . 39) 40 [41 42] 43 44 45 46 47 48 49 [50 51]]
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1566 "The structure of the parashiot.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1567 Hebrew year that starts on Monday, is `complete' (Heshvan and Kislev each have
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1568 30 days), and has Passover start on Thursday.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1569
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1570 (defconst hebrew-calendar-year-Tuesday-regular-Thursday
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1571 [51 52 nil 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 [21 22]
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1572 23 24 nil 25 [26 27] [28 29] 30 [31 32] 33 (nil . 34) (34 . 35) (35 . 36)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1573 (36 . 37) (37 . 38) ([38 39] . 39) 40 [41 42] 43 44 45 46 47 48 49 [50 51]]
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1574 "The structure of the parashiot.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1575 Hebrew year that starts on Tuesday, is `regular' (Heshvan has 29 days and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1576 Kislev has 30 days), and has Passover start on Thursday.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1577
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1578 (defconst hebrew-calendar-year-Thursday-regular-Saturday
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1579 [52 nil nil 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 [21 22] 23
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1580 24 nil (nil . 25) (25 . [26 27]) ([26 27] . [28 29]) ([28 29] . 30)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1581 (30 . 31) ([31 32] . 32) 33 34 35 36 37 38 39 40 [41 42] 43 44 45 46 47 48
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1582 49 50]
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1583 "The structure of the parashiot.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1584 Hebrew year that starts on Thursday, is `regular' (Heshvan has 29 days and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1585 Kislev has 30 days), and has Passover start on Saturday.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1586
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1587 (defconst hebrew-calendar-year-Thursday-complete-Sunday
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1588 [52 nil nil 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1589 23 24 nil 25 [26 27] [28 29] 30 [31 32] 33 34 35 36 37 38 39 40 [41 42]
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1590 43 44 45 46 47 48 49 50]
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1591 "The structure of the parashiot.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1592 Hebrew year that starts on Thursday, is `complete' (Heshvan and Kislev each
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1593 have 30 days), and has Passover start on Sunday.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1594
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1595 ;; The seven leap year types (keviot)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1596
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1597 (defconst hebrew-calendar-year-Saturday-incomplete-Tuesday
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1598 [nil 52 nil nil 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1599 23 24 25 26 27 nil 28 29 30 31 32 33 34 35 36 37 38 39 40 [41 42]
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1600 43 44 45 46 47 48 49 [50 51]]
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1601 "The structure of the parashiot.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1602 Hebrew year that starts on Saturday, is `incomplete' (Heshvan and Kislev each
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1603 have 29 days), and has Passover start on Tuesday.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1604
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1605 (defconst hebrew-calendar-year-Saturday-complete-Thursday
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1606 [nil 52 nil nil 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1607 23 24 25 26 27 nil 28 29 30 31 32 33 (nil . 34) (34 . 35) (35 . 36)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1608 (36 . 37) (37 . 38) ([38 39] . 39) 40 [41 42] 43 44 45 46 47 48 49 [50 51]]
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1609 "The structure of the parashiot.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1610 Hebrew year that starts on Saturday, is `complete' (Heshvan and Kislev each
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1611 have 30 days), and has Passover start on Thursday.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1612
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1613 (defconst hebrew-calendar-year-Monday-incomplete-Thursday
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1614 [51 52 nil 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1615 23 24 25 26 27 nil 28 29 30 31 32 33 (nil . 34) (34 . 35) (35 . 36)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1616 (36 . 37) (37 . 38) ([38 39] . 39) 40 [41 42] 43 44 45 46 47 48 49 [50 51]]
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1617 "The structure of the parashiot.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1618 Hebrew year that starts on Monday, is `incomplete' (Heshvan and Kislev each
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1619 have 29 days), and has Passover start on Thursday.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1620
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1621 (defconst hebrew-calendar-year-Monday-complete-Saturday
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1622 [51 52 nil 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1623 23 24 25 26 27 nil (nil . 28) (28 . 29) (29 . 30) (30 . 31) (31 . 32)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1624 (32 . 33) (33 . 34) (34 . 35) (35 . 36) (36 . 37) (37 . 38) (38 . 39)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1625 (39 . 40) (40 . 41) ([41 42] . 42) 43 44 45 46 47 48 49 50]
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1626 "The structure of the parashiot.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1627 Hebrew year that starts on Monday, is `complete' (Heshvan and Kislev each have
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1628 30 days), and has Passover start on Saturday.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1629
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1630 (defconst hebrew-calendar-year-Tuesday-regular-Saturday
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1631 [51 52 nil 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1632 23 24 25 26 27 nil (nil . 28) (28 . 29) (29 . 30) (30 . 31) (31 . 32)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1633 (32 . 33) (33 . 34) (34 . 35) (35 . 36) (36 . 37) (37 . 38) (38 . 39)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1634 (39 . 40) (40 . 41) ([41 42] . 42) 43 44 45 46 47 48 49 50]
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1635 "The structure of the parashiot.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1636 Hebrew year that starts on Tuesday, is `regular' (Heshvan has 29 days and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1637 Kislev has 30 days), and has Passover start on Saturday.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1638
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1639 (defconst hebrew-calendar-year-Thursday-incomplete-Sunday
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1640 [52 nil nil 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1641 23 24 25 26 27 28 nil 29 30 31 32 33 34 35 36 37 38 39 40 41 42
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1642 43 44 45 46 47 48 49 50]
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1643 "The structure of the parashiot.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1644 Hebrew year that starts on Thursday, is `incomplete' (Heshvan and Kislev both
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1645 have 29 days), and has Passover start on Sunday.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1646
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1647 (defconst hebrew-calendar-year-Thursday-complete-Tuesday
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1648 [52 nil nil 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1649 23 24 25 26 27 28 nil 29 30 31 32 33 34 35 36 37 38 39 40 41 42
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1650 43 44 45 46 47 48 49 [50 51]]
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1651 "The structure of the parashiot.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1652 Hebrew year that starts on Thursday, is `complete' (Heshvan and Kislev both
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1653 have 30 days), and has Passover start on Tuesday.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1654
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1655 (defun hebrew-calendar-parasha-name (p)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1656 "Name(s) corresponding to parasha P."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1657 (if (arrayp p);; combined parasha
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1658 (format "%s/%s"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1659 (aref hebrew-calendar-parashiot-names (aref p 0))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1660 (aref hebrew-calendar-parashiot-names (aref p 1)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1661 (aref hebrew-calendar-parashiot-names p)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1662
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1663 (defun list-islamic-diary-entries ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1664 "Add any Islamic date entries from the diary file to `diary-entries-list'.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1665 Islamic date diary entries must be prefaced by an `islamic-diary-entry-symbol'
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1666 \(normally an `I'). The same diary date forms govern the style of the Islamic
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1667 calendar entries, except that the Islamic month names must be spelled in full.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1668 The Islamic months are numbered from 1 to 12 with Muharram being 1 and 12 being
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1669 Dhu al-Hijjah. If an Islamic date diary entry begins with a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1670 `diary-nonmarking-symbol', the entry will appear in the diary listing, but will
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1671 not be marked in the calendar. This function is provided for use with the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1672 `nongregorian-diary-listing-hook'."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1673 (if (< 0 number)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1674 (let ((buffer-read-only nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1675 (diary-modified (buffer-modified-p))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1676 (gdate original-date)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1677 (mark (regexp-quote diary-nonmarking-symbol)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1678 (calendar-for-loop i from 1 to number do
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1679 (let* ((d diary-date-forms)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1680 (idate (calendar-islamic-from-absolute
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1681 (calendar-absolute-from-gregorian gdate)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1682 (month (extract-calendar-month idate))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1683 (day (extract-calendar-day idate))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1684 (year (extract-calendar-year idate)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1685 (while d
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1686 (let*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1687 ((date-form (if (equal (car (car d)) 'backup)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1688 (cdr (car d))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1689 (car d)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1690 (backup (equal (car (car d)) 'backup))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1691 (dayname
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1692 (concat
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1693 (calendar-day-name gdate) "\\|"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1694 (substring (calendar-day-name gdate) 0 3) ".?"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1695 (calendar-month-name-array
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1696 calendar-islamic-month-name-array)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1697 (monthname
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1698 (concat
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1699 "\\*\\|"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1700 (calendar-month-name month)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1701 (month (concat "\\*\\|0*" (int-to-string month)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1702 (day (concat "\\*\\|0*" (int-to-string day)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1703 (year
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1704 (concat
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1705 "\\*\\|0*" (int-to-string year)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1706 (if abbreviated-calendar-year
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1707 (concat "\\|" (int-to-string (% year 100)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1708 "")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1709 (regexp
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1710 (concat
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1711 "\\(\\`\\|\^M\\|\n\\)" mark "?"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1712 (regexp-quote islamic-diary-entry-symbol)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1713 "\\("
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1714 (mapconcat 'eval date-form "\\)\\(")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1715 "\\)"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1716 (case-fold-search t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1717 (goto-char (point-min))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1718 (while (re-search-forward regexp nil t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1719 (if backup (re-search-backward "\\<" nil t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1720 (if (and (or (char-equal (preceding-char) ?\^M)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1721 (char-equal (preceding-char) ?\n))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1722 (not (looking-at " \\|\^I")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1723 ;; Diary entry that consists only of date.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1724 (backward-char 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1725 ;; Found a nonempty diary entry--make it visible and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1726 ;; add it to the list.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1727 (let ((entry-start (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1728 (date-start))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1729 (re-search-backward "\^M\\|\n\\|\\`")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1730 (setq date-start (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1731 (re-search-forward "\^M\\|\n" nil t 2)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1732 (while (looking-at " \\|\^I")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1733 (re-search-forward "\^M\\|\n" nil t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1734 (backward-char 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1735 (subst-char-in-region date-start (point) ?\^M ?\n t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1736 (add-to-diary-list
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1737 gdate (buffer-substring entry-start (point)))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1738 (setq d (cdr d))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1739 (setq gdate
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1740 (calendar-gregorian-from-absolute
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1741 (1+ (calendar-absolute-from-gregorian gdate)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1742 (set-buffer-modified-p diary-modified))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1743 (goto-char (point-min))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1744
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1745 (defun mark-islamic-diary-entries ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1746 "Mark days in the calendar window that have Islamic date diary entries.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1747 Each entry in diary-file (or included files) visible in the calendar window
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1748 is marked. Islamic date entries are prefaced by a islamic-diary-entry-symbol
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1749 \(normally an `I'). The same diary-date-forms govern the style of the Islamic
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1750 calendar entries, except that the Islamic month names must be spelled in full.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1751 The Islamic months are numbered from 1 to 12 with Muharram being 1 and 12 being
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1752 Dhu al-Hijjah. Islamic date diary entries that begin with a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1753 diary-nonmarking-symbol will not be marked in the calendar. This function is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1754 provided for use as part of the nongregorian-diary-marking-hook."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1755 (let ((d diary-date-forms))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1756 (while d
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1757 (let*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1758 ((date-form (if (equal (car (car d)) 'backup)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1759 (cdr (car d))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1760 (car d)));; ignore 'backup directive
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1761 (dayname (diary-name-pattern calendar-day-name-array))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1762 (monthname
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1763 (concat
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1764 (diary-name-pattern calendar-islamic-month-name-array t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1765 "\\|\\*"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1766 (month "[0-9]+\\|\\*")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1767 (day "[0-9]+\\|\\*")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1768 (year "[0-9]+\\|\\*")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1769 (l (length date-form))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1770 (d-name-pos (- l (length (memq 'dayname date-form))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1771 (d-name-pos (if (/= l d-name-pos) (+ 2 d-name-pos)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1772 (m-name-pos (- l (length (memq 'monthname date-form))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1773 (m-name-pos (if (/= l m-name-pos) (+ 2 m-name-pos)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1774 (d-pos (- l (length (memq 'day date-form))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1775 (d-pos (if (/= l d-pos) (+ 2 d-pos)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1776 (m-pos (- l (length (memq 'month date-form))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1777 (m-pos (if (/= l m-pos) (+ 2 m-pos)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1778 (y-pos (- l (length (memq 'year date-form))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1779 (y-pos (if (/= l y-pos) (+ 2 y-pos)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1780 (regexp
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1781 (concat
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1782 "\\(\\`\\|\^M\\|\n\\)"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1783 (regexp-quote islamic-diary-entry-symbol)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1784 "\\("
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1785 (mapconcat 'eval date-form "\\)\\(")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1786 "\\)"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1787 (case-fold-search t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1788 (goto-char (point-min))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1789 (while (re-search-forward regexp nil t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1790 (let* ((dd-name
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1791 (if d-name-pos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1792 (buffer-substring
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1793 (match-beginning d-name-pos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1794 (match-end d-name-pos))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1795 (mm-name
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1796 (if m-name-pos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1797 (buffer-substring
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1798 (match-beginning m-name-pos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1799 (match-end m-name-pos))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1800 (mm (string-to-int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1801 (if m-pos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1802 (buffer-substring
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1803 (match-beginning m-pos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1804 (match-end m-pos))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1805 "")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1806 (dd (string-to-int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1807 (if d-pos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1808 (buffer-substring
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1809 (match-beginning d-pos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1810 (match-end d-pos))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1811 "")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1812 (y-str (if y-pos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1813 (buffer-substring
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1814 (match-beginning y-pos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1815 (match-end y-pos))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1816 (yy (if (not y-str)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1817 0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1818 (if (and (= (length y-str) 2)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1819 abbreviated-calendar-year)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1820 (let* ((current-y
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1821 (extract-calendar-year
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1822 (calendar-islamic-from-absolute
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1823 (calendar-absolute-from-gregorian
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1824 (calendar-current-date)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1825 (y (+ (string-to-int y-str)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1826 (* 100 (/ current-y 100)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1827 (if (> (- y current-y) 50)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1828 (- y 100)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1829 (if (> (- current-y y) 50)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1830 (+ y 100)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1831 y)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1832 (string-to-int y-str)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1833 (if dd-name
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1834 (mark-calendar-days-named
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1835 (cdr (assoc (capitalize (substring dd-name 0 3))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1836 (calendar-make-alist
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1837 calendar-day-name-array
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1838 0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1839 '(lambda (x) (substring x 0 3))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1840 (if mm-name
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1841 (if (string-equal mm-name "*")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1842 (setq mm 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1843 (setq mm
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1844 (cdr (assoc
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1845 (capitalize mm-name)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1846 (calendar-make-alist
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1847 calendar-islamic-month-name-array))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1848 (mark-islamic-calendar-date-pattern mm dd yy)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1849 (setq d (cdr d)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1850
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1851 (defun mark-islamic-calendar-date-pattern (month day year)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1852 "Mark dates in calendar window that conform to Islamic date MONTH/DAY/YEAR.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1853 A value of 0 in any position is a wildcard."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1854 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1855 (set-buffer calendar-buffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1856 (if (and (/= 0 month) (/= 0 day))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1857 (if (/= 0 year)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1858 ;; Fully specified Islamic date.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1859 (let ((date (calendar-gregorian-from-absolute
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1860 (calendar-absolute-from-islamic
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1861 (list month day year)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1862 (if (calendar-date-is-visible-p date)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1863 (mark-visible-calendar-date date)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1864 ;; Month and day in any year--this taken from the holiday stuff.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1865 (let* ((islamic-date (calendar-islamic-from-absolute
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1866 (calendar-absolute-from-gregorian
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1867 (list displayed-month 15 displayed-year))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1868 (m (extract-calendar-month islamic-date))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1869 (y (extract-calendar-year islamic-date))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1870 (date))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1871 (if (< m 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1872 nil;; Islamic calendar doesn't apply.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1873 (increment-calendar-month m y (- 10 month))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1874 (if (> m 7);; Islamic date might be visible
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1875 (let ((date (calendar-gregorian-from-absolute
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1876 (calendar-absolute-from-islamic
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1877 (list month day y)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1878 (if (calendar-date-is-visible-p date)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1879 (mark-visible-calendar-date date)))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1880 ;; Not one of the simple cases--check all visible dates for match.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1881 ;; Actually, the following code takes care of ALL of the cases, but
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1882 ;; it's much too slow to be used for the simple (common) cases.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1883 (let ((m displayed-month)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1884 (y displayed-year)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1885 (first-date)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1886 (last-date))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1887 (increment-calendar-month m y -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1888 (setq first-date
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1889 (calendar-absolute-from-gregorian
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1890 (list m 1 y)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1891 (increment-calendar-month m y 2)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1892 (setq last-date
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1893 (calendar-absolute-from-gregorian
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1894 (list m (calendar-last-day-of-month m y) y)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1895 (calendar-for-loop date from first-date to last-date do
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1896 (let* ((i-date (calendar-islamic-from-absolute date))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1897 (i-month (extract-calendar-month i-date))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1898 (i-day (extract-calendar-day i-date))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1899 (i-year (extract-calendar-year i-date)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1900 (and (or (zerop month)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1901 (= month i-month))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1902 (or (zerop day)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1903 (= day i-day))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1904 (or (zerop year)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1905 (= year i-year))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1906 (mark-visible-calendar-date
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1907 (calendar-gregorian-from-absolute date)))))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1908
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1909 (provide 'diary-lib)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1910
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1911 ;;; diary-lib.el ends here