Mercurial > emacs
annotate lisp/calendar/diary-lib.el @ 49418:9ab0a4464ac9
(jka-compr-insert-file-contents): Call
docode-coding-inserted-region.
author | Kenichi Handa <handa@m17n.org> |
---|---|
date | Fri, 24 Jan 2003 13:28:24 +0000 |
parents | 9f9b3764df98 |
children | 0d8b17d428b5 |
rev | line source |
---|---|
38422
7a94f1c588c4
Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
37001
diff
changeset
|
1 ;;; diary-lib.el --- diary functions |
13053 | 2 |
14169 | 3 ;; Copyright (C) 1989, 1990, 1992, 1993, 1994, 1995 Free Software |
4 ;; Foundation, Inc. | |
13053 | 5 |
6 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu> | |
7 ;; Keywords: calendar | |
8 | |
9 ;; This file is part of GNU Emacs. | |
10 | |
11 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
12 ;; it under the terms of the GNU General Public License as published by | |
13 ;; the Free Software Foundation; either version 2, or (at your option) | |
14 ;; any later version. | |
15 | |
16 ;; GNU Emacs is distributed in the hope that it will be useful, | |
17 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
19 ;; GNU General Public License for more details. | |
20 | |
21 ;; You should have received a copy of the GNU General Public License | |
14169 | 22 ;; along with GNU Emacs; see the file COPYING. If not, write to the |
23 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
24 ;; Boston, MA 02111-1307, USA. | |
13053 | 25 |
26 ;;; Commentary: | |
27 | |
28 ;; This collection of functions implements the diary features as described | |
29 ;; in calendar.el. | |
30 | |
31 ;; Comments, corrections, and improvements should be sent to | |
32 ;; Edward M. Reingold Department of Computer Science | |
33 ;; (217) 333-6733 University of Illinois at Urbana-Champaign | |
34 ;; reingold@cs.uiuc.edu 1304 West Springfield Avenue | |
35 ;; Urbana, Illinois 61801 | |
36 | |
37 ;;; Code: | |
38 | |
39 (require 'calendar) | |
40 | |
41 ;;;###autoload | |
42 (defun diary (&optional arg) | |
43 "Generate the diary window for ARG days starting with the current date. | |
44 If no argument is provided, the number of days of diary entries is governed | |
45 by the variable `number-of-diary-entries'. This function is suitable for | |
46 execution in a `.emacs' file." | |
47 (interactive "P") | |
48 (let ((d-file (substitute-in-file-name diary-file)) | |
49 (date (calendar-current-date))) | |
50 (if (and d-file (file-exists-p d-file)) | |
51 (if (file-readable-p d-file) | |
52 (list-diary-entries | |
53 date | |
54 (cond | |
55 (arg (prefix-numeric-value arg)) | |
56 ((vectorp number-of-diary-entries) | |
57 (aref number-of-diary-entries (calendar-day-of-week date))) | |
58 (t number-of-diary-entries))) | |
59 (error "Your diary file is not readable!")) | |
60 (error "You don't have a diary file!")))) | |
61 | |
62 (defun view-diary-entries (arg) | |
63 "Prepare and display a buffer with diary entries. | |
64 Searches the file named in `diary-file' for entries that | |
65 match ARG days starting with the date indicated by the cursor position | |
66 in the displayed three-month calendar." | |
67 (interactive "p") | |
68 (let ((d-file (substitute-in-file-name diary-file))) | |
69 (if (and d-file (file-exists-p d-file)) | |
70 (if (file-readable-p d-file) | |
71 (list-diary-entries (calendar-cursor-to-date t) arg) | |
72 (error "Diary file is not readable!")) | |
73 (error "You don't have a diary file!")))) | |
74 | |
22412
6fdc14d2b071
Don't overide default value of diary-file.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
21957
diff
changeset
|
75 (defun view-other-diary-entries (arg d-file) |
13053 | 76 "Prepare and display buffer of diary entries from an alternative diary file. |
77 Prompts for a file name and searches that file for entries that match ARG | |
78 days starting with the date indicated by the cursor position in the displayed | |
79 three-month calendar." | |
80 (interactive | |
81 (list (cond ((null current-prefix-arg) 1) | |
82 ((listp current-prefix-arg) (car current-prefix-arg)) | |
83 (t current-prefix-arg)) | |
22412
6fdc14d2b071
Don't overide default value of diary-file.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
21957
diff
changeset
|
84 (read-file-name "Enter diary file name: " default-directory nil t))) |
6fdc14d2b071
Don't overide default value of diary-file.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
21957
diff
changeset
|
85 (let ((diary-file d-file)) |
6fdc14d2b071
Don't overide default value of diary-file.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
21957
diff
changeset
|
86 (view-diary-entries arg))) |
13053 | 87 |
88 (autoload 'check-calendar-holidays "holidays" | |
89 "Check the list of holidays for any that occur on DATE. | |
90 The value returned is a list of strings of relevant holiday descriptions. | |
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
91 The holidays are those in the list `calendar-holidays'.") |
13053 | 92 |
93 (autoload 'calendar-holiday-list "holidays" | |
94 "Form the list of holidays that occur on dates in the calendar window. | |
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
95 The holidays are those in the list `calendar-holidays'.") |
13053 | 96 |
97 (autoload 'diary-french-date "cal-french" | |
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
98 "French calendar equivalent of date diary entry.") |
13053 | 99 |
100 (autoload 'diary-mayan-date "cal-mayan" | |
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
101 "Mayan calendar equivalent of date diary entry.") |
13053 | 102 |
13688
88f14fa8e205
Autoload diary-iso-date.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
13687
diff
changeset
|
103 (autoload 'diary-iso-date "cal-iso" |
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
104 "ISO calendar equivalent of date diary entry.") |
13688
88f14fa8e205
Autoload diary-iso-date.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
13687
diff
changeset
|
105 |
13053 | 106 (autoload 'diary-julian-date "cal-julian" |
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
107 "Julian calendar equivalent of date diary entry.") |
13053 | 108 |
109 (autoload 'diary-astro-day-number "cal-julian" | |
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
110 "Astronomical (Julian) day number diary entry.") |
13053 | 111 |
14687
0d4ff7e4d6a3
Use the new file names in autoloads.
Karl Heuer <kwzh@gnu.org>
parents:
14308
diff
changeset
|
112 (autoload 'diary-chinese-date "cal-china" |
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
113 "Chinese calendar equivalent of date diary entry.") |
13053 | 114 |
14687
0d4ff7e4d6a3
Use the new file names in autoloads.
Karl Heuer <kwzh@gnu.org>
parents:
14308
diff
changeset
|
115 (autoload 'diary-islamic-date "cal-islam" |
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
116 "Islamic calendar equivalent of date diary entry.") |
13053 | 117 |
14687
0d4ff7e4d6a3
Use the new file names in autoloads.
Karl Heuer <kwzh@gnu.org>
parents:
14308
diff
changeset
|
118 (autoload 'list-islamic-diary-entries "cal-islam" |
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
119 "Add any Islamic date entries from the diary file to `diary-entries-list'.") |
13053 | 120 |
14687
0d4ff7e4d6a3
Use the new file names in autoloads.
Karl Heuer <kwzh@gnu.org>
parents:
14308
diff
changeset
|
121 (autoload 'mark-islamic-diary-entries "cal-islam" |
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
122 "Mark days in the calendar window that have Islamic date diary entries.") |
13053 | 123 |
14687
0d4ff7e4d6a3
Use the new file names in autoloads.
Karl Heuer <kwzh@gnu.org>
parents:
14308
diff
changeset
|
124 (autoload 'mark-islamic-calendar-date-pattern "cal-islam" |
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
125 "Mark dates in calendar window that conform to Islamic date MONTH/DAY/YEAR.") |
13053 | 126 |
127 (autoload 'diary-hebrew-date "cal-hebrew" | |
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
128 "Hebrew calendar equivalent of date diary entry.") |
13053 | 129 |
130 (autoload 'diary-omer "cal-hebrew" | |
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
131 "Omer count diary entry.") |
13053 | 132 |
133 (autoload 'diary-yahrzeit "cal-hebrew" | |
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
134 "Yahrzeit diary entry--entry applies if date is yahrzeit or the day before.") |
13053 | 135 |
136 (autoload 'diary-parasha "cal-hebrew" | |
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
137 "Parasha diary entry--entry applies if date is a Saturday.") |
13053 | 138 |
139 (autoload 'diary-rosh-hodesh "cal-hebrew" | |
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
140 "Rosh Hodesh diary entry.") |
13053 | 141 |
142 (autoload 'list-hebrew-diary-entries "cal-hebrew" | |
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
143 "Add any Hebrew date entries from the diary file to `diary-entries-list'.") |
13053 | 144 |
145 (autoload 'mark-hebrew-diary-entries "cal-hebrew" | |
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
146 "Mark days in the calendar window that have Hebrew date diary entries.") |
13053 | 147 |
148 (autoload 'mark-hebrew-calendar-date-pattern "cal-hebrew" | |
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
149 "Mark dates in calendar window that conform to Hebrew date MONTH/DAY/YEAR.") |
13053 | 150 |
151 (autoload 'diary-coptic-date "cal-coptic" | |
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
152 "Coptic calendar equivalent of date diary entry.") |
13053 | 153 |
154 (autoload 'diary-ethiopic-date "cal-coptic" | |
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
155 "Ethiopic calendar equivalent of date diary entry.") |
13053 | 156 |
15258
ab5975df6164
Change autoload references from cal-persian to cal-persia.
Karl Heuer <kwzh@gnu.org>
parents:
14954
diff
changeset
|
157 (autoload 'diary-persian-date "cal-persia" |
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
158 "Persian calendar equivalent of date diary entry.") |
14954
a9102c34a5b6
Fix length of separator string.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
14687
diff
changeset
|
159 |
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
160 (autoload 'diary-phases-of-moon "lunar" "Moon phases diary entry.") |
13053 | 161 |
162 (autoload 'diary-sunrise-sunset "solar" | |
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
163 "Local time of sunrise and sunset as a diary entry.") |
13053 | 164 |
165 (autoload 'diary-sabbath-candles "solar" | |
166 "Local time of candle lighting diary entry--applies if date is a Friday. | |
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
167 No diary entry if there is no sunset on that date.") |
13053 | 168 |
169 (defvar diary-syntax-table (copy-syntax-table (standard-syntax-table)) | |
170 "The syntax table used when parsing dates in the diary file. | |
171 It is the standard syntax table used in Fundamental mode, but with the | |
172 syntax of `*' changed to be a word constituent.") | |
173 | |
174 (modify-syntax-entry ?* "w" diary-syntax-table) | |
25155
acad42cf5361
Change syntax table entry for colon in the diary as part of the
Richard M. Stallman <rms@gnu.org>
parents:
24760
diff
changeset
|
175 (modify-syntax-entry ?: "w" diary-syntax-table) |
13053 | 176 |
46826
e020f18c490a
(diary-mail-entries): Use `compose-mail'
Sam Steingold <sds@gnu.org>
parents:
46620
diff
changeset
|
177 (defvar diary-modified) |
e020f18c490a
(diary-mail-entries): Use `compose-mail'
Sam Steingold <sds@gnu.org>
parents:
46620
diff
changeset
|
178 (defvar diary-entries-list) |
e020f18c490a
(diary-mail-entries): Use `compose-mail'
Sam Steingold <sds@gnu.org>
parents:
46620
diff
changeset
|
179 (defvar displayed-year) |
e020f18c490a
(diary-mail-entries): Use `compose-mail'
Sam Steingold <sds@gnu.org>
parents:
46620
diff
changeset
|
180 (defvar displayed-month) |
e020f18c490a
(diary-mail-entries): Use `compose-mail'
Sam Steingold <sds@gnu.org>
parents:
46620
diff
changeset
|
181 (defvar entry) |
e020f18c490a
(diary-mail-entries): Use `compose-mail'
Sam Steingold <sds@gnu.org>
parents:
46620
diff
changeset
|
182 (defvar date) |
e020f18c490a
(diary-mail-entries): Use `compose-mail'
Sam Steingold <sds@gnu.org>
parents:
46620
diff
changeset
|
183 (defvar number) |
e020f18c490a
(diary-mail-entries): Use `compose-mail'
Sam Steingold <sds@gnu.org>
parents:
46620
diff
changeset
|
184 (defvar date-string) |
e020f18c490a
(diary-mail-entries): Use `compose-mail'
Sam Steingold <sds@gnu.org>
parents:
46620
diff
changeset
|
185 (defvar d-file) |
e020f18c490a
(diary-mail-entries): Use `compose-mail'
Sam Steingold <sds@gnu.org>
parents:
46620
diff
changeset
|
186 (defvar original-date) |
e020f18c490a
(diary-mail-entries): Use `compose-mail'
Sam Steingold <sds@gnu.org>
parents:
46620
diff
changeset
|
187 |
13053 | 188 (defun list-diary-entries (date number) |
189 "Create and display a buffer containing the relevant lines in diary-file. | |
190 The arguments are DATE and NUMBER; the entries selected are those | |
191 for NUMBER days starting with date DATE. The other entries are hidden | |
192 using selective display. | |
193 | |
194 Returns a list of all relevant diary entries found, if any, in order by date. | |
20269
ca337d0a1553
(list-diary-entries, list-sexp-diary-entries, add-to-diary-list):
Karl Heuer <kwzh@gnu.org>
parents:
19324
diff
changeset
|
195 The list entries have the form ((month day year) string specifier) where |
ca337d0a1553
(list-diary-entries, list-sexp-diary-entries, add-to-diary-list):
Karl Heuer <kwzh@gnu.org>
parents:
19324
diff
changeset
|
196 \(month day year) is the date of the entry, string is the entry text, and |
ca337d0a1553
(list-diary-entries, list-sexp-diary-entries, add-to-diary-list):
Karl Heuer <kwzh@gnu.org>
parents:
19324
diff
changeset
|
197 specifier is the applicability. If the variable `diary-list-include-blanks' |
ca337d0a1553
(list-diary-entries, list-sexp-diary-entries, add-to-diary-list):
Karl Heuer <kwzh@gnu.org>
parents:
19324
diff
changeset
|
198 is t, this list includes a dummy diary entry consisting of the empty string) |
ca337d0a1553
(list-diary-entries, list-sexp-diary-entries, add-to-diary-list):
Karl Heuer <kwzh@gnu.org>
parents:
19324
diff
changeset
|
199 for a date with no diary entries. |
13053 | 200 |
201 After the list is prepared, the hooks `nongregorian-diary-listing-hook', | |
202 `list-diary-entries-hook', `diary-display-hook', and `diary-hook' are run. | |
203 These hooks have the following distinct roles: | |
204 | |
205 `nongregorian-diary-listing-hook' can cull dates from the diary | |
206 and each included file. Usually used for Hebrew or Islamic | |
207 diary entries in files. Applied to *each* file. | |
208 | |
209 `list-diary-entries-hook' adds or manipulates diary entries from | |
210 external sources. Used, for example, to include diary entries | |
211 from other files or to sort the diary entries. Invoked *once* only, | |
212 before the display hook is run. | |
213 | |
214 `diary-display-hook' does the actual display of information. If this is | |
215 nil, simple-diary-display will be used. Use add-hook to set this to | |
216 fancy-diary-display, if desired. If you want no diary display, use | |
217 add-hook to set this to ignore. | |
218 | |
219 `diary-hook' is run last. This can be used for an appointment | |
220 notification function." | |
221 | |
222 (if (< 0 number) | |
223 (let* ((original-date date);; save for possible use in the hooks | |
46826
e020f18c490a
(diary-mail-entries): Use `compose-mail'
Sam Steingold <sds@gnu.org>
parents:
46620
diff
changeset
|
224 old-diary-syntax-table |
e020f18c490a
(diary-mail-entries): Use `compose-mail'
Sam Steingold <sds@gnu.org>
parents:
46620
diff
changeset
|
225 diary-entries-list |
13053 | 226 (date-string (calendar-date-string date)) |
227 (d-file (substitute-in-file-name diary-file))) | |
228 (message "Preparing diary...") | |
229 (save-excursion | |
13877
44149f0bf44a
Replaced all uses of get-file-buffer with find-buffer-visiting.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
13688
diff
changeset
|
230 (let ((diary-buffer (find-buffer-visiting d-file))) |
16545
ff25eb6a7d11
(list-diary-entries): Reread the diary file if it has changed.
Richard M. Stallman <rms@gnu.org>
parents:
15258
diff
changeset
|
231 (if (not diary-buffer) |
ff25eb6a7d11
(list-diary-entries): Reread the diary file if it has changed.
Richard M. Stallman <rms@gnu.org>
parents:
15258
diff
changeset
|
232 (set-buffer (find-file-noselect d-file t)) |
ff25eb6a7d11
(list-diary-entries): Reread the diary file if it has changed.
Richard M. Stallman <rms@gnu.org>
parents:
15258
diff
changeset
|
233 (set-buffer diary-buffer) |
ff25eb6a7d11
(list-diary-entries): Reread the diary file if it has changed.
Richard M. Stallman <rms@gnu.org>
parents:
15258
diff
changeset
|
234 (or (verify-visited-file-modtime diary-buffer) |
ff25eb6a7d11
(list-diary-entries): Reread the diary file if it has changed.
Richard M. Stallman <rms@gnu.org>
parents:
15258
diff
changeset
|
235 (revert-buffer t t)))) |
13053 | 236 (setq selective-display t) |
237 (setq selective-display-ellipses nil) | |
238 (setq old-diary-syntax-table (syntax-table)) | |
239 (set-syntax-table diary-syntax-table) | |
240 (unwind-protect | |
241 (let ((buffer-read-only nil) | |
242 (diary-modified (buffer-modified-p)) | |
243 (mark (regexp-quote diary-nonmarking-symbol))) | |
27918
a71031623500
(list-diary-entries): Don't try to go forward at
Gerd Moellmann <gerd@gnu.org>
parents:
27842
diff
changeset
|
244 ;; First and last characters must be ^M or \n for |
a71031623500
(list-diary-entries): Don't try to go forward at
Gerd Moellmann <gerd@gnu.org>
parents:
27842
diff
changeset
|
245 ;; selective display to work properly |
13053 | 246 (goto-char (1- (point-max))) |
247 (if (not (looking-at "\^M\\|\n")) | |
248 (progn | |
27918
a71031623500
(list-diary-entries): Don't try to go forward at
Gerd Moellmann <gerd@gnu.org>
parents:
27842
diff
changeset
|
249 (goto-char (point-max)) |
41566
82d4ad3abe8c
(list-diary-entries): Use insert instead of insert-string.
Pavel Janík <Pavel@Janik.cz>
parents:
39615
diff
changeset
|
250 (insert "\^M"))) |
13053 | 251 (goto-char (point-min)) |
252 (if (not (looking-at "\^M\\|\n")) | |
41566
82d4ad3abe8c
(list-diary-entries): Use insert instead of insert-string.
Pavel Janík <Pavel@Janik.cz>
parents:
39615
diff
changeset
|
253 (insert "\^M")) |
13053 | 254 (subst-char-in-region (point-min) (point-max) ?\n ?\^M t) |
255 (calendar-for-loop i from 1 to number do | |
256 (let ((d diary-date-forms) | |
257 (month (extract-calendar-month date)) | |
258 (day (extract-calendar-day date)) | |
259 (year (extract-calendar-year date)) | |
260 (entry-found (list-sexp-diary-entries date))) | |
261 (while d | |
262 (let* | |
263 ((date-form (if (equal (car (car d)) 'backup) | |
264 (cdr (car d)) | |
265 (car d))) | |
266 (backup (equal (car (car d)) 'backup)) | |
267 (dayname | |
268 (concat | |
269 (calendar-day-name date) "\\|" | |
270 (substring (calendar-day-name date) 0 3) ".?")) | |
271 (monthname | |
272 (concat | |
273 "\\*\\|" | |
274 (calendar-month-name month) "\\|" | |
275 (substring (calendar-month-name month) 0 3) ".?")) | |
276 (month (concat "\\*\\|0*" (int-to-string month))) | |
277 (day (concat "\\*\\|0*" (int-to-string day))) | |
278 (year | |
279 (concat | |
280 "\\*\\|0*" (int-to-string year) | |
281 (if abbreviated-calendar-year | |
25594
2d1ef4eb8297
1999-09-07 Edward M. Reingold <reingold@emr.cs.uiuc.edu>
Dave Love <fx@gnu.org>
parents:
25155
diff
changeset
|
282 (concat "\\|" (format "%02d" (% year 100))) |
13053 | 283 ""))) |
284 (regexp | |
285 (concat | |
286 "\\(\\`\\|\^M\\|\n\\)" mark "?\\(" | |
287 (mapconcat 'eval date-form "\\)\\(") | |
288 "\\)")) | |
289 (case-fold-search t)) | |
290 (goto-char (point-min)) | |
291 (while (re-search-forward regexp nil t) | |
292 (if backup (re-search-backward "\\<" nil t)) | |
293 (if (and (or (char-equal (preceding-char) ?\^M) | |
294 (char-equal (preceding-char) ?\n)) | |
295 (not (looking-at " \\|\^I"))) | |
296 ;; Diary entry that consists only of date. | |
297 (backward-char 1) | |
298 ;; Found a nonempty diary entry--make it visible and | |
299 ;; add it to the list. | |
300 (setq entry-found t) | |
301 (let ((entry-start (point)) | |
302 (date-start)) | |
303 (re-search-backward "\^M\\|\n\\|\\`") | |
304 (setq date-start (point)) | |
305 (re-search-forward "\^M\\|\n" nil t 2) | |
306 (while (looking-at " \\|\^I") | |
307 (re-search-forward "\^M\\|\n" nil t)) | |
308 (backward-char 1) | |
309 (subst-char-in-region date-start | |
310 (point) ?\^M ?\n t) | |
311 (add-to-diary-list | |
20269
ca337d0a1553
(list-diary-entries, list-sexp-diary-entries, add-to-diary-list):
Karl Heuer <kwzh@gnu.org>
parents:
19324
diff
changeset
|
312 date |
43646
bcdc815ba23f
(list-diary-entries): Use `buffer-substring' instead of
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
42513
diff
changeset
|
313 (buffer-substring |
20269
ca337d0a1553
(list-diary-entries, list-sexp-diary-entries, add-to-diary-list):
Karl Heuer <kwzh@gnu.org>
parents:
19324
diff
changeset
|
314 entry-start (point)) |
43646
bcdc815ba23f
(list-diary-entries): Use `buffer-substring' instead of
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
42513
diff
changeset
|
315 (buffer-substring |
48365
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
316 (1+ date-start) (1- entry-start)) |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
317 (copy-marker entry-start)))))) |
13053 | 318 (setq d (cdr d))) |
319 (or entry-found | |
320 (not diary-list-include-blanks) | |
39615
4287ce76bf9f
(diary-entry-compare): When times are identical, compare the entries
Sam Steingold <sds@gnu.org>
parents:
38422
diff
changeset
|
321 (setq diary-entries-list |
13053 | 322 (append diary-entries-list |
20269
ca337d0a1553
(list-diary-entries, list-sexp-diary-entries, add-to-diary-list):
Karl Heuer <kwzh@gnu.org>
parents:
19324
diff
changeset
|
323 (list (list date "" ""))))) |
13053 | 324 (setq date |
325 (calendar-gregorian-from-absolute | |
326 (1+ (calendar-absolute-from-gregorian date)))) | |
327 (setq entry-found nil))) | |
328 (set-buffer-modified-p diary-modified)) | |
329 (set-syntax-table old-diary-syntax-table)) | |
330 (goto-char (point-min)) | |
331 (run-hooks 'nongregorian-diary-listing-hook | |
332 'list-diary-entries-hook) | |
333 (if diary-display-hook | |
334 (run-hooks 'diary-display-hook) | |
335 (simple-diary-display)) | |
336 (run-hooks 'diary-hook) | |
337 diary-entries-list)))) | |
338 | |
339 (defun include-other-diary-files () | |
340 "Include the diary entries from other diary files with those of diary-file. | |
341 This function is suitable for use in `list-diary-entries-hook'; | |
342 it enables you to use shared diary files together with your own. | |
343 The files included are specified in the diaryfile by lines of this form: | |
344 #include \"filename\" | |
345 This is recursive; that is, #include directives in diary files thus included | |
346 are obeyed. You can change the `#include' to some other string by | |
347 changing the variable `diary-include-string'." | |
348 (goto-char (point-min)) | |
349 (while (re-search-forward | |
350 (concat | |
351 "\\(\\`\\|\^M\\|\n\\)" | |
352 (regexp-quote diary-include-string) | |
353 " \"\\([^\"]*\\)\"") | |
354 nil t) | |
27842
cfa579c1229f
(include-other-diary-files): Undo the selective
Gerd Moellmann <gerd@gnu.org>
parents:
26330
diff
changeset
|
355 (let* ((diary-file (substitute-in-file-name |
cfa579c1229f
(include-other-diary-files): Undo the selective
Gerd Moellmann <gerd@gnu.org>
parents:
26330
diff
changeset
|
356 (buffer-substring-no-properties |
cfa579c1229f
(include-other-diary-files): Undo the selective
Gerd Moellmann <gerd@gnu.org>
parents:
26330
diff
changeset
|
357 (match-beginning 2) (match-end 2)))) |
cfa579c1229f
(include-other-diary-files): Undo the selective
Gerd Moellmann <gerd@gnu.org>
parents:
26330
diff
changeset
|
358 (diary-list-include-blanks nil) |
cfa579c1229f
(include-other-diary-files): Undo the selective
Gerd Moellmann <gerd@gnu.org>
parents:
26330
diff
changeset
|
359 (list-diary-entries-hook 'include-other-diary-files) |
cfa579c1229f
(include-other-diary-files): Undo the selective
Gerd Moellmann <gerd@gnu.org>
parents:
26330
diff
changeset
|
360 (diary-display-hook 'ignore) |
cfa579c1229f
(include-other-diary-files): Undo the selective
Gerd Moellmann <gerd@gnu.org>
parents:
26330
diff
changeset
|
361 (diary-hook nil) |
cfa579c1229f
(include-other-diary-files): Undo the selective
Gerd Moellmann <gerd@gnu.org>
parents:
26330
diff
changeset
|
362 (d-buffer (find-buffer-visiting diary-file)) |
cfa579c1229f
(include-other-diary-files): Undo the selective
Gerd Moellmann <gerd@gnu.org>
parents:
26330
diff
changeset
|
363 (diary-modified (if d-buffer |
cfa579c1229f
(include-other-diary-files): Undo the selective
Gerd Moellmann <gerd@gnu.org>
parents:
26330
diff
changeset
|
364 (save-excursion |
cfa579c1229f
(include-other-diary-files): Undo the selective
Gerd Moellmann <gerd@gnu.org>
parents:
26330
diff
changeset
|
365 (set-buffer d-buffer) |
cfa579c1229f
(include-other-diary-files): Undo the selective
Gerd Moellmann <gerd@gnu.org>
parents:
26330
diff
changeset
|
366 (buffer-modified-p))))) |
13053 | 367 (if (file-exists-p diary-file) |
368 (if (file-readable-p diary-file) | |
369 (unwind-protect | |
370 (setq diary-entries-list | |
371 (append diary-entries-list | |
372 (list-diary-entries original-date number))) | |
28575
dc6ae1a1331c
(include-other-diary-files): Fix the fix of
Gerd Moellmann <gerd@gnu.org>
parents:
27918
diff
changeset
|
373 (save-excursion |
dc6ae1a1331c
(include-other-diary-files): Fix the fix of
Gerd Moellmann <gerd@gnu.org>
parents:
27918
diff
changeset
|
374 (set-buffer (find-buffer-visiting diary-file)) |
44732
a3338547dad4
(include-other-diary-files): Allow modifying
Richard M. Stallman <rms@gnu.org>
parents:
43646
diff
changeset
|
375 (let ((inhibit-read-only t)) |
a3338547dad4
(include-other-diary-files): Allow modifying
Richard M. Stallman <rms@gnu.org>
parents:
43646
diff
changeset
|
376 (subst-char-in-region (point-min) (point-max) ?\^M ?\n t)) |
28575
dc6ae1a1331c
(include-other-diary-files): Fix the fix of
Gerd Moellmann <gerd@gnu.org>
parents:
27918
diff
changeset
|
377 (setq selective-display nil) |
dc6ae1a1331c
(include-other-diary-files): Fix the fix of
Gerd Moellmann <gerd@gnu.org>
parents:
27918
diff
changeset
|
378 (set-buffer-modified-p diary-modified))) |
13053 | 379 (beep) |
380 (message "Can't read included diary file %s" diary-file) | |
381 (sleep-for 2)) | |
382 (beep) | |
383 (message "Can't find included diary file %s" diary-file) | |
384 (sleep-for 2)))) | |
385 (goto-char (point-min))) | |
386 | |
387 (defun simple-diary-display () | |
388 "Display the diary buffer if there are any relevant entries or holidays." | |
389 (let* ((holiday-list (if holidays-in-diary-buffer | |
390 (check-calendar-holidays original-date))) | |
391 (msg (format "No diary entries for %s %s" | |
392 (concat date-string (if holiday-list ":" "")) | |
393 (mapconcat 'identity holiday-list "; ")))) | |
26330
d0f895577892
(simple-diary-display): Reset modeline even if
Gerd Moellmann <gerd@gnu.org>
parents:
25594
diff
changeset
|
394 (calendar-set-mode-line |
d0f895577892
(simple-diary-display): Reset modeline even if
Gerd Moellmann <gerd@gnu.org>
parents:
25594
diff
changeset
|
395 (concat "Diary for " date-string |
d0f895577892
(simple-diary-display): Reset modeline even if
Gerd Moellmann <gerd@gnu.org>
parents:
25594
diff
changeset
|
396 (if holiday-list ": " "") |
d0f895577892
(simple-diary-display): Reset modeline even if
Gerd Moellmann <gerd@gnu.org>
parents:
25594
diff
changeset
|
397 (mapconcat 'identity holiday-list "; "))) |
13053 | 398 (if (or (not diary-entries-list) |
399 (and (not (cdr diary-entries-list)) | |
400 (string-equal (car (cdr (car diary-entries-list))) ""))) | |
401 (if (<= (length msg) (frame-width)) | |
14308
0ce52b2f2bb5
(simple-diary-display, fancy-diary-display): Pass proper format string to message.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
402 (message "%s" msg) |
13053 | 403 (set-buffer (get-buffer-create holiday-buffer)) |
404 (setq buffer-read-only nil) | |
405 (calendar-set-mode-line date-string) | |
406 (erase-buffer) | |
407 (insert (mapconcat 'identity holiday-list "\n")) | |
408 (goto-char (point-min)) | |
409 (set-buffer-modified-p nil) | |
410 (setq buffer-read-only t) | |
411 (display-buffer holiday-buffer) | |
412 (message "No diary entries for %s" date-string)) | |
13877
44149f0bf44a
Replaced all uses of get-file-buffer with find-buffer-visiting.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
13688
diff
changeset
|
413 (display-buffer (find-buffer-visiting d-file)) |
13053 | 414 (message "Preparing diary...done")))) |
415 | |
48365
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
416 (defface diary-button-face '((((type pc) (class color)) |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
417 (:foreground "lightblue"))) |
48372
dedfe509d0ca
(diary-button-face): Add group and version number.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48365
diff
changeset
|
418 "Default face used for buttons." |
dedfe509d0ca
(diary-button-face): Add group and version number.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48365
diff
changeset
|
419 :version "21.4" |
dedfe509d0ca
(diary-button-face): Add group and version number.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48365
diff
changeset
|
420 :group 'diary) |
48365
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
421 |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
422 (define-button-type 'diary-entry |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
423 'action #'diary-goto-entry |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
424 'face #'diary-button-face) |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
425 |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
426 (defun diary-goto-entry (button) |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
427 (let ((marker (button-get button 'marker))) |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
428 (when marker |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
429 (pop-to-buffer (marker-buffer marker)) |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
430 (goto-char (marker-position marker))))) |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
431 |
13053 | 432 (defun fancy-diary-display () |
433 "Prepare a diary buffer with relevant entries in a fancy, noneditable form. | |
434 This function is provided for optional use as the `diary-display-hook'." | |
435 (save-excursion;; Turn off selective-display in the diary file's buffer. | |
13877
44149f0bf44a
Replaced all uses of get-file-buffer with find-buffer-visiting.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
13688
diff
changeset
|
436 (set-buffer (find-buffer-visiting (substitute-in-file-name diary-file))) |
13053 | 437 (let ((diary-modified (buffer-modified-p))) |
438 (subst-char-in-region (point-min) (point-max) ?\^M ?\n t) | |
439 (setq selective-display nil) | |
440 (kill-local-variable 'mode-line-format) | |
441 (set-buffer-modified-p diary-modified))) | |
442 (if (or (not diary-entries-list) | |
443 (and (not (cdr diary-entries-list)) | |
444 (string-equal (car (cdr (car diary-entries-list))) ""))) | |
445 (let* ((holiday-list (if holidays-in-diary-buffer | |
446 (check-calendar-holidays original-date))) | |
447 (msg (format "No diary entries for %s %s" | |
448 (concat date-string (if holiday-list ":" "")) | |
449 (mapconcat 'identity holiday-list "; ")))) | |
450 (if (<= (length msg) (frame-width)) | |
14308
0ce52b2f2bb5
(simple-diary-display, fancy-diary-display): Pass proper format string to message.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
451 (message "%s" msg) |
13053 | 452 (set-buffer (get-buffer-create holiday-buffer)) |
453 (setq buffer-read-only nil) | |
454 (calendar-set-mode-line date-string) | |
455 (erase-buffer) | |
456 (insert (mapconcat 'identity holiday-list "\n")) | |
457 (goto-char (point-min)) | |
458 (set-buffer-modified-p nil) | |
459 (setq buffer-read-only t) | |
460 (display-buffer holiday-buffer) | |
461 (message "No diary entries for %s" date-string))) | |
462 (save-excursion;; Prepare the fancy diary buffer. | |
463 (set-buffer (make-fancy-diary-buffer)) | |
464 (setq buffer-read-only nil) | |
465 (let ((entry-list diary-entries-list) | |
466 (holiday-list) | |
467 (holiday-list-last-month 1) | |
468 (holiday-list-last-year 1) | |
469 (date (list 0 0 0))) | |
470 (while entry-list | |
471 (if (not (calendar-date-equal date (car (car entry-list)))) | |
472 (progn | |
473 (setq date (car (car entry-list))) | |
474 (and holidays-in-diary-buffer | |
475 (calendar-date-compare | |
476 (list (list holiday-list-last-month | |
477 (calendar-last-day-of-month | |
478 holiday-list-last-month | |
479 holiday-list-last-year) | |
480 holiday-list-last-year)) | |
481 (list date)) | |
482 ;; We need to get the holidays for the next 3 months. | |
483 (setq holiday-list-last-month | |
484 (extract-calendar-month date)) | |
485 (setq holiday-list-last-year | |
486 (extract-calendar-year date)) | |
487 (increment-calendar-month | |
488 holiday-list-last-month holiday-list-last-year 1) | |
489 (setq holiday-list | |
490 (let ((displayed-month holiday-list-last-month) | |
491 (displayed-year holiday-list-last-year)) | |
492 (calendar-holiday-list))) | |
493 (increment-calendar-month | |
494 holiday-list-last-month holiday-list-last-year 1)) | |
495 (let* ((date-string (calendar-date-string date)) | |
496 (date-holiday-list | |
497 (let ((h holiday-list) | |
498 (d)) | |
499 ;; Make a list of all holidays for date. | |
500 (while h | |
501 (if (calendar-date-equal date (car (car h))) | |
502 (setq d (append d (cdr (car h))))) | |
503 (setq h (cdr h))) | |
504 d))) | |
505 (insert (if (= (point) (point-min)) "" ?\n) date-string) | |
506 (if date-holiday-list (insert ": ")) | |
14954
a9102c34a5b6
Fix length of separator string.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
14687
diff
changeset
|
507 (let* ((l (current-column)) |
a9102c34a5b6
Fix length of separator string.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
14687
diff
changeset
|
508 (longest 0)) |
28615
4c6883cb70ab
(fancy-diary-display, mark-diary-entries)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28575
diff
changeset
|
509 (insert (mapconcat (lambda (x) |
4c6883cb70ab
(fancy-diary-display, mark-diary-entries)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28575
diff
changeset
|
510 (if (< longest (length x)) |
4c6883cb70ab
(fancy-diary-display, mark-diary-entries)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28575
diff
changeset
|
511 (setq longest (length x))) |
4c6883cb70ab
(fancy-diary-display, mark-diary-entries)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28575
diff
changeset
|
512 x) |
14954
a9102c34a5b6
Fix length of separator string.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
14687
diff
changeset
|
513 date-holiday-list |
a9102c34a5b6
Fix length of separator string.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
14687
diff
changeset
|
514 (concat "\n" (make-string l ? )))) |
a9102c34a5b6
Fix length of separator string.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
14687
diff
changeset
|
515 (insert ?\n (make-string (+ l longest) ?=) ?\n))))) |
13053 | 516 (if (< 0 (length (car (cdr (car entry-list))))) |
48365
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
517 (if (nth 3 (car entry-list)) |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
518 (insert-button (concat (car (cdr (car entry-list))) "\n") |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
519 'marker (nth 3 (car entry-list)) |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
520 :type 'diary-entry) |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
521 (insert (car (cdr (car entry-list))) ?\n))) |
13053 | 522 (setq entry-list (cdr entry-list)))) |
523 (set-buffer-modified-p nil) | |
524 (goto-char (point-min)) | |
525 (setq buffer-read-only t) | |
526 (display-buffer fancy-diary-buffer) | |
48365
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
527 (fancy-diary-display-mode) |
13053 | 528 (message "Preparing diary...done")))) |
529 | |
530 (defun make-fancy-diary-buffer () | |
531 "Create and return the initial fancy diary buffer." | |
532 (save-excursion | |
533 (set-buffer (get-buffer-create fancy-diary-buffer)) | |
534 (setq buffer-read-only nil) | |
535 (make-local-variable 'mode-line-format) | |
536 (calendar-set-mode-line "Diary Entries") | |
537 (erase-buffer) | |
538 (set-buffer-modified-p nil) | |
539 (setq buffer-read-only t) | |
540 (get-buffer fancy-diary-buffer))) | |
541 | |
542 (defun print-diary-entries () | |
543 "Print a hard copy of the diary display. | |
544 | |
545 If the simple diary display is being used, prepare a temp buffer with the | |
546 visible lines of the diary buffer, add a heading line composed from the mode | |
547 line, print the temp buffer, and destroy it. | |
548 | |
549 If the fancy diary display is being used, just print the buffer. | |
550 | |
551 The hooks given by the variable `print-diary-entries-hook' are called to do | |
552 the actual printing." | |
553 (interactive) | |
554 (if (bufferp (get-buffer fancy-diary-buffer)) | |
555 (save-excursion | |
556 (set-buffer (get-buffer fancy-diary-buffer)) | |
557 (run-hooks 'print-diary-entries-hook)) | |
558 (let ((diary-buffer | |
13877
44149f0bf44a
Replaced all uses of get-file-buffer with find-buffer-visiting.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
13688
diff
changeset
|
559 (find-buffer-visiting (substitute-in-file-name diary-file)))) |
13053 | 560 (if diary-buffer |
561 (let ((temp-buffer (get-buffer-create "*Printable Diary Entries*")) | |
562 (heading)) | |
563 (save-excursion | |
564 (set-buffer diary-buffer) | |
565 (setq heading | |
566 (if (not (stringp mode-line-format)) | |
567 "All Diary Entries" | |
568 (string-match "^-*\\([^-].*[^-]\\)-*$" mode-line-format) | |
569 (substring mode-line-format | |
570 (match-beginning 1) (match-end 1)))) | |
571 (copy-to-buffer temp-buffer (point-min) (point-max)) | |
572 (set-buffer temp-buffer) | |
573 (while (re-search-forward "\^M.*$" nil t) | |
574 (replace-match "")) | |
575 (goto-char (point-min)) | |
576 (insert heading "\n" | |
577 (make-string (length heading) ?=) "\n") | |
578 (run-hooks 'print-diary-entries-hook) | |
579 (kill-buffer temp-buffer))) | |
580 (error "You don't have a diary buffer!"))))) | |
581 | |
582 (defun show-all-diary-entries () | |
583 "Show all of the diary entries in the diary file. | |
584 This function gets rid of the selective display of the diary file so that | |
585 all entries, not just some, are visible. If there is no diary buffer, one | |
586 is created." | |
587 (interactive) | |
588 (let ((d-file (substitute-in-file-name diary-file))) | |
589 (if (and d-file (file-exists-p d-file)) | |
590 (if (file-readable-p d-file) | |
591 (save-excursion | |
13877
44149f0bf44a
Replaced all uses of get-file-buffer with find-buffer-visiting.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
13688
diff
changeset
|
592 (let ((diary-buffer (find-buffer-visiting d-file))) |
13053 | 593 (set-buffer (if diary-buffer |
594 diary-buffer | |
595 (find-file-noselect d-file t))) | |
596 (let ((buffer-read-only nil) | |
597 (diary-modified (buffer-modified-p))) | |
598 (subst-char-in-region (point-min) (point-max) ?\^M ?\n t) | |
599 (setq selective-display nil) | |
600 (make-local-variable 'mode-line-format) | |
601 (setq mode-line-format default-mode-line-format) | |
602 (display-buffer (current-buffer)) | |
603 (set-buffer-modified-p diary-modified)))) | |
604 (error "Your diary file is not readable!")) | |
605 (error "You don't have a diary file!")))) | |
606 | |
20345
69818ee01344
(diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
20269
diff
changeset
|
607 |
69818ee01344
(diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
20269
diff
changeset
|
608 |
39615
4287ce76bf9f
(diary-entry-compare): When times are identical, compare the entries
Sam Steingold <sds@gnu.org>
parents:
38422
diff
changeset
|
609 (defcustom diary-mail-addr |
20345
69818ee01344
(diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
20269
diff
changeset
|
610 (if (boundp 'user-mail-address) user-mail-address nil) |
69818ee01344
(diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
20269
diff
changeset
|
611 "*Email address that `diary-mail-entries' will send email to." |
69818ee01344
(diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
20269
diff
changeset
|
612 :group 'diary |
22683
0941a5743283
(diary-mail-addr): Fix custom type.
Richard M. Stallman <rms@gnu.org>
parents:
22638
diff
changeset
|
613 :type '(choice string (const nil)) |
21668
621dd51298ec
*** empty log message ***
Dan Nicolaescu <done@ece.arizona.edu>
parents:
20354
diff
changeset
|
614 :version "20.3") |
20345
69818ee01344
(diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
20269
diff
changeset
|
615 |
69818ee01344
(diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
20269
diff
changeset
|
616 (defcustom diary-mail-days 7 |
69818ee01344
(diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
20269
diff
changeset
|
617 "*Number of days for `diary-mail-entries' to check." |
69818ee01344
(diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
20269
diff
changeset
|
618 :group 'diary |
21668
621dd51298ec
*** empty log message ***
Dan Nicolaescu <done@ece.arizona.edu>
parents:
20354
diff
changeset
|
619 :type 'integer |
621dd51298ec
*** empty log message ***
Dan Nicolaescu <done@ece.arizona.edu>
parents:
20354
diff
changeset
|
620 :version "20.3") |
20345
69818ee01344
(diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
20269
diff
changeset
|
621 |
21957
a74e1cee89bf
(diary-mail-entries): Add autoload cookie.
Richard M. Stallman <rms@gnu.org>
parents:
21893
diff
changeset
|
622 ;;;###autoload |
20345
69818ee01344
(diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
20269
diff
changeset
|
623 (defun diary-mail-entries (&optional ndays) |
69818ee01344
(diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
20269
diff
changeset
|
624 "Send a mail message showing diary entries for next NDAYS days. |
69818ee01344
(diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
20269
diff
changeset
|
625 If no prefix argument is given, NDAYS is set to `diary-mail-days'. |
69818ee01344
(diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
20269
diff
changeset
|
626 |
69818ee01344
(diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
20269
diff
changeset
|
627 You can call `diary-mail-entries' every night using an at/cron job. |
69818ee01344
(diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
20269
diff
changeset
|
628 For example, this script will run the program at 2am daily. Since |
69818ee01344
(diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
20269
diff
changeset
|
629 `emacs -batch' does not load your `.emacs' file, you must ensure that |
69818ee01344
(diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
20269
diff
changeset
|
630 all relevant variables are set, as done here. |
69818ee01344
(diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
20269
diff
changeset
|
631 |
69818ee01344
(diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
20269
diff
changeset
|
632 #!/bin/sh |
69818ee01344
(diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
20269
diff
changeset
|
633 # diary-rem.sh -- repeatedly run the Emacs diary-reminder |
69818ee01344
(diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
20269
diff
changeset
|
634 emacs -batch \\ |
69818ee01344
(diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
20269
diff
changeset
|
635 -eval \"(setq diary-mail-days 3 \\ |
69818ee01344
(diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
20269
diff
changeset
|
636 european-calendar-style t \\ |
69818ee01344
(diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
20269
diff
changeset
|
637 diary-mail-addr \\\"user@host.name\\\" )\" \\ |
39615
4287ce76bf9f
(diary-entry-compare): When times are identical, compare the entries
Sam Steingold <sds@gnu.org>
parents:
38422
diff
changeset
|
638 -l diary-lib -f diary-mail-entries |
20345
69818ee01344
(diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
20269
diff
changeset
|
639 at -f diary-rem.sh 0200 tomorrow |
69818ee01344
(diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
20269
diff
changeset
|
640 |
69818ee01344
(diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
20269
diff
changeset
|
641 You may have to tweak the syntax of the `at' command to suit your |
69818ee01344
(diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
20269
diff
changeset
|
642 system. Alternatively, you can specify a cron entry: |
69818ee01344
(diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
20269
diff
changeset
|
643 0 1 * * * diary-rem.sh |
69818ee01344
(diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
20269
diff
changeset
|
644 to run it every morning at 1am." |
35500
38b437f4134e
(diary-float): Fix case of MONTH
Gerd Moellmann <gerd@gnu.org>
parents:
34036
diff
changeset
|
645 (interactive "P") |
38b437f4134e
(diary-float): Fix case of MONTH
Gerd Moellmann <gerd@gnu.org>
parents:
34036
diff
changeset
|
646 (let* ((diary-display-hook 'fancy-diary-display) |
38b437f4134e
(diary-float): Fix case of MONTH
Gerd Moellmann <gerd@gnu.org>
parents:
34036
diff
changeset
|
647 (text (progn (list-diary-entries (calendar-current-date) |
38b437f4134e
(diary-float): Fix case of MONTH
Gerd Moellmann <gerd@gnu.org>
parents:
34036
diff
changeset
|
648 (if ndays ndays diary-mail-days)) |
38b437f4134e
(diary-float): Fix case of MONTH
Gerd Moellmann <gerd@gnu.org>
parents:
34036
diff
changeset
|
649 (set-buffer fancy-diary-buffer) |
38b437f4134e
(diary-float): Fix case of MONTH
Gerd Moellmann <gerd@gnu.org>
parents:
34036
diff
changeset
|
650 (buffer-substring (point-min) (point-max))))) |
46826
e020f18c490a
(diary-mail-entries): Use `compose-mail'
Sam Steingold <sds@gnu.org>
parents:
46620
diff
changeset
|
651 (compose-mail diary-mail-addr |
47163
88f34e3227e6
(diary-mail-entries): Don't overwrite user's value
Richard M. Stallman <rms@gnu.org>
parents:
46826
diff
changeset
|
652 (if (string-equal text "") |
88f34e3227e6
(diary-mail-entries): Don't overwrite user's value
Richard M. Stallman <rms@gnu.org>
parents:
46826
diff
changeset
|
653 "No entries found" |
88f34e3227e6
(diary-mail-entries): Don't overwrite user's value
Richard M. Stallman <rms@gnu.org>
parents:
46826
diff
changeset
|
654 (concat "Diary entries generated " |
88f34e3227e6
(diary-mail-entries): Don't overwrite user's value
Richard M. Stallman <rms@gnu.org>
parents:
46826
diff
changeset
|
655 (calendar-date-string (calendar-current-date))))) |
46826
e020f18c490a
(diary-mail-entries): Use `compose-mail'
Sam Steingold <sds@gnu.org>
parents:
46620
diff
changeset
|
656 (insert text) |
e020f18c490a
(diary-mail-entries): Use `compose-mail'
Sam Steingold <sds@gnu.org>
parents:
46620
diff
changeset
|
657 (funcall (get mail-user-agent 'sendfunc)))) |
20345
69818ee01344
(diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
20269
diff
changeset
|
658 |
69818ee01344
(diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
20269
diff
changeset
|
659 |
13053 | 660 (defun diary-name-pattern (string-array &optional fullname) |
47922
afefa409b756
(diary-name-pattern): Fix typo.
Juanma Barranquero <lekktu@gmail.com>
parents:
47163
diff
changeset
|
661 "Convert a STRING-ARRAY, an array of strings to a pattern. |
13053 | 662 The pattern will match any of the strings, either entirely or abbreviated |
663 to three characters. An abbreviated form will match with or without a period; | |
664 If the optional FULLNAME is t, abbreviations will not match, just the full | |
665 name." | |
666 (let ((pattern "")) | |
667 (calendar-for-loop i from 0 to (1- (length string-array)) do | |
668 (setq pattern | |
669 (concat | |
670 pattern | |
671 (if (string-equal pattern "") "" "\\|") | |
672 (aref string-array i) | |
673 (if fullname | |
674 "" | |
675 (concat | |
676 "\\|" | |
677 (substring (aref string-array i) 0 3) ".?"))))) | |
678 pattern)) | |
679 | |
680 (defvar marking-diary-entries nil | |
681 "True during the marking of diary entries, nil otherwise.") | |
682 | |
683 (defvar marking-diary-entry nil | |
684 "True during the marking of diary entries, if current entry is marking.") | |
685 | |
686 (defun mark-diary-entries () | |
687 "Mark days in the calendar window that have diary entries. | |
688 Each entry in the diary file visible in the calendar window is marked. | |
689 After the entries are marked, the hooks `nongregorian-diary-marking-hook' and | |
690 `mark-diary-entries-hook' are run." | |
691 (interactive) | |
692 (setq mark-diary-entries-in-calendar t) | |
693 (let ((d-file (substitute-in-file-name diary-file)) | |
694 (marking-diary-entries t)) | |
695 (if (and d-file (file-exists-p d-file)) | |
696 (if (file-readable-p d-file) | |
697 (save-excursion | |
698 (message "Marking diary entries...") | |
699 (set-buffer (find-file-noselect d-file t)) | |
700 (let ((d diary-date-forms) | |
701 (old-diary-syntax-table)) | |
702 (setq old-diary-syntax-table (syntax-table)) | |
703 (set-syntax-table diary-syntax-table) | |
704 (while d | |
705 (let* | |
706 ((date-form (if (equal (car (car d)) 'backup) | |
707 (cdr (car d)) | |
708 (car d)));; ignore 'backup directive | |
709 (dayname (diary-name-pattern calendar-day-name-array)) | |
710 (monthname | |
711 (concat | |
712 (diary-name-pattern calendar-month-name-array) | |
713 "\\|\\*")) | |
714 (month "[0-9]+\\|\\*") | |
715 (day "[0-9]+\\|\\*") | |
716 (year "[0-9]+\\|\\*") | |
717 (l (length date-form)) | |
718 (d-name-pos (- l (length (memq 'dayname date-form)))) | |
719 (d-name-pos (if (/= l d-name-pos) (+ 2 d-name-pos))) | |
720 (m-name-pos (- l (length (memq 'monthname date-form)))) | |
721 (m-name-pos (if (/= l m-name-pos) (+ 2 m-name-pos))) | |
722 (d-pos (- l (length (memq 'day date-form)))) | |
723 (d-pos (if (/= l d-pos) (+ 2 d-pos))) | |
724 (m-pos (- l (length (memq 'month date-form)))) | |
725 (m-pos (if (/= l m-pos) (+ 2 m-pos))) | |
726 (y-pos (- l (length (memq 'year date-form)))) | |
727 (y-pos (if (/= l y-pos) (+ 2 y-pos))) | |
728 (regexp | |
729 (concat | |
730 "\\(\\`\\|\^M\\|\n\\)\\(" | |
731 (mapconcat 'eval date-form "\\)\\(") | |
732 "\\)")) | |
733 (case-fold-search t)) | |
734 (goto-char (point-min)) | |
735 (while (re-search-forward regexp nil t) | |
736 (let* ((dd-name | |
737 (if d-name-pos | |
13687
9a985bcde00e
Chnaged all occurrences of buffer-substring to buffer-substring-no-properties.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
13670
diff
changeset
|
738 (buffer-substring-no-properties |
13053 | 739 (match-beginning d-name-pos) |
740 (match-end d-name-pos)))) | |
741 (mm-name | |
742 (if m-name-pos | |
13687
9a985bcde00e
Chnaged all occurrences of buffer-substring to buffer-substring-no-properties.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
13670
diff
changeset
|
743 (buffer-substring-no-properties |
13053 | 744 (match-beginning m-name-pos) |
745 (match-end m-name-pos)))) | |
746 (mm (string-to-int | |
747 (if m-pos | |
13687
9a985bcde00e
Chnaged all occurrences of buffer-substring to buffer-substring-no-properties.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
13670
diff
changeset
|
748 (buffer-substring-no-properties |
13053 | 749 (match-beginning m-pos) |
750 (match-end m-pos)) | |
751 ""))) | |
752 (dd (string-to-int | |
753 (if d-pos | |
13687
9a985bcde00e
Chnaged all occurrences of buffer-substring to buffer-substring-no-properties.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
13670
diff
changeset
|
754 (buffer-substring-no-properties |
13053 | 755 (match-beginning d-pos) |
756 (match-end d-pos)) | |
757 ""))) | |
758 (y-str (if y-pos | |
13687
9a985bcde00e
Chnaged all occurrences of buffer-substring to buffer-substring-no-properties.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
13670
diff
changeset
|
759 (buffer-substring-no-properties |
13053 | 760 (match-beginning y-pos) |
761 (match-end y-pos)))) | |
762 (yy (if (not y-str) | |
763 0 | |
764 (if (and (= (length y-str) 2) | |
765 abbreviated-calendar-year) | |
766 (let* ((current-y | |
767 (extract-calendar-year | |
768 (calendar-current-date))) | |
769 (y (+ (string-to-int y-str) | |
770 (* 100 | |
771 (/ current-y 100))))) | |
772 (if (> (- y current-y) 50) | |
773 (- y 100) | |
774 (if (> (- current-y y) 50) | |
775 (+ y 100) | |
776 y))) | |
777 (string-to-int y-str))))) | |
778 (if dd-name | |
779 (mark-calendar-days-named | |
24192
1baa5a4968b2
(mark-diary-entries): Use assoc-ignore-case and do not capitalize when
Richard M. Stallman <rms@gnu.org>
parents:
23998
diff
changeset
|
780 (cdr (assoc-ignore-case |
1baa5a4968b2
(mark-diary-entries): Use assoc-ignore-case and do not capitalize when
Richard M. Stallman <rms@gnu.org>
parents:
23998
diff
changeset
|
781 (substring dd-name 0 3) |
1baa5a4968b2
(mark-diary-entries): Use assoc-ignore-case and do not capitalize when
Richard M. Stallman <rms@gnu.org>
parents:
23998
diff
changeset
|
782 (calendar-make-alist |
1baa5a4968b2
(mark-diary-entries): Use assoc-ignore-case and do not capitalize when
Richard M. Stallman <rms@gnu.org>
parents:
23998
diff
changeset
|
783 calendar-day-name-array |
1baa5a4968b2
(mark-diary-entries): Use assoc-ignore-case and do not capitalize when
Richard M. Stallman <rms@gnu.org>
parents:
23998
diff
changeset
|
784 0 |
28615
4c6883cb70ab
(fancy-diary-display, mark-diary-entries)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28575
diff
changeset
|
785 (lambda (x) (substring x 0 3)))))) |
13053 | 786 (if mm-name |
787 (if (string-equal mm-name "*") | |
788 (setq mm 0) | |
789 (setq mm | |
24192
1baa5a4968b2
(mark-diary-entries): Use assoc-ignore-case and do not capitalize when
Richard M. Stallman <rms@gnu.org>
parents:
23998
diff
changeset
|
790 (cdr (assoc-ignore-case |
1baa5a4968b2
(mark-diary-entries): Use assoc-ignore-case and do not capitalize when
Richard M. Stallman <rms@gnu.org>
parents:
23998
diff
changeset
|
791 (substring mm-name 0 3) |
13053 | 792 (calendar-make-alist |
793 calendar-month-name-array | |
794 1 | |
28615
4c6883cb70ab
(fancy-diary-display, mark-diary-entries)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28575
diff
changeset
|
795 (lambda (x) (substring x 0 3))) |
13053 | 796 ))))) |
797 (mark-calendar-date-pattern mm dd yy)))) | |
798 (setq d (cdr d)))) | |
799 (mark-sexp-diary-entries) | |
800 (run-hooks 'nongregorian-diary-marking-hook | |
801 'mark-diary-entries-hook) | |
802 (set-syntax-table old-diary-syntax-table) | |
803 (message "Marking diary entries...done"))) | |
804 (error "Your diary file is not readable!")) | |
805 (error "You don't have a diary file!")))) | |
806 | |
807 (defun mark-sexp-diary-entries () | |
808 "Mark days in the calendar window that have sexp diary entries. | |
809 Each entry in the diary file (or included files) visible in the calendar window | |
810 is marked. See the documentation for the function `list-sexp-diary-entries'." | |
811 (let* ((sexp-mark (regexp-quote sexp-diary-entry-symbol)) | |
812 (s-entry (concat "\\(\\`\\|\^M\\|\n\\)\\(" | |
813 (regexp-quote sexp-mark) "(\\)\\|\\(" | |
814 (regexp-quote diary-nonmarking-symbol) | |
815 (regexp-quote sexp-mark) "(diary-remind\\)")) | |
816 (m) | |
817 (y) | |
818 (first-date) | |
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
819 (last-date) |
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
820 (mark)) |
13053 | 821 (save-excursion |
822 (set-buffer calendar-buffer) | |
823 (setq m displayed-month) | |
824 (setq y displayed-year)) | |
825 (increment-calendar-month m y -1) | |
826 (setq first-date | |
827 (calendar-absolute-from-gregorian (list m 1 y))) | |
828 (increment-calendar-month m y 2) | |
829 (setq last-date | |
830 (calendar-absolute-from-gregorian | |
831 (list m (calendar-last-day-of-month m y) y))) | |
832 (goto-char (point-min)) | |
833 (while (re-search-forward s-entry nil t) | |
13075
8a67628f4574
(mark-sexp-diary-entries): Add \ for C-M-f's sake.
Richard M. Stallman <rms@gnu.org>
parents:
13053
diff
changeset
|
834 (if (char-equal (preceding-char) ?\() |
13053 | 835 (setq marking-diary-entry t) |
836 (setq marking-diary-entry nil)) | |
837 (re-search-backward "(") | |
838 (let ((sexp-start (point)) | |
839 (sexp) | |
840 (entry) | |
841 (entry-start) | |
842 (line-start)) | |
843 (forward-sexp) | |
13687
9a985bcde00e
Chnaged all occurrences of buffer-substring to buffer-substring-no-properties.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
13670
diff
changeset
|
844 (setq sexp (buffer-substring-no-properties sexp-start (point))) |
13053 | 845 (save-excursion |
846 (re-search-backward "\^M\\|\n\\|\\`") | |
847 (setq line-start (point))) | |
848 (forward-char 1) | |
849 (if (and (or (char-equal (preceding-char) ?\^M) | |
850 (char-equal (preceding-char) ?\n)) | |
851 (not (looking-at " \\|\^I"))) | |
852 (progn;; Diary entry consists only of the sexp | |
853 (backward-char 1) | |
854 (setq entry "")) | |
855 (setq entry-start (point)) | |
23247
1f91824c4087
(mark-sexp-diary-entries): Fix previous chg.
Karl Heuer <kwzh@gnu.org>
parents:
23232
diff
changeset
|
856 ;; Find end of entry |
13053 | 857 (re-search-forward "\^M\\|\n" nil t) |
858 (while (looking-at " \\|\^I") | |
23232
97332957a969
(mark-sexp-diary-entries): Avoid infinite loop when
Karl Heuer <kwzh@gnu.org>
parents:
23122
diff
changeset
|
859 (or (re-search-forward "\^M\\|\n" nil t) |
97332957a969
(mark-sexp-diary-entries): Avoid infinite loop when
Karl Heuer <kwzh@gnu.org>
parents:
23122
diff
changeset
|
860 (re-search-forward "$" nil t))) |
23247
1f91824c4087
(mark-sexp-diary-entries): Fix previous chg.
Karl Heuer <kwzh@gnu.org>
parents:
23232
diff
changeset
|
861 (if (or (char-equal (preceding-char) ?\^M) |
1f91824c4087
(mark-sexp-diary-entries): Fix previous chg.
Karl Heuer <kwzh@gnu.org>
parents:
23232
diff
changeset
|
862 (char-equal (preceding-char) ?\n)) |
1f91824c4087
(mark-sexp-diary-entries): Fix previous chg.
Karl Heuer <kwzh@gnu.org>
parents:
23232
diff
changeset
|
863 (backward-char 1)) |
13687
9a985bcde00e
Chnaged all occurrences of buffer-substring to buffer-substring-no-properties.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
13670
diff
changeset
|
864 (setq entry (buffer-substring-no-properties entry-start (point))) |
13053 | 865 (while (string-match "[\^M]" entry) |
866 (aset entry (match-beginning 0) ?\n ))) | |
867 (calendar-for-loop date from first-date to last-date do | |
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
868 (if (setq mark (diary-sexp-entry sexp entry |
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
869 (calendar-gregorian-from-absolute date))) |
13053 | 870 (mark-visible-calendar-date |
46826
e020f18c490a
(diary-mail-entries): Use `compose-mail'
Sam Steingold <sds@gnu.org>
parents:
46620
diff
changeset
|
871 (calendar-gregorian-from-absolute date) |
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
872 (if (consp mark) |
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
873 (car mark))))))))) |
13053 | 874 |
875 (defun mark-included-diary-files () | |
876 "Mark the diary entries from other diary files with those of the diary file. | |
877 This function is suitable for use as the `mark-diary-entries-hook'; it enables | |
878 you to use shared diary files together with your own. The files included are | |
879 specified in the diary-file by lines of this form: | |
880 #include \"filename\" | |
881 This is recursive; that is, #include directives in diary files thus included | |
882 are obeyed. You can change the `#include' to some other string by | |
883 changing the variable `diary-include-string'." | |
884 (goto-char (point-min)) | |
885 (while (re-search-forward | |
886 (concat | |
887 "\\(\\`\\|\^M\\|\n\\)" | |
888 (regexp-quote diary-include-string) | |
889 " \"\\([^\"]*\\)\"") | |
890 nil t) | |
891 (let ((diary-file (substitute-in-file-name | |
13687
9a985bcde00e
Chnaged all occurrences of buffer-substring to buffer-substring-no-properties.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
13670
diff
changeset
|
892 (buffer-substring-no-properties |
9a985bcde00e
Chnaged all occurrences of buffer-substring to buffer-substring-no-properties.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
13670
diff
changeset
|
893 (match-beginning 2) (match-end 2)))) |
13053 | 894 (mark-diary-entries-hook 'mark-included-diary-files)) |
895 (if (file-exists-p diary-file) | |
896 (if (file-readable-p diary-file) | |
897 (progn | |
898 (mark-diary-entries) | |
13877
44149f0bf44a
Replaced all uses of get-file-buffer with find-buffer-visiting.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
13688
diff
changeset
|
899 (kill-buffer (find-buffer-visiting diary-file))) |
13053 | 900 (beep) |
901 (message "Can't read included diary file %s" diary-file) | |
902 (sleep-for 2)) | |
903 (beep) | |
904 (message "Can't find included diary file %s" diary-file) | |
905 (sleep-for 2)))) | |
906 (goto-char (point-min))) | |
907 | |
908 (defun mark-calendar-days-named (dayname) | |
909 "Mark all dates in the calendar window that are day DAYNAME of the week. | |
910 0 means all Sundays, 1 means all Mondays, and so on." | |
911 (save-excursion | |
912 (set-buffer calendar-buffer) | |
913 (let ((prev-month displayed-month) | |
914 (prev-year displayed-year) | |
915 (succ-month displayed-month) | |
916 (succ-year displayed-year) | |
917 (last-day) | |
918 (day)) | |
919 (increment-calendar-month succ-month succ-year 1) | |
920 (increment-calendar-month prev-month prev-year -1) | |
921 (setq day (calendar-absolute-from-gregorian | |
922 (calendar-nth-named-day 1 dayname prev-month prev-year))) | |
923 (setq last-day (calendar-absolute-from-gregorian | |
924 (calendar-nth-named-day -1 dayname succ-month succ-year))) | |
925 (while (<= day last-day) | |
926 (mark-visible-calendar-date (calendar-gregorian-from-absolute day)) | |
927 (setq day (+ day 7)))))) | |
928 | |
929 (defun mark-calendar-date-pattern (month day year) | |
930 "Mark all dates in the calendar window that conform to MONTH/DAY/YEAR. | |
931 A value of 0 in any position is a wildcard." | |
932 (save-excursion | |
933 (set-buffer calendar-buffer) | |
934 (let ((m displayed-month) | |
935 (y displayed-year)) | |
936 (increment-calendar-month m y -1) | |
937 (calendar-for-loop i from 0 to 2 do | |
938 (mark-calendar-month m y month day year) | |
939 (increment-calendar-month m y 1))))) | |
940 | |
941 (defun mark-calendar-month (month year p-month p-day p-year) | |
942 "Mark dates in the MONTH/YEAR that conform to pattern P-MONTH/P_DAY/P-YEAR. | |
943 A value of 0 in any position of the pattern is a wildcard." | |
944 (if (or (and (= month p-month) | |
945 (or (= p-year 0) (= year p-year))) | |
946 (and (= p-month 0) | |
947 (or (= p-year 0) (= year p-year)))) | |
948 (if (= p-day 0) | |
949 (calendar-for-loop | |
950 i from 1 to (calendar-last-day-of-month month year) do | |
951 (mark-visible-calendar-date (list month i year))) | |
952 (mark-visible-calendar-date (list month p-day year))))) | |
953 | |
954 (defun sort-diary-entries () | |
955 "Sort the list of diary entries by time of day." | |
956 (setq diary-entries-list (sort diary-entries-list 'diary-entry-compare))) | |
957 | |
958 (defun diary-entry-compare (e1 e2) | |
959 "Returns t if E1 is earlier than E2." | |
960 (or (calendar-date-compare e1 e2) | |
961 (and (calendar-date-equal (car e1) (car e2)) | |
39615
4287ce76bf9f
(diary-entry-compare): When times are identical, compare the entries
Sam Steingold <sds@gnu.org>
parents:
38422
diff
changeset
|
962 (let* ((ts1 (cadr e1)) (t1 (diary-entry-time ts1)) |
4287ce76bf9f
(diary-entry-compare): When times are identical, compare the entries
Sam Steingold <sds@gnu.org>
parents:
38422
diff
changeset
|
963 (ts2 (cadr e2)) (t2 (diary-entry-time ts2))) |
4287ce76bf9f
(diary-entry-compare): When times are identical, compare the entries
Sam Steingold <sds@gnu.org>
parents:
38422
diff
changeset
|
964 (or (< t1 t2) |
4287ce76bf9f
(diary-entry-compare): When times are identical, compare the entries
Sam Steingold <sds@gnu.org>
parents:
38422
diff
changeset
|
965 (and (= t1 t2) |
4287ce76bf9f
(diary-entry-compare): When times are identical, compare the entries
Sam Steingold <sds@gnu.org>
parents:
38422
diff
changeset
|
966 (string-lessp ts1 ts2))))))) |
13053 | 967 |
20269
ca337d0a1553
(list-diary-entries, list-sexp-diary-entries, add-to-diary-list):
Karl Heuer <kwzh@gnu.org>
parents:
19324
diff
changeset
|
968 (defcustom diary-unknown-time |
ca337d0a1553
(list-diary-entries, list-sexp-diary-entries, add-to-diary-list):
Karl Heuer <kwzh@gnu.org>
parents:
19324
diff
changeset
|
969 -9999 |
ca337d0a1553
(list-diary-entries, list-sexp-diary-entries, add-to-diary-list):
Karl Heuer <kwzh@gnu.org>
parents:
19324
diff
changeset
|
970 "*Value returned by diary-entry-time when no time is found. |
ca337d0a1553
(list-diary-entries, list-sexp-diary-entries, add-to-diary-list):
Karl Heuer <kwzh@gnu.org>
parents:
19324
diff
changeset
|
971 The default value -9999 causes entries with no recognizable time to be placed |
ca337d0a1553
(list-diary-entries, list-sexp-diary-entries, add-to-diary-list):
Karl Heuer <kwzh@gnu.org>
parents:
19324
diff
changeset
|
972 before those with times; 9999 would place entries with no recognizable time |
ca337d0a1553
(list-diary-entries, list-sexp-diary-entries, add-to-diary-list):
Karl Heuer <kwzh@gnu.org>
parents:
19324
diff
changeset
|
973 after those with times." |
ca337d0a1553
(list-diary-entries, list-sexp-diary-entries, add-to-diary-list):
Karl Heuer <kwzh@gnu.org>
parents:
19324
diff
changeset
|
974 :type 'integer |
21669
9861518505cb
*** empty log message ***
Dan Nicolaescu <done@ece.arizona.edu>
parents:
21668
diff
changeset
|
975 :group 'diary |
9861518505cb
*** empty log message ***
Dan Nicolaescu <done@ece.arizona.edu>
parents:
21668
diff
changeset
|
976 :version "20.3") |
39615
4287ce76bf9f
(diary-entry-compare): When times are identical, compare the entries
Sam Steingold <sds@gnu.org>
parents:
38422
diff
changeset
|
977 |
13053 | 978 (defun diary-entry-time (s) |
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
979 "Return time at the beginning of the string S as a military-style integer. |
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
980 For example, returns 1325 for 1:25pm. |
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
981 Returns `diary-unknown-time' (default value -9999) if no time is recognized. The recognized forms are XXXX, X:XX, or |
20269
ca337d0a1553
(list-diary-entries, list-sexp-diary-entries, add-to-diary-list):
Karl Heuer <kwzh@gnu.org>
parents:
19324
diff
changeset
|
982 XX:XX (military time), and XXam, XXAM, XXpm, XXPM, XX:XXam, XX:XXAM XX:XXpm, |
ca337d0a1553
(list-diary-entries, list-sexp-diary-entries, add-to-diary-list):
Karl Heuer <kwzh@gnu.org>
parents:
19324
diff
changeset
|
983 or XX:XXPM." |
19324
02a8fe146fa6
(diary-entry-time): Bind case-fold-search to nil.
Richard M. Stallman <rms@gnu.org>
parents:
18922
diff
changeset
|
984 (let ((case-fold-search nil)) |
39615
4287ce76bf9f
(diary-entry-compare): When times are identical, compare the entries
Sam Steingold <sds@gnu.org>
parents:
38422
diff
changeset
|
985 (cond ((string-match ; Military time |
34036
c2a8edb5b5ec
(diary-entry-time): Anchor pattern correctly
Gerd Moellmann <gerd@gnu.org>
parents:
32415
diff
changeset
|
986 "\\`[ \t\n\\^M]*\\([0-9]?[0-9]\\):?\\([0-9][0-9]\\)\\(\\>\\|[^ap]\\)" s) |
19324
02a8fe146fa6
(diary-entry-time): Bind case-fold-search to nil.
Richard M. Stallman <rms@gnu.org>
parents:
18922
diff
changeset
|
987 (+ (* 100 (string-to-int |
02a8fe146fa6
(diary-entry-time): Bind case-fold-search to nil.
Richard M. Stallman <rms@gnu.org>
parents:
18922
diff
changeset
|
988 (substring s (match-beginning 1) (match-end 1)))) |
02a8fe146fa6
(diary-entry-time): Bind case-fold-search to nil.
Richard M. Stallman <rms@gnu.org>
parents:
18922
diff
changeset
|
989 (string-to-int (substring s (match-beginning 2) (match-end 2))))) |
39615
4287ce76bf9f
(diary-entry-compare): When times are identical, compare the entries
Sam Steingold <sds@gnu.org>
parents:
38422
diff
changeset
|
990 ((string-match ; Hour only XXam or XXpm |
34036
c2a8edb5b5ec
(diary-entry-time): Anchor pattern correctly
Gerd Moellmann <gerd@gnu.org>
parents:
32415
diff
changeset
|
991 "\\`[ \t\n\\^M]*\\([0-9]?[0-9]\\)\\([ap]\\)m\\>" s) |
19324
02a8fe146fa6
(diary-entry-time): Bind case-fold-search to nil.
Richard M. Stallman <rms@gnu.org>
parents:
18922
diff
changeset
|
992 (+ (* 100 (% (string-to-int |
02a8fe146fa6
(diary-entry-time): Bind case-fold-search to nil.
Richard M. Stallman <rms@gnu.org>
parents:
18922
diff
changeset
|
993 (substring s (match-beginning 1) (match-end 1))) |
02a8fe146fa6
(diary-entry-time): Bind case-fold-search to nil.
Richard M. Stallman <rms@gnu.org>
parents:
18922
diff
changeset
|
994 12)) |
02a8fe146fa6
(diary-entry-time): Bind case-fold-search to nil.
Richard M. Stallman <rms@gnu.org>
parents:
18922
diff
changeset
|
995 (if (equal ?a (downcase (aref s (match-beginning 2)))) |
02a8fe146fa6
(diary-entry-time): Bind case-fold-search to nil.
Richard M. Stallman <rms@gnu.org>
parents:
18922
diff
changeset
|
996 0 1200))) |
39615
4287ce76bf9f
(diary-entry-compare): When times are identical, compare the entries
Sam Steingold <sds@gnu.org>
parents:
38422
diff
changeset
|
997 ((string-match ; Hour and minute XX:XXam or XX:XXpm |
34036
c2a8edb5b5ec
(diary-entry-time): Anchor pattern correctly
Gerd Moellmann <gerd@gnu.org>
parents:
32415
diff
changeset
|
998 "\\`[ \t\n\\^M]*\\([0-9]?[0-9]\\):\\([0-9][0-9]\\)\\([ap]\\)m\\>" s) |
19324
02a8fe146fa6
(diary-entry-time): Bind case-fold-search to nil.
Richard M. Stallman <rms@gnu.org>
parents:
18922
diff
changeset
|
999 (+ (* 100 (% (string-to-int |
02a8fe146fa6
(diary-entry-time): Bind case-fold-search to nil.
Richard M. Stallman <rms@gnu.org>
parents:
18922
diff
changeset
|
1000 (substring s (match-beginning 1) (match-end 1))) |
02a8fe146fa6
(diary-entry-time): Bind case-fold-search to nil.
Richard M. Stallman <rms@gnu.org>
parents:
18922
diff
changeset
|
1001 12)) |
02a8fe146fa6
(diary-entry-time): Bind case-fold-search to nil.
Richard M. Stallman <rms@gnu.org>
parents:
18922
diff
changeset
|
1002 (string-to-int (substring s (match-beginning 2) (match-end 2))) |
02a8fe146fa6
(diary-entry-time): Bind case-fold-search to nil.
Richard M. Stallman <rms@gnu.org>
parents:
18922
diff
changeset
|
1003 (if (equal ?a (downcase (aref s (match-beginning 3)))) |
02a8fe146fa6
(diary-entry-time): Bind case-fold-search to nil.
Richard M. Stallman <rms@gnu.org>
parents:
18922
diff
changeset
|
1004 0 1200))) |
39615
4287ce76bf9f
(diary-entry-compare): When times are identical, compare the entries
Sam Steingold <sds@gnu.org>
parents:
38422
diff
changeset
|
1005 (t diary-unknown-time)))) ; Unrecognizable |
34036
c2a8edb5b5ec
(diary-entry-time): Anchor pattern correctly
Gerd Moellmann <gerd@gnu.org>
parents:
32415
diff
changeset
|
1006 |
13053 | 1007 (defun list-sexp-diary-entries (date) |
1008 "Add sexp entries for DATE from the diary file to `diary-entries-list'. | |
1009 Also, Make them visible in the diary file. Returns t if any entries were | |
1010 found. | |
1011 | |
1012 Sexp diary entries must be prefaced by a `sexp-diary-entry-symbol' (normally | |
1013 `%%'). The form of a sexp diary entry is | |
1014 | |
1015 %%(SEXP) ENTRY | |
1016 | |
1017 Both ENTRY and DATE are globally available when the SEXP is evaluated. If the | |
1018 SEXP yields the value nil, the diary entry does not apply. If it yields a | |
1019 non-nil value, ENTRY will be taken to apply to DATE; if the non-nil value is a | |
1020 string, that string will be the diary entry in the fancy diary display. | |
1021 | |
1022 For example, the following diary entry will apply to the 21st of the month | |
1023 if it is a weekday and the Friday before if the 21st is on a weekend: | |
1024 | |
1025 &%%(let ((dayname (calendar-day-of-week date)) | |
1026 (day (extract-calendar-day date))) | |
1027 (or | |
1028 (and (= day 21) (memq dayname '(1 2 3 4 5))) | |
1029 (and (memq day '(19 20)) (= dayname 5))) | |
1030 ) UIUC pay checks deposited | |
1031 | |
1032 A number of built-in functions are available for this type of diary entry: | |
1033 | |
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
1034 %%(diary-date MONTH DAY YEAR &optional MARK) text |
13053 | 1035 Entry applies if date is MONTH, DAY, YEAR if |
1036 `european-calendar-style' is nil, and DAY, MONTH, YEAR if | |
1037 `european-calendar-style' is t. DAY, MONTH, and YEAR | |
1038 can be lists of integers, the constant t, or an integer. | |
46826
e020f18c490a
(diary-mail-entries): Use `compose-mail'
Sam Steingold <sds@gnu.org>
parents:
46620
diff
changeset
|
1039 The constant t means all values. An optional parameter |
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
1040 MARK specifies a face or single-character string to use |
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
1041 when highlighting the day in the calendar. |
13053 | 1042 |
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
1043 %%(diary-float MONTH DAYNAME N &optional DAY MARK) text |
13053 | 1044 Entry will appear on the Nth DAYNAME of MONTH. |
1045 (DAYNAME=0 means Sunday, 1 means Monday, and so on; | |
1046 if N is negative it counts backward from the end of | |
1047 the month. MONTH can be a list of months, a single | |
17892
b3514551f08d
(diary-float): Rewritten to fix bug when base date
Richard M. Stallman <rms@gnu.org>
parents:
17626
diff
changeset
|
1048 month, or t to specify all months. Optional DAY means |
b3514551f08d
(diary-float): Rewritten to fix bug when base date
Richard M. Stallman <rms@gnu.org>
parents:
17626
diff
changeset
|
1049 Nth DAYNAME of MONTH on or after/before DAY. DAY defaults |
46826
e020f18c490a
(diary-mail-entries): Use `compose-mail'
Sam Steingold <sds@gnu.org>
parents:
46620
diff
changeset
|
1050 to 1 if N>0 and the last day of the month if N<0. An |
e020f18c490a
(diary-mail-entries): Use `compose-mail'
Sam Steingold <sds@gnu.org>
parents:
46620
diff
changeset
|
1051 optional parameter MARK specifies a face or single-character |
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
1052 string to use when highlighting the day in the calendar. |
13053 | 1053 |
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
1054 %%(diary-block M1 D1 Y1 M2 D2 Y2 &optional MARK) text |
13053 | 1055 Entry will appear on dates between M1/D1/Y1 and M2/D2/Y2, |
1056 inclusive. (If `european-calendar-style' is t, the | |
1057 order of the parameters should be changed to D1, M1, Y1, | |
46826
e020f18c490a
(diary-mail-entries): Use `compose-mail'
Sam Steingold <sds@gnu.org>
parents:
46620
diff
changeset
|
1058 D2, M2, Y2.) An optional parameter MARK specifies a face |
e020f18c490a
(diary-mail-entries): Use `compose-mail'
Sam Steingold <sds@gnu.org>
parents:
46620
diff
changeset
|
1059 or single-character string to use when highlighting the |
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
1060 day in the calendar. |
13053 | 1061 |
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
1062 %%(diary-anniversary MONTH DAY YEAR &optional MARK) text |
13053 | 1063 Entry will appear on anniversary dates of MONTH DAY, YEAR. |
1064 (If `european-calendar-style' is t, the order of the | |
1065 parameters should be changed to DAY, MONTH, YEAR.) Text | |
1066 can contain %d or %d%s; %d will be replaced by the number | |
1067 of years since the MONTH DAY, YEAR and %s will be replaced | |
1068 by the ordinal ending of that number (that is, `st', `nd', | |
1069 `rd' or `th', as appropriate. The anniversary of February | |
46826
e020f18c490a
(diary-mail-entries): Use `compose-mail'
Sam Steingold <sds@gnu.org>
parents:
46620
diff
changeset
|
1070 29 is considered to be March 1 in a non-leap year. An |
e020f18c490a
(diary-mail-entries): Use `compose-mail'
Sam Steingold <sds@gnu.org>
parents:
46620
diff
changeset
|
1071 optional parameter MARK specifies a face or single-character |
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
1072 string to use when highlighting the day in the calendar. |
13053 | 1073 |
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
1074 %%(diary-cyclic N MONTH DAY YEAR &optional MARK) text |
13053 | 1075 Entry will appear every N days, starting MONTH DAY, YEAR. |
1076 (If `european-calendar-style' is t, the order of the | |
1077 parameters should be changed to N, DAY, MONTH, YEAR.) Text | |
1078 can contain %d or %d%s; %d will be replaced by the number | |
1079 of repetitions since the MONTH DAY, YEAR and %s will | |
1080 be replaced by the ordinal ending of that number (that is, | |
46826
e020f18c490a
(diary-mail-entries): Use `compose-mail'
Sam Steingold <sds@gnu.org>
parents:
46620
diff
changeset
|
1081 `st', `nd', `rd' or `th', as appropriate. An optional |
e020f18c490a
(diary-mail-entries): Use `compose-mail'
Sam Steingold <sds@gnu.org>
parents:
46620
diff
changeset
|
1082 parameter MARK specifies a face or single-character string |
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
1083 to use when highlighting the day in the calendar. |
13053 | 1084 |
1085 %%(diary-remind SEXP DAYS &optional MARKING) text | |
1086 Entry is a reminder for diary sexp SEXP. DAYS is either a | |
1087 single number or a list of numbers indicating the number(s) | |
1088 of days before the event that the warning(s) should occur. | |
1089 If the current date is (one of) DAYS before the event | |
1090 indicated by EXPR, then a suitable message (as specified | |
1091 by `diary-remind-message') appears. In addition to the | |
1092 reminders beforehand, the diary entry also appears on | |
1093 the date itself. If optional MARKING is non-nil then the | |
1094 *reminders* are marked on the calendar. Marking of | |
1095 reminders is independent of whether the entry *itself* is | |
1096 a marking or nonmarking one. | |
1097 | |
1098 %%(diary-day-of-year) | |
1099 Diary entries giving the day of the year and the number of | |
1100 days remaining in the year will be made every day. Note | |
1101 that since there is no text, it makes sense only if the | |
1102 fancy diary display is used. | |
1103 | |
1104 %%(diary-iso-date) | |
1105 Diary entries giving the corresponding ISO commercial date | |
1106 will be made every day. Note that since there is no text, | |
1107 it makes sense only if the fancy diary display is used. | |
1108 | |
1109 %%(diary-french-date) | |
1110 Diary entries giving the corresponding French Revolutionary | |
1111 date will be made every day. Note that since there is no | |
1112 text, it makes sense only if the fancy diary display is used. | |
1113 | |
1114 %%(diary-islamic-date) | |
1115 Diary entries giving the corresponding Islamic date will be | |
1116 made every day. Note that since there is no text, it | |
1117 makes sense only if the fancy diary display is used. | |
1118 | |
1119 %%(diary-hebrew-date) | |
1120 Diary entries giving the corresponding Hebrew date will be | |
1121 made every day. Note that since there is no text, it | |
1122 makes sense only if the fancy diary display is used. | |
1123 | |
1124 %%(diary-astro-day-number) Diary entries giving the corresponding | |
1125 astronomical (Julian) day number will be made every day. | |
1126 Note that since there is no text, it makes sense only if the | |
1127 fancy diary display is used. | |
1128 | |
1129 %%(diary-julian-date) Diary entries giving the corresponding | |
1130 Julian date will be made every day. Note that since | |
1131 there is no text, it makes sense only if the fancy diary | |
1132 display is used. | |
1133 | |
1134 %%(diary-sunrise-sunset) | |
1135 Diary entries giving the local times of sunrise and sunset | |
1136 will be made every day. Note that since there is no text, | |
1137 it makes sense only if the fancy diary display is used. | |
1138 Floating point required. | |
1139 | |
1140 %%(diary-phases-of-moon) | |
1141 Diary entries giving the times of the phases of the moon | |
1142 will be when appropriate. Note that since there is no text, | |
1143 it makes sense only if the fancy diary display is used. | |
1144 Floating point required. | |
1145 | |
1146 %%(diary-yahrzeit MONTH DAY YEAR) text | |
1147 Text is assumed to be the name of the person; the date is | |
1148 the date of death on the *civil* calendar. The diary entry | |
1149 will appear on the proper Hebrew-date anniversary and on the | |
1150 day before. (If `european-calendar-style' is t, the order | |
1151 of the parameters should be changed to DAY, MONTH, YEAR.) | |
39615
4287ce76bf9f
(diary-entry-compare): When times are identical, compare the entries
Sam Steingold <sds@gnu.org>
parents:
38422
diff
changeset
|
1152 |
13053 | 1153 %%(diary-rosh-hodesh) |
1154 Diary entries will be made on the dates of Rosh Hodesh on | |
1155 the Hebrew calendar. Note that since there is no text, it | |
1156 makes sense only if the fancy diary display is used. | |
1157 | |
1158 %%(diary-parasha) | |
1159 Diary entries giving the weekly parasha will be made on | |
1160 every Saturday. Note that since there is no text, it | |
1161 makes sense only if the fancy diary display is used. | |
1162 | |
1163 %%(diary-omer) | |
1164 Diary entries giving the omer count will be made every day | |
13670
15c441f6d41a
(list-sexp-diary-entries): Doc fix.
Paul Eggert <eggert@twinsun.com>
parents:
13650
diff
changeset
|
1165 from Passover to Shavuot. Note that since there is no text, |
13053 | 1166 it makes sense only if the fancy diary display is used. |
1167 | |
1168 Marking these entries is *extremely* time consuming, so these entries are | |
1169 best if they are nonmarking." | |
1170 (let* ((mark (regexp-quote diary-nonmarking-symbol)) | |
1171 (sexp-mark (regexp-quote sexp-diary-entry-symbol)) | |
1172 (s-entry (concat "\\(\\`\\|\^M\\|\n\\)" mark "?" sexp-mark "(")) | |
1173 (entry-found)) | |
1174 (goto-char (point-min)) | |
1175 (while (re-search-forward s-entry nil t) | |
1176 (backward-char 1) | |
1177 (let ((sexp-start (point)) | |
1178 (sexp) | |
1179 (entry) | |
20269
ca337d0a1553
(list-diary-entries, list-sexp-diary-entries, add-to-diary-list):
Karl Heuer <kwzh@gnu.org>
parents:
19324
diff
changeset
|
1180 (specifier) |
13053 | 1181 (entry-start) |
1182 (line-start)) | |
1183 (forward-sexp) | |
13687
9a985bcde00e
Chnaged all occurrences of buffer-substring to buffer-substring-no-properties.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
13670
diff
changeset
|
1184 (setq sexp (buffer-substring-no-properties sexp-start (point))) |
13053 | 1185 (save-excursion |
1186 (re-search-backward "\^M\\|\n\\|\\`") | |
1187 (setq line-start (point))) | |
20269
ca337d0a1553
(list-diary-entries, list-sexp-diary-entries, add-to-diary-list):
Karl Heuer <kwzh@gnu.org>
parents:
19324
diff
changeset
|
1188 (setq specifier |
48365
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1189 (buffer-substring-no-properties (1+ line-start) (point)) |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1190 entry-start (1+ line-start)) |
13053 | 1191 (forward-char 1) |
1192 (if (and (or (char-equal (preceding-char) ?\^M) | |
1193 (char-equal (preceding-char) ?\n)) | |
1194 (not (looking-at " \\|\^I"))) | |
1195 (progn;; Diary entry consists only of the sexp | |
1196 (backward-char 1) | |
1197 (setq entry "")) | |
1198 (setq entry-start (point)) | |
1199 (re-search-forward "\^M\\|\n" nil t) | |
1200 (while (looking-at " \\|\^I") | |
1201 (re-search-forward "\^M\\|\n" nil t)) | |
1202 (backward-char 1) | |
13687
9a985bcde00e
Chnaged all occurrences of buffer-substring to buffer-substring-no-properties.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
13670
diff
changeset
|
1203 (setq entry (buffer-substring-no-properties entry-start (point))) |
13053 | 1204 (while (string-match "[\^M]" entry) |
1205 (aset entry (match-beginning 0) ?\n ))) | |
1206 (let ((diary-entry (diary-sexp-entry sexp entry date))) | |
1207 (if diary-entry | |
1208 (subst-char-in-region line-start (point) ?\^M ?\n t)) | |
46826
e020f18c490a
(diary-mail-entries): Use `compose-mail'
Sam Steingold <sds@gnu.org>
parents:
46620
diff
changeset
|
1209 (add-to-diary-list date |
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
1210 (if (consp diary-entry) |
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
1211 (cdr diary-entry) |
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
1212 diary-entry) |
48365
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1213 specifier |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1214 (if entry-start (copy-marker entry-start) |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1215 nil)) |
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
1216 (setq entry-found (or entry-found diary-entry))))) |
13053 | 1217 entry-found)) |
1218 | |
1219 (defun diary-sexp-entry (sexp entry date) | |
1220 "Process a SEXP diary ENTRY for DATE." | |
1221 (let ((result (if calendar-debug-sexp | |
1222 (let ((stack-trace-on-error t)) | |
1223 (eval (car (read-from-string sexp)))) | |
1224 (condition-case nil | |
1225 (eval (car (read-from-string sexp))) | |
1226 (error | |
1227 (beep) | |
1228 (message "Bad sexp at line %d in %s: %s" | |
1229 (save-excursion | |
1230 (save-restriction | |
1231 (narrow-to-region 1 (point)) | |
1232 (goto-char (point-min)) | |
1233 (let ((lines 1)) | |
1234 (while (re-search-forward "\n\\|\^M" nil t) | |
1235 (setq lines (1+ lines))) | |
1236 lines))) | |
1237 diary-file sexp) | |
1238 (sleep-for 2)))))) | |
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
1239 (cond ((stringp result) result) |
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
1240 ((and (consp result) |
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
1241 (stringp (cdr result))) result) |
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
1242 (result entry) |
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
1243 (t nil)))) |
13053 | 1244 |
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
1245 (defun diary-date (month day year &optional mark) |
13053 | 1246 "Specific date(s) diary entry. |
1247 Entry applies if date is MONTH, DAY, YEAR if `european-calendar-style' is nil, | |
1248 and DAY, MONTH, YEAR if `european-calendar-style' is t. DAY, MONTH, and YEAR | |
1249 can be lists of integers, the constant t, or an integer. The constant t means | |
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
1250 all values. |
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
1251 |
46826
e020f18c490a
(diary-mail-entries): Use `compose-mail'
Sam Steingold <sds@gnu.org>
parents:
46620
diff
changeset
|
1252 An optional parameter MARK specifies a face or single-character string to |
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
1253 use when highlighting the day in the calendar." |
13053 | 1254 (let* ((dd (if european-calendar-style |
1255 month | |
1256 day)) | |
1257 (mm (if european-calendar-style | |
1258 day | |
1259 month)) | |
1260 (m (extract-calendar-month date)) | |
1261 (y (extract-calendar-year date)) | |
1262 (d (extract-calendar-day date))) | |
1263 (if (and | |
1264 (or (and (listp dd) (memq d dd)) | |
1265 (equal d dd) | |
1266 (eq dd t)) | |
1267 (or (and (listp mm) (memq m mm)) | |
1268 (equal m mm) | |
1269 (eq mm t)) | |
1270 (or (and (listp year) (memq y year)) | |
1271 (equal y year) | |
1272 (eq year t))) | |
48365
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1273 (cons mark entry)))) |
13053 | 1274 |
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
1275 (defun diary-block (m1 d1 y1 m2 d2 y2 &optional mark) |
13053 | 1276 "Block diary entry. |
42513
22938e0c54b2
(diary-block): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
41566
diff
changeset
|
1277 Entry applies if date is between, or on one of, two dates. |
22938e0c54b2
(diary-block): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
41566
diff
changeset
|
1278 The order of the parameters is |
23122 | 1279 M1, D1, Y1, M2, D2, Y2 if `european-calendar-style' is nil, and |
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
1280 D1, M1, Y1, D2, M2, Y2 if `european-calendar-style' is t. |
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
1281 |
46826
e020f18c490a
(diary-mail-entries): Use `compose-mail'
Sam Steingold <sds@gnu.org>
parents:
46620
diff
changeset
|
1282 An optional parameter MARK specifies a face or single-character string to |
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
1283 use when highlighting the day in the calendar." |
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
1284 |
13053 | 1285 (let ((date1 (calendar-absolute-from-gregorian |
1286 (if european-calendar-style | |
1287 (list d1 m1 y1) | |
1288 (list m1 d1 y1)))) | |
1289 (date2 (calendar-absolute-from-gregorian | |
1290 (if european-calendar-style | |
1291 (list d2 m2 y2) | |
1292 (list m2 d2 y2)))) | |
1293 (d (calendar-absolute-from-gregorian date))) | |
1294 (if (and (<= date1 d) (<= d date2)) | |
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
1295 (cons mark entry)))) |
13053 | 1296 |
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
1297 (defun diary-float (month dayname n &optional day mark) |
13053 | 1298 "Floating diary entry--entry applies if date is the nth dayname of month. |
1299 Parameters are MONTH, DAYNAME, N. MONTH can be a list of months, the constant | |
1300 t, or an integer. The constant t means all months. If N is negative, count | |
17892
b3514551f08d
(diary-float): Rewritten to fix bug when base date
Richard M. Stallman <rms@gnu.org>
parents:
17626
diff
changeset
|
1301 backward from the end of the month. |
b3514551f08d
(diary-float): Rewritten to fix bug when base date
Richard M. Stallman <rms@gnu.org>
parents:
17626
diff
changeset
|
1302 |
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
1303 An optional parameter DAY means the Nth DAYNAME on or after/before MONTH DAY. |
46826
e020f18c490a
(diary-mail-entries): Use `compose-mail'
Sam Steingold <sds@gnu.org>
parents:
46620
diff
changeset
|
1304 Optional MARK specifies a face or single-character string to use when |
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
1305 highlighting the day in the calendar." |
17892
b3514551f08d
(diary-float): Rewritten to fix bug when base date
Richard M. Stallman <rms@gnu.org>
parents:
17626
diff
changeset
|
1306 ;; This is messy because the diary entry may apply, but the date on which it |
b3514551f08d
(diary-float): Rewritten to fix bug when base date
Richard M. Stallman <rms@gnu.org>
parents:
17626
diff
changeset
|
1307 ;; is based can be in a different month/year. For example, asking for the |
b3514551f08d
(diary-float): Rewritten to fix bug when base date
Richard M. Stallman <rms@gnu.org>
parents:
17626
diff
changeset
|
1308 ;; first Monday after December 30. For large values of |n| the problem is |
b3514551f08d
(diary-float): Rewritten to fix bug when base date
Richard M. Stallman <rms@gnu.org>
parents:
17626
diff
changeset
|
1309 ;; more grotesque. |
b3514551f08d
(diary-float): Rewritten to fix bug when base date
Richard M. Stallman <rms@gnu.org>
parents:
17626
diff
changeset
|
1310 (and (= dayname (calendar-day-of-week date)) |
b3514551f08d
(diary-float): Rewritten to fix bug when base date
Richard M. Stallman <rms@gnu.org>
parents:
17626
diff
changeset
|
1311 (let* ((m (extract-calendar-month date)) |
b3514551f08d
(diary-float): Rewritten to fix bug when base date
Richard M. Stallman <rms@gnu.org>
parents:
17626
diff
changeset
|
1312 (d (extract-calendar-day date)) |
b3514551f08d
(diary-float): Rewritten to fix bug when base date
Richard M. Stallman <rms@gnu.org>
parents:
17626
diff
changeset
|
1313 (y (extract-calendar-year date)) |
b3514551f08d
(diary-float): Rewritten to fix bug when base date
Richard M. Stallman <rms@gnu.org>
parents:
17626
diff
changeset
|
1314 (limit; last (n>0) or first (n<0) possible base date for entry |
b3514551f08d
(diary-float): Rewritten to fix bug when base date
Richard M. Stallman <rms@gnu.org>
parents:
17626
diff
changeset
|
1315 (calendar-nth-named-absday (- n) dayname m y d)) |
b3514551f08d
(diary-float): Rewritten to fix bug when base date
Richard M. Stallman <rms@gnu.org>
parents:
17626
diff
changeset
|
1316 (last-abs (if (> n 0) limit (+ limit 6))) |
b3514551f08d
(diary-float): Rewritten to fix bug when base date
Richard M. Stallman <rms@gnu.org>
parents:
17626
diff
changeset
|
1317 (first-abs (if (> n 0) (- limit 6) limit)) |
b3514551f08d
(diary-float): Rewritten to fix bug when base date
Richard M. Stallman <rms@gnu.org>
parents:
17626
diff
changeset
|
1318 (last (calendar-gregorian-from-absolute last-abs)) |
b3514551f08d
(diary-float): Rewritten to fix bug when base date
Richard M. Stallman <rms@gnu.org>
parents:
17626
diff
changeset
|
1319 (first (calendar-gregorian-from-absolute first-abs)) |
b3514551f08d
(diary-float): Rewritten to fix bug when base date
Richard M. Stallman <rms@gnu.org>
parents:
17626
diff
changeset
|
1320 ; m1, d1 is first possible base date |
b3514551f08d
(diary-float): Rewritten to fix bug when base date
Richard M. Stallman <rms@gnu.org>
parents:
17626
diff
changeset
|
1321 (m1 (extract-calendar-month first)) |
b3514551f08d
(diary-float): Rewritten to fix bug when base date
Richard M. Stallman <rms@gnu.org>
parents:
17626
diff
changeset
|
1322 (d1 (extract-calendar-day first)) |
b3514551f08d
(diary-float): Rewritten to fix bug when base date
Richard M. Stallman <rms@gnu.org>
parents:
17626
diff
changeset
|
1323 (y1 (extract-calendar-year first)) |
b3514551f08d
(diary-float): Rewritten to fix bug when base date
Richard M. Stallman <rms@gnu.org>
parents:
17626
diff
changeset
|
1324 ; m2, d2 is last possible base date |
b3514551f08d
(diary-float): Rewritten to fix bug when base date
Richard M. Stallman <rms@gnu.org>
parents:
17626
diff
changeset
|
1325 (m2 (extract-calendar-month last)) |
b3514551f08d
(diary-float): Rewritten to fix bug when base date
Richard M. Stallman <rms@gnu.org>
parents:
17626
diff
changeset
|
1326 (d2 (extract-calendar-day last)) |
b3514551f08d
(diary-float): Rewritten to fix bug when base date
Richard M. Stallman <rms@gnu.org>
parents:
17626
diff
changeset
|
1327 (y2 (extract-calendar-year last))) |
23908
2a56bdf4cef7
(diary-float): Fix end-of-year error and typos in comments.
Karl Heuer <kwzh@gnu.org>
parents:
23247
diff
changeset
|
1328 (if (or (and (= m1 m2) ; only possible base dates in one month |
35500
38b437f4134e
(diary-float): Fix case of MONTH
Gerd Moellmann <gerd@gnu.org>
parents:
34036
diff
changeset
|
1329 (or (eq month t) |
38b437f4134e
(diary-float): Fix case of MONTH
Gerd Moellmann <gerd@gnu.org>
parents:
34036
diff
changeset
|
1330 (if (listp month) |
38b437f4134e
(diary-float): Fix case of MONTH
Gerd Moellmann <gerd@gnu.org>
parents:
34036
diff
changeset
|
1331 (memq m1 month) |
38b437f4134e
(diary-float): Fix case of MONTH
Gerd Moellmann <gerd@gnu.org>
parents:
34036
diff
changeset
|
1332 (= m1 month))) |
18590
7d2a26d2371d
(diary-float): Fix errors in previous change.
Richard M. Stallman <rms@gnu.org>
parents:
17892
diff
changeset
|
1333 (let ((d (or day (if (> n 0) |
7d2a26d2371d
(diary-float): Fix errors in previous change.
Richard M. Stallman <rms@gnu.org>
parents:
17892
diff
changeset
|
1334 1 |
7d2a26d2371d
(diary-float): Fix errors in previous change.
Richard M. Stallman <rms@gnu.org>
parents:
17892
diff
changeset
|
1335 (calendar-last-day-of-month m1 y1))))) |
7d2a26d2371d
(diary-float): Fix errors in previous change.
Richard M. Stallman <rms@gnu.org>
parents:
17892
diff
changeset
|
1336 (and (<= d1 d) (<= d d2)))) |
7d2a26d2371d
(diary-float): Fix errors in previous change.
Richard M. Stallman <rms@gnu.org>
parents:
17892
diff
changeset
|
1337 ;; only possible base dates straddle two months |
23998
6a6bb17fba97
(diary-float): Better fix of end-of-year error.
Richard M. Stallman <rms@gnu.org>
parents:
23908
diff
changeset
|
1338 (and (or (< y1 y2) |
6a6bb17fba97
(diary-float): Better fix of end-of-year error.
Richard M. Stallman <rms@gnu.org>
parents:
23908
diff
changeset
|
1339 (and (= y1 y2) (< m1 m2))) |
18590
7d2a26d2371d
(diary-float): Fix errors in previous change.
Richard M. Stallman <rms@gnu.org>
parents:
17892
diff
changeset
|
1340 (or |
23908
2a56bdf4cef7
(diary-float): Fix end-of-year error and typos in comments.
Karl Heuer <kwzh@gnu.org>
parents:
23247
diff
changeset
|
1341 ;; m1, d1 works as a base date |
18590
7d2a26d2371d
(diary-float): Fix errors in previous change.
Richard M. Stallman <rms@gnu.org>
parents:
17892
diff
changeset
|
1342 (and |
35500
38b437f4134e
(diary-float): Fix case of MONTH
Gerd Moellmann <gerd@gnu.org>
parents:
34036
diff
changeset
|
1343 (or (eq month t) |
38b437f4134e
(diary-float): Fix case of MONTH
Gerd Moellmann <gerd@gnu.org>
parents:
34036
diff
changeset
|
1344 (if (listp month) |
38b437f4134e
(diary-float): Fix case of MONTH
Gerd Moellmann <gerd@gnu.org>
parents:
34036
diff
changeset
|
1345 (memq m1 month) |
38b437f4134e
(diary-float): Fix case of MONTH
Gerd Moellmann <gerd@gnu.org>
parents:
34036
diff
changeset
|
1346 (= m1 month))) |
18590
7d2a26d2371d
(diary-float): Fix errors in previous change.
Richard M. Stallman <rms@gnu.org>
parents:
17892
diff
changeset
|
1347 (<= d1 (or day (if (> n 0) |
7d2a26d2371d
(diary-float): Fix errors in previous change.
Richard M. Stallman <rms@gnu.org>
parents:
17892
diff
changeset
|
1348 1 |
7d2a26d2371d
(diary-float): Fix errors in previous change.
Richard M. Stallman <rms@gnu.org>
parents:
17892
diff
changeset
|
1349 (calendar-last-day-of-month m1 y1))))) |
23908
2a56bdf4cef7
(diary-float): Fix end-of-year error and typos in comments.
Karl Heuer <kwzh@gnu.org>
parents:
23247
diff
changeset
|
1350 ;; m2, d2 works as a base date |
35500
38b437f4134e
(diary-float): Fix case of MONTH
Gerd Moellmann <gerd@gnu.org>
parents:
34036
diff
changeset
|
1351 (and (or (eq month t) |
38b437f4134e
(diary-float): Fix case of MONTH
Gerd Moellmann <gerd@gnu.org>
parents:
34036
diff
changeset
|
1352 (if (listp month) |
38b437f4134e
(diary-float): Fix case of MONTH
Gerd Moellmann <gerd@gnu.org>
parents:
34036
diff
changeset
|
1353 (memq m2 month) |
38b437f4134e
(diary-float): Fix case of MONTH
Gerd Moellmann <gerd@gnu.org>
parents:
34036
diff
changeset
|
1354 (= m2 month))) |
18590
7d2a26d2371d
(diary-float): Fix errors in previous change.
Richard M. Stallman <rms@gnu.org>
parents:
17892
diff
changeset
|
1355 (<= (or day (if (> n 0) |
7d2a26d2371d
(diary-float): Fix errors in previous change.
Richard M. Stallman <rms@gnu.org>
parents:
17892
diff
changeset
|
1356 1 |
7d2a26d2371d
(diary-float): Fix errors in previous change.
Richard M. Stallman <rms@gnu.org>
parents:
17892
diff
changeset
|
1357 (calendar-last-day-of-month m2 y2))) |
7d2a26d2371d
(diary-float): Fix errors in previous change.
Richard M. Stallman <rms@gnu.org>
parents:
17892
diff
changeset
|
1358 d2))))) |
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
1359 (cons mark entry))))) |
13053 | 1360 |
35500
38b437f4134e
(diary-float): Fix case of MONTH
Gerd Moellmann <gerd@gnu.org>
parents:
34036
diff
changeset
|
1361 |
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
1362 (defun diary-anniversary (month day year &optional mark) |
13053 | 1363 "Anniversary diary entry. |
1364 Entry applies if date is the anniversary of MONTH, DAY, YEAR if | |
1365 `european-calendar-style' is nil, and DAY, MONTH, YEAR if | |
1366 `european-calendar-style' is t. Diary entry can contain `%d' or `%d%s'; the | |
1367 %d will be replaced by the number of years since the MONTH DAY, YEAR and the | |
1368 %s will be replaced by the ordinal ending of that number (that is, `st', `nd', | |
1369 `rd' or `th', as appropriate. The anniversary of February 29 is considered | |
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
1370 to be March 1 in non-leap years. |
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
1371 |
46826
e020f18c490a
(diary-mail-entries): Use `compose-mail'
Sam Steingold <sds@gnu.org>
parents:
46620
diff
changeset
|
1372 An optional parameter MARK specifies a face or single-character string to |
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
1373 use when highlighting the day in the calendar." |
13053 | 1374 (let* ((d (if european-calendar-style |
1375 month | |
1376 day)) | |
1377 (m (if european-calendar-style | |
1378 day | |
1379 month)) | |
1380 (y (extract-calendar-year date)) | |
1381 (diff (- y year))) | |
1382 (if (and (= m 2) (= d 29) (not (calendar-leap-year-p y))) | |
1383 (setq m 3 | |
1384 d 1)) | |
1385 (if (and (> diff 0) (calendar-date-equal (list m d y) date)) | |
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
1386 (cons mark (format entry diff (diary-ordinal-suffix diff)))))) |
13053 | 1387 |
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
1388 (defun diary-cyclic (n month day year &optional mark) |
13053 | 1389 "Cycle diary entry--entry applies every N days starting at MONTH, DAY, YEAR. |
1390 If `european-calendar-style' is t, parameters are N, DAY, MONTH, YEAR. | |
1391 ENTRY can contain `%d' or `%d%s'; the %d will be replaced by the number of | |
32415
82747626b78b
(diary-cyclic): Doc fix from Ed Reingold.
Gerd Moellmann <gerd@gnu.org>
parents:
28615
diff
changeset
|
1392 repetitions since the MONTH DAY, YEAR and %s will be replaced by the |
82747626b78b
(diary-cyclic): Doc fix from Ed Reingold.
Gerd Moellmann <gerd@gnu.org>
parents:
28615
diff
changeset
|
1393 ordinal ending of that number (that is, `st', `nd', `rd' or `th', as |
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
1394 appropriate. |
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
1395 |
46826
e020f18c490a
(diary-mail-entries): Use `compose-mail'
Sam Steingold <sds@gnu.org>
parents:
46620
diff
changeset
|
1396 An optional parameter MARK specifies a face or single-character string to |
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
1397 use when highlighting the day in the calendar." |
13053 | 1398 (let* ((d (if european-calendar-style |
1399 month | |
1400 day)) | |
1401 (m (if european-calendar-style | |
1402 day | |
1403 month)) | |
1404 (diff (- (calendar-absolute-from-gregorian date) | |
1405 (calendar-absolute-from-gregorian | |
1406 (list m d year)))) | |
1407 (cycle (/ diff n))) | |
1408 (if (and (>= diff 0) (zerop (% diff n))) | |
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
1409 (cons mark (format entry cycle (diary-ordinal-suffix cycle)))))) |
13053 | 1410 |
1411 (defun diary-ordinal-suffix (n) | |
1412 "Ordinal suffix for N. (That is, `st', `nd', `rd', or `th', as appropriate.)" | |
1413 (if (or (memq (% n 100) '(11 12 13)) | |
1414 (< 3 (% n 10))) | |
1415 "th" | |
1416 (aref ["th" "st" "nd" "rd"] (% n 10)))) | |
1417 | |
1418 (defun diary-day-of-year () | |
1419 "Day of year and number of days remaining in the year of date diary entry." | |
1420 (calendar-day-of-year-string date)) | |
1421 | |
17626 | 1422 (defcustom diary-remind-message |
13053 | 1423 '("Reminder: Only " |
1424 (if (= 0 (% days 7)) | |
1425 (concat (int-to-string (/ days 7)) (if (= 7 days) " week" " weeks")) | |
1426 (concat (int-to-string days) (if (= 1 days) " day" " days"))) | |
1427 " until " | |
1428 diary-entry) | |
1429 "*Pseudo-pattern giving form of reminder messages in the fancy diary | |
1430 display. | |
39615
4287ce76bf9f
(diary-entry-compare): When times are identical, compare the entries
Sam Steingold <sds@gnu.org>
parents:
38422
diff
changeset
|
1431 |
13053 | 1432 Used by the function `diary-remind', a pseudo-pattern is a list of |
1433 expressions that can involve the keywords `days' (a number), `date' (a list of | |
17626 | 1434 month, day, year), and `diary-entry' (a string)." |
1435 :type 'sexp | |
1436 :group 'diary) | |
13053 | 1437 |
1438 (defun diary-remind (sexp days &optional marking) | |
1439 "Provide a reminder of a diary entry. | |
1440 SEXP is a diary-sexp. DAYS is either a single number or a list of numbers | |
1441 indicating the number(s) of days before the event that the warning(s) should | |
1442 occur on. If the current date is (one of) DAYS before the event indicated by | |
1443 SEXP, then a suitable message (as specified by `diary-remind-message' is | |
1444 returned. | |
1445 | |
24684
cca41b0e7ae7
(diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents:
24192
diff
changeset
|
1446 In addition to the reminders beforehand, the diary entry also appears on the |
cca41b0e7ae7
(diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents:
24192
diff
changeset
|
1447 date itself. |
cca41b0e7ae7
(diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents:
24192
diff
changeset
|
1448 |
cca41b0e7ae7
(diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents:
24192
diff
changeset
|
1449 A `diary-nonmarking-symbol' at the beginning of the line of the diary-remind |
cca41b0e7ae7
(diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents:
24192
diff
changeset
|
1450 entry specifies that the diary entry (not the reminder) is non-marking. |
cca41b0e7ae7
(diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents:
24192
diff
changeset
|
1451 Marking of reminders is independent of whether the entry itself is a marking |
cca41b0e7ae7
(diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents:
24192
diff
changeset
|
1452 or nonmarking; if optional parameter MARKING is non-nil then the reminders are |
cca41b0e7ae7
(diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents:
24192
diff
changeset
|
1453 marked on the calendar." |
cca41b0e7ae7
(diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents:
24192
diff
changeset
|
1454 (let ((diary-entry (eval sexp))) |
cca41b0e7ae7
(diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents:
24192
diff
changeset
|
1455 (cond |
cca41b0e7ae7
(diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents:
24192
diff
changeset
|
1456 ;; Diary entry applies on date |
cca41b0e7ae7
(diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents:
24192
diff
changeset
|
1457 ((and diary-entry |
cca41b0e7ae7
(diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents:
24192
diff
changeset
|
1458 (or (not marking-diary-entries) marking-diary-entry)) |
cca41b0e7ae7
(diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents:
24192
diff
changeset
|
1459 diary-entry) |
cca41b0e7ae7
(diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents:
24192
diff
changeset
|
1460 ;; Diary entry may apply to `days' before date |
cca41b0e7ae7
(diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents:
24192
diff
changeset
|
1461 ((and (integerp days) |
cca41b0e7ae7
(diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents:
24192
diff
changeset
|
1462 (not diary-entry); Diary entry does not apply to date |
cca41b0e7ae7
(diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents:
24192
diff
changeset
|
1463 (or (not marking-diary-entries) marking)) |
cca41b0e7ae7
(diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents:
24192
diff
changeset
|
1464 (let ((date (calendar-gregorian-from-absolute |
cca41b0e7ae7
(diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents:
24192
diff
changeset
|
1465 (+ (calendar-absolute-from-gregorian date) days)))) |
cca41b0e7ae7
(diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents:
24192
diff
changeset
|
1466 (if (setq diary-entry (eval sexp)) |
cca41b0e7ae7
(diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents:
24192
diff
changeset
|
1467 (mapconcat 'eval diary-remind-message "")))) |
cca41b0e7ae7
(diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents:
24192
diff
changeset
|
1468 ;; Diary entry may apply to one of a list of days before date |
cca41b0e7ae7
(diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents:
24192
diff
changeset
|
1469 ((and (listp days) days) |
cca41b0e7ae7
(diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents:
24192
diff
changeset
|
1470 (or (diary-remind sexp (car days) marking) |
cca41b0e7ae7
(diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents:
24192
diff
changeset
|
1471 (diary-remind sexp (cdr days) marking)))))) |
13053 | 1472 |
48365
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1473 (defun add-to-diary-list (date string specifier marker) |
20269
ca337d0a1553
(list-diary-entries, list-sexp-diary-entries, add-to-diary-list):
Karl Heuer <kwzh@gnu.org>
parents:
19324
diff
changeset
|
1474 "Add the entry (DATE STRING SPECIFIER) to `diary-entries-list'. |
13053 | 1475 Do nothing if DATE or STRING is nil." |
1476 (and date string | |
39615
4287ce76bf9f
(diary-entry-compare): When times are identical, compare the entries
Sam Steingold <sds@gnu.org>
parents:
38422
diff
changeset
|
1477 (setq diary-entries-list |
48365
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1478 (append diary-entries-list |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1479 (list (list date string specifier marker)))))) |
13053 | 1480 |
1481 (defun make-diary-entry (string &optional nonmarking file) | |
1482 "Insert a diary entry STRING which may be NONMARKING in FILE. | |
1483 If omitted, NONMARKING defaults to nil and FILE defaults to diary-file." | |
1484 (find-file-other-window | |
1485 (substitute-in-file-name (if file file diary-file))) | |
48312
67f6a633fe52
calendar/diary-lib.el (make-diary-entry): Allow for local variables at end of
Juanma Barranquero <lekktu@gmail.com>
parents:
47922
diff
changeset
|
1486 (widen) |
13053 | 1487 (goto-char (point-max)) |
48312
67f6a633fe52
calendar/diary-lib.el (make-diary-entry): Allow for local variables at end of
Juanma Barranquero <lekktu@gmail.com>
parents:
47922
diff
changeset
|
1488 (when (let ((case-fold-search t)) |
67f6a633fe52
calendar/diary-lib.el (make-diary-entry): Allow for local variables at end of
Juanma Barranquero <lekktu@gmail.com>
parents:
47922
diff
changeset
|
1489 (search-backward "Local Variables:" |
67f6a633fe52
calendar/diary-lib.el (make-diary-entry): Allow for local variables at end of
Juanma Barranquero <lekktu@gmail.com>
parents:
47922
diff
changeset
|
1490 (max (- (point-max) 3000) (point-min)) |
67f6a633fe52
calendar/diary-lib.el (make-diary-entry): Allow for local variables at end of
Juanma Barranquero <lekktu@gmail.com>
parents:
47922
diff
changeset
|
1491 t)) |
67f6a633fe52
calendar/diary-lib.el (make-diary-entry): Allow for local variables at end of
Juanma Barranquero <lekktu@gmail.com>
parents:
47922
diff
changeset
|
1492 (beginning-of-line) |
67f6a633fe52
calendar/diary-lib.el (make-diary-entry): Allow for local variables at end of
Juanma Barranquero <lekktu@gmail.com>
parents:
47922
diff
changeset
|
1493 (insert "\n") |
67f6a633fe52
calendar/diary-lib.el (make-diary-entry): Allow for local variables at end of
Juanma Barranquero <lekktu@gmail.com>
parents:
47922
diff
changeset
|
1494 (previous-line 1)) |
13053 | 1495 (insert |
1496 (if (bolp) "" "\n") | |
1497 (if nonmarking diary-nonmarking-symbol "") | |
1498 string " ")) | |
1499 | |
1500 (defun insert-diary-entry (arg) | |
1501 "Insert a diary entry for the date indicated by point. | |
1502 Prefix arg will make the entry nonmarking." | |
1503 (interactive "P") | |
1504 (make-diary-entry (calendar-date-string (calendar-cursor-to-date t) t t) | |
1505 arg)) | |
1506 | |
1507 (defun insert-weekly-diary-entry (arg) | |
1508 "Insert a weekly diary entry for the day of the week indicated by point. | |
1509 Prefix arg will make the entry nonmarking." | |
1510 (interactive "P") | |
1511 (make-diary-entry (calendar-day-name (calendar-cursor-to-date t)) | |
1512 arg)) | |
1513 | |
1514 (defun insert-monthly-diary-entry (arg) | |
1515 "Insert a monthly diary entry for the day of the month indicated by point. | |
1516 Prefix arg will make the entry nonmarking." | |
1517 (interactive "P") | |
1518 (let* ((calendar-date-display-form | |
1519 (if european-calendar-style | |
1520 '(day " * ") | |
1521 '("* " day)))) | |
1522 (make-diary-entry (calendar-date-string (calendar-cursor-to-date t) t) | |
1523 arg))) | |
1524 | |
1525 (defun insert-yearly-diary-entry (arg) | |
1526 "Insert an annual diary entry for the day of the year indicated by point. | |
1527 Prefix arg will make the entry nonmarking." | |
1528 (interactive "P") | |
1529 (let* ((calendar-date-display-form | |
1530 (if european-calendar-style | |
1531 '(day " " monthname) | |
1532 '(monthname " " day)))) | |
1533 (make-diary-entry (calendar-date-string (calendar-cursor-to-date t) t) | |
1534 arg))) | |
1535 | |
1536 (defun insert-anniversary-diary-entry (arg) | |
1537 "Insert an anniversary diary entry for the date given by point. | |
1538 Prefix arg will make the entry nonmarking." | |
1539 (interactive "P") | |
1540 (let* ((calendar-date-display-form | |
1541 (if european-calendar-style | |
1542 '(day " " month " " year) | |
1543 '(month " " day " " year)))) | |
1544 (make-diary-entry | |
1545 (format "%s(diary-anniversary %s)" | |
1546 sexp-diary-entry-symbol | |
1547 (calendar-date-string (calendar-cursor-to-date t) nil t)) | |
1548 arg))) | |
1549 | |
1550 (defun insert-block-diary-entry (arg) | |
1551 "Insert a block diary entry for the days between the point and marked date. | |
1552 Prefix arg will make the entry nonmarking." | |
1553 (interactive "P") | |
1554 (let* ((calendar-date-display-form | |
1555 (if european-calendar-style | |
1556 '(day " " month " " year) | |
1557 '(month " " day " " year))) | |
1558 (cursor (calendar-cursor-to-date t)) | |
1559 (mark (or (car calendar-mark-ring) | |
1560 (error "No mark set in this buffer"))) | |
1561 (start) | |
1562 (end)) | |
1563 (if (< (calendar-absolute-from-gregorian mark) | |
1564 (calendar-absolute-from-gregorian cursor)) | |
1565 (setq start mark | |
1566 end cursor) | |
1567 (setq start cursor | |
1568 end mark)) | |
1569 (make-diary-entry | |
1570 (format "%s(diary-block %s %s)" | |
1571 sexp-diary-entry-symbol | |
1572 (calendar-date-string start nil t) | |
1573 (calendar-date-string end nil t)) | |
1574 arg))) | |
1575 | |
1576 (defun insert-cyclic-diary-entry (arg) | |
1577 "Insert a cyclic diary entry starting at the date given by point. | |
1578 Prefix arg will make the entry nonmarking." | |
1579 (interactive "P") | |
1580 (let* ((calendar-date-display-form | |
1581 (if european-calendar-style | |
1582 '(day " " month " " year) | |
1583 '(month " " day " " year)))) | |
1584 (make-diary-entry | |
1585 (format "%s(diary-cyclic %d %s)" | |
1586 sexp-diary-entry-symbol | |
1587 (calendar-read "Repeat every how many days: " | |
28615
4c6883cb70ab
(fancy-diary-display, mark-diary-entries)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28575
diff
changeset
|
1588 (lambda (x) (> x 0))) |
13053 | 1589 (calendar-date-string (calendar-cursor-to-date t) nil t)) |
1590 arg))) | |
1591 | |
48365
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1592 ;;;###autoload |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1593 (define-derived-mode diary-mode text-mode |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1594 "Diary" |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1595 "Major mode for editing the diary file." |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1596 (set (make-local-variable 'font-lock-defaults) |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1597 '(diary-font-lock-keywords t))) |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1598 |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1599 (define-derived-mode fancy-diary-display-mode text-mode |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1600 "Diary" |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1601 "Major mode used while displaying diary entries using Fancy Display." |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1602 (set (make-local-variable 'font-lock-defaults) |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1603 '(fancy-diary-font-lock-keywords t))) |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1604 |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1605 |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1606 (defvar fancy-diary-font-lock-keywords |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1607 (list |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1608 (cons |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1609 (concat |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1610 (let ((dayname |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1611 (concat "\\(" |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1612 (diary-name-pattern calendar-day-name-array t) |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1613 "\\)")) |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1614 (monthname |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1615 (concat "\\(" |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1616 (diary-name-pattern calendar-month-name-array t) |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1617 "\\)")) |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1618 (day "[0-9]+") |
48421
9f9b3764df98
(fancy-diary-font-lock-keywords): Grok month numbers, too.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
48372
diff
changeset
|
1619 (month "[0-9]+") |
48365
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1620 (year "-?[0-9]+")) |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1621 (mapconcat 'eval calendar-date-display-form "")) |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1622 "\\(\\(: .*\\)\\|\\(\n +.*\\)\\)*\n=+$") |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1623 'diary-face) |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1624 '("^.*anniversary.*$" . font-lock-keyword-face) |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1625 '("^.*birthday.*$" . font-lock-keyword-face) |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1626 '("^.*Yahrzeit.*$" . font-lock-reference-face) |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1627 '("^\\(Erev \\)?Rosh Hodesh.*" . font-lock-function-name-face) |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1628 '("^Day.*omer.*$" . font-lock-builtin-face) |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1629 '("^Parashat.*$" . font-lock-comment-face) |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1630 '("^[ \t]*[0-9]?[0-9]\\(:?[0-9][0-9]\\)?\\(am\\|pm\\|AM\\|PM\\)?\\(-[0-9]?[0-9]\\(:?[0-9][0-9]\\)?\\(am\\|pm\\|AM\\|PM\\)?\\)?" |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1631 . font-lock-variable-name-face)) |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1632 "Keywords to highlight in fancy diary display") |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1633 |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1634 |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1635 (defun font-lock-diary-sexps (limit) |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1636 "Recognize sexp diary entry for font-locking." |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1637 (if (re-search-forward |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1638 (concat "^" (regexp-quote diary-nonmarking-symbol) |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1639 "?\\(" (regexp-quote sexp-diary-entry-symbol) "\\)") |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1640 limit t) |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1641 (condition-case nil |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1642 (save-restriction |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1643 (narrow-to-region (point-min) limit) |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1644 (let ((start (point))) |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1645 (forward-sexp 1) |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1646 (store-match-data (list start (point))) |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1647 t)) |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1648 (error t)))) |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1649 |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1650 (defun font-lock-diary-date-forms (month-list &optional symbol noabbrev) |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1651 "Create a list of font-lock patterns for `diary-date-forms' with MONTH-LIST. |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1652 If given, optional SYMBOL must be a prefix to entries. |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1653 If optional NOABBREV is t, do not allow abbreviations in names." |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1654 (let* ((dayname |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1655 (concat "\\(" (diary-name-pattern calendar-day-name-array) "\\)")) |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1656 (monthname (concat "\\(" |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1657 (diary-name-pattern month-list noabbrev) |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1658 "\\|\\*\\)")) |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1659 (month "\\([0-9]+\\|\\*\\)") |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1660 (day "\\([0-9]+\\|\\*\\)") |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1661 (year "-?\\([0-9]+\\|\\*\\)")) |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1662 (mapcar '(lambda (x) |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1663 (cons |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1664 (concat "^" (regexp-quote diary-nonmarking-symbol) "?" |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1665 (if symbol (regexp-quote symbol) "") "\\(" |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1666 (mapconcat 'eval |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1667 ;; If backup, omit first item (backup) |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1668 ;; and last item (not part of date) |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1669 (if (equal (car x) 'backup) |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1670 (reverse (cdr (reverse (cdr x)))) |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1671 x) |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1672 "") |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1673 ;; With backup, last item is not part of date |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1674 (if (equal (car x) 'backup) |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1675 (concat "\\)" (eval (car (reverse x)))) |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1676 "\\)")) |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1677 '(1 diary-face))) |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1678 diary-date-forms))) |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1679 |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1680 (defvar diary-font-lock-keywords |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1681 (append |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1682 (font-lock-diary-date-forms calendar-month-name-array) |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1683 (if (or (memq 'mark-hebrew-diary-entries |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1684 nongregorian-diary-marking-hook) |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1685 (memq 'list-hebrew-diary-entries |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1686 nongregorian-diary-listing-hook)) |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1687 (progn |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1688 (require 'cal-hebrew) |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1689 (font-lock-diary-date-forms |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1690 calendar-hebrew-month-name-array-leap-year |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1691 hebrew-diary-entry-symbol t))) |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1692 (if (or (memq 'mark-islamic-diary-entries |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1693 nongregorian-diary-marking-hook) |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1694 (memq 'list-islamic-diary-entries |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1695 nongregorian-diary-listing-hook)) |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1696 (progn |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1697 (require 'cal-islamic) |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1698 (font-lock-diary-date-forms |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1699 calendar-islamic-month-name-array-leap-year |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1700 islamic-diary-entry-symbol t))) |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1701 (list |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1702 (cons |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1703 (concat "^" (regexp-quote diary-include-string) ".*$") |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1704 'font-lock-keyword-face) |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1705 (cons |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1706 (concat "^" (regexp-quote diary-nonmarking-symbol) |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1707 "?\\(" (regexp-quote sexp-diary-entry-symbol) "\\)") |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1708 '(1 font-lock-reference-face)) |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1709 (cons |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1710 (concat "^" (regexp-quote diary-nonmarking-symbol)) |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1711 'font-lock-reference-face) |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1712 (cons |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1713 (concat "^" (regexp-quote diary-nonmarking-symbol) |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1714 "?\\(" (regexp-quote hebrew-diary-entry-symbol) "\\)") |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1715 '(1 font-lock-reference-face)) |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1716 (cons |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1717 (concat "^" (regexp-quote diary-nonmarking-symbol) |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1718 "?\\(" (regexp-quote islamic-diary-entry-symbol) "\\)") |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1719 '(1 font-lock-reference-face)) |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1720 '(font-lock-diary-sexps . font-lock-keyword-face) |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1721 '("[0-9]?[0-9]\\(:?[0-9][0-9]\\)?\\(am\\|pm\\|AM\\|PM\\)\\(-[0-9]?[0-9]\\(:?[0-9][0-9]\\)?\\(am\\|pm\\|AM\\|PM\\)\\)?" |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1722 . font-lock-function-name-face))) |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1723 "Forms to highlight in diary-mode") |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1724 |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1725 |
13650 | 1726 (provide 'diary-lib) |
13053 | 1727 |
13650 | 1728 ;;; diary-lib.el ends here |