Mercurial > emacs
annotate lisp/calendar/diary-lib.el @ 59061:a7985894de81
Comment change.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Tue, 21 Dec 2004 11:50:52 +0000 |
| parents | 5ddb0b71254b |
| children | be41382b25ea |
| 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 |
| 53557 | 3 ;; Copyright (C) 1989, 1990, 1992, 1993, 1994, 1995, 2003, 2004 |
|
51640
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
4 ;; Free Software Foundation, Inc. |
| 13053 | 5 |
| 6 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu> | |
| 57255 | 7 ;; Maintainer: Glenn Morris <gmorris@ast.cam.ac.uk> |
| 13053 | 8 ;; Keywords: calendar |
| 9 | |
| 10 ;; This file is part of GNU Emacs. | |
| 11 | |
| 12 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
| 13 ;; it under the terms of the GNU General Public License as published by | |
| 14 ;; the Free Software Foundation; either version 2, or (at your option) | |
| 15 ;; any later version. | |
| 16 | |
| 17 ;; GNU Emacs is distributed in the hope that it will be useful, | |
| 18 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 19 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 20 ;; GNU General Public License for more details. | |
| 21 | |
| 22 ;; You should have received a copy of the GNU General Public License | |
| 14169 | 23 ;; along with GNU Emacs; see the file COPYING. If not, write to the |
| 24 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 25 ;; Boston, MA 02111-1307, USA. | |
| 13053 | 26 |
| 27 ;;; Commentary: | |
| 28 | |
| 29 ;; This collection of functions implements the diary features as described | |
| 30 ;; in calendar.el. | |
| 31 | |
| 32 ;; Comments, corrections, and improvements should be sent to | |
| 33 ;; Edward M. Reingold Department of Computer Science | |
| 34 ;; (217) 333-6733 University of Illinois at Urbana-Champaign | |
| 35 ;; reingold@cs.uiuc.edu 1304 West Springfield Avenue | |
| 36 ;; Urbana, Illinois 61801 | |
| 37 | |
| 38 ;;; Code: | |
| 39 | |
| 40 (require 'calendar) | |
| 41 | |
|
51640
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
42 (defun diary-check-diary-file () |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
43 "Check that the file specified by `diary-file' exists and is readable. |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
44 If so, return the expanded file name, otherwise signal an error." |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
45 (let ((d-file (substitute-in-file-name diary-file))) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
46 (if (and d-file (file-exists-p d-file)) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
47 (if (file-readable-p d-file) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
48 d-file |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
49 (error "Diary file `%s' is not readable" diary-file)) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
50 (error "Diary file `%s' does not exist" diary-file)))) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
51 |
| 13053 | 52 ;;;###autoload |
| 53 (defun diary (&optional arg) | |
| 54 "Generate the diary window for ARG days starting with the current date. | |
| 55 If no argument is provided, the number of days of diary entries is governed | |
| 53557 | 56 by the variable `number-of-diary-entries'. A value of ARG less than 1 |
| 57 does nothing. This function is suitable for execution in a `.emacs' file." | |
| 13053 | 58 (interactive "P") |
|
51640
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
59 (diary-check-diary-file) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
60 (let ((date (calendar-current-date))) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
61 (list-diary-entries |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
62 date |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
63 (cond (arg (prefix-numeric-value arg)) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
64 ((vectorp number-of-diary-entries) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
65 (aref number-of-diary-entries (calendar-day-of-week date))) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
66 (t number-of-diary-entries))))) |
| 13053 | 67 |
| 68 (defun view-diary-entries (arg) | |
| 69 "Prepare and display a buffer with diary entries. | |
| 70 Searches the file named in `diary-file' for entries that | |
| 71 match ARG days starting with the date indicated by the cursor position | |
| 72 in the displayed three-month calendar." | |
| 73 (interactive "p") | |
|
51640
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
74 (diary-check-diary-file) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
75 (list-diary-entries (calendar-cursor-to-date t) arg)) |
| 13053 | 76 |
|
22412
6fdc14d2b071
Don't overide default value of diary-file.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
21957
diff
changeset
|
77 (defun view-other-diary-entries (arg d-file) |
| 13053 | 78 "Prepare and display buffer of diary entries from an alternative diary file. |
|
51640
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
79 Searches for entries that match ARG days, starting with the date indicated |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
80 by the cursor position in the displayed three-month calendar. |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
81 D-FILE specifies the file to use as the diary file." |
| 13053 | 82 (interactive |
|
59043
5ddb0b71254b
(view-other-diary-entries): Use current-prefix-arg in interactive spec.
Glenn Morris <rgm@gnu.org>
parents:
58101
diff
changeset
|
83 (list (prefix-numeric-value 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 |
|
55431
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
55249
diff
changeset
|
127 (autoload 'diary-bahai-date "cal-bahai" |
|
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
55249
diff
changeset
|
128 "Baha'i calendar equivalent of date diary entry." |
|
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
55249
diff
changeset
|
129 t) |
|
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
55249
diff
changeset
|
130 |
|
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
55249
diff
changeset
|
131 (autoload 'list-bahai-diary-entries "cal-bahai" |
|
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
55249
diff
changeset
|
132 "Add any Baha'i date entries from the diary file to `diary-entries-list'." |
|
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
55249
diff
changeset
|
133 t) |
|
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
55249
diff
changeset
|
134 |
|
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
55249
diff
changeset
|
135 (autoload 'mark-bahai-diary-entries "cal-bahai" |
|
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
55249
diff
changeset
|
136 "Mark days in the calendar window that have Baha'i date diary entries." |
|
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
55249
diff
changeset
|
137 t) |
|
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
55249
diff
changeset
|
138 |
|
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
55249
diff
changeset
|
139 (autoload 'mark-bahai-calendar-date-pattern "cal-bahai" |
|
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
55249
diff
changeset
|
140 "Mark dates in calendar window that conform to Baha'i date MONTH/DAY/YEAR." |
|
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
55249
diff
changeset
|
141 t) |
|
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
55249
diff
changeset
|
142 |
| 13053 | 143 (autoload 'diary-hebrew-date "cal-hebrew" |
|
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
144 "Hebrew calendar equivalent of date diary entry.") |
| 13053 | 145 |
| 146 (autoload 'diary-omer "cal-hebrew" | |
|
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
147 "Omer count diary entry.") |
| 13053 | 148 |
| 149 (autoload 'diary-yahrzeit "cal-hebrew" | |
|
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
150 "Yahrzeit diary entry--entry applies if date is yahrzeit or the day before.") |
| 13053 | 151 |
| 152 (autoload 'diary-parasha "cal-hebrew" | |
|
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
153 "Parasha diary entry--entry applies if date is a Saturday.") |
| 13053 | 154 |
| 155 (autoload 'diary-rosh-hodesh "cal-hebrew" | |
|
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
156 "Rosh Hodesh diary entry.") |
| 13053 | 157 |
| 158 (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
|
159 "Add any Hebrew date entries from the diary file to `diary-entries-list'.") |
| 13053 | 160 |
| 161 (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
|
162 "Mark days in the calendar window that have Hebrew date diary entries.") |
| 13053 | 163 |
| 164 (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
|
165 "Mark dates in calendar window that conform to Hebrew date MONTH/DAY/YEAR.") |
| 13053 | 166 |
| 167 (autoload 'diary-coptic-date "cal-coptic" | |
|
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
168 "Coptic calendar equivalent of date diary entry.") |
| 13053 | 169 |
| 170 (autoload 'diary-ethiopic-date "cal-coptic" | |
|
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
171 "Ethiopic calendar equivalent of date diary entry.") |
| 13053 | 172 |
|
15258
ab5975df6164
Change autoload references from cal-persian to cal-persia.
Karl Heuer <kwzh@gnu.org>
parents:
14954
diff
changeset
|
173 (autoload 'diary-persian-date "cal-persia" |
|
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
174 "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
|
175 |
|
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
176 (autoload 'diary-phases-of-moon "lunar" "Moon phases diary entry.") |
| 13053 | 177 |
| 178 (autoload 'diary-sunrise-sunset "solar" | |
|
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
179 "Local time of sunrise and sunset as a diary entry.") |
| 13053 | 180 |
| 181 (autoload 'diary-sabbath-candles "solar" | |
| 182 "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
|
183 No diary entry if there is no sunset on that date.") |
| 13053 | 184 |
| 185 (defvar diary-syntax-table (copy-syntax-table (standard-syntax-table)) | |
| 186 "The syntax table used when parsing dates in the diary file. | |
| 187 It is the standard syntax table used in Fundamental mode, but with the | |
|
51640
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
188 syntax of `*' and `:' changed to be word constituents.") |
| 13053 | 189 |
| 190 (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
|
191 (modify-syntax-entry ?: "w" diary-syntax-table) |
| 13053 | 192 |
|
46826
e020f18c490a
(diary-mail-entries): Use `compose-mail'
Sam Steingold <sds@gnu.org>
parents:
46620
diff
changeset
|
193 (defvar diary-entries-list) |
|
e020f18c490a
(diary-mail-entries): Use `compose-mail'
Sam Steingold <sds@gnu.org>
parents:
46620
diff
changeset
|
194 (defvar displayed-year) |
|
e020f18c490a
(diary-mail-entries): Use `compose-mail'
Sam Steingold <sds@gnu.org>
parents:
46620
diff
changeset
|
195 (defvar displayed-month) |
|
e020f18c490a
(diary-mail-entries): Use `compose-mail'
Sam Steingold <sds@gnu.org>
parents:
46620
diff
changeset
|
196 (defvar entry) |
|
e020f18c490a
(diary-mail-entries): Use `compose-mail'
Sam Steingold <sds@gnu.org>
parents:
46620
diff
changeset
|
197 (defvar date) |
|
e020f18c490a
(diary-mail-entries): Use `compose-mail'
Sam Steingold <sds@gnu.org>
parents:
46620
diff
changeset
|
198 (defvar number) |
|
e020f18c490a
(diary-mail-entries): Use `compose-mail'
Sam Steingold <sds@gnu.org>
parents:
46620
diff
changeset
|
199 (defvar date-string) |
|
e020f18c490a
(diary-mail-entries): Use `compose-mail'
Sam Steingold <sds@gnu.org>
parents:
46620
diff
changeset
|
200 (defvar original-date) |
|
e020f18c490a
(diary-mail-entries): Use `compose-mail'
Sam Steingold <sds@gnu.org>
parents:
46620
diff
changeset
|
201 |
|
49737
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
202 (defun diary-attrtype-convert (attrvalue type) |
|
51640
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
203 "Convert string ATTRVALUE to TYPE appropriate for a face description. |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
204 Valid TYPEs are: string, symbol, int, stringtnil, tnil." |
|
49737
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
205 (let (ret) |
|
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
206 (setq ret (cond ((eq type 'string) attrvalue) |
|
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
207 ((eq type 'symbol) (read attrvalue)) |
|
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
208 ((eq type 'int) (string-to-int attrvalue)) |
|
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
209 ((eq type 'stringtnil) |
|
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
210 (cond ((string= "t" attrvalue) t) |
|
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
211 ((string= "nil" attrvalue) nil) |
|
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
212 (t attrvalue))) |
|
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
213 ((eq type 'tnil) |
|
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
214 (cond ((string= "t" attrvalue) t) |
|
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
215 ((string= "nil" attrvalue) nil))))) |
|
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
216 ; (message "(%s)[%s]=[%s]" (print type) attrvalue ret) |
|
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
217 ret)) |
|
50699
fa4e7ecda348
(fancy-diary-display-mode): Bind "q" to `quit-window'
Sam Steingold <sds@gnu.org>
parents:
49737
diff
changeset
|
218 |
|
49737
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
219 |
|
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
220 (defun diary-pull-attrs (entry fileglobattrs) |
|
50699
fa4e7ecda348
(fancy-diary-display-mode): Bind "q" to `quit-window'
Sam Steingold <sds@gnu.org>
parents:
49737
diff
changeset
|
221 "Pull the face-related attributes off the entry, merge with the |
|
fa4e7ecda348
(fancy-diary-display-mode): Bind "q" to `quit-window'
Sam Steingold <sds@gnu.org>
parents:
49737
diff
changeset
|
222 fileglobattrs, and return the (possibly modified) entry and face |
|
fa4e7ecda348
(fancy-diary-display-mode): Bind "q" to `quit-window'
Sam Steingold <sds@gnu.org>
parents:
49737
diff
changeset
|
223 data in a list of attrname attrvalue values. |
|
49737
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
224 The entry will be modified to drop all tags that are used for face matching. |
|
50699
fa4e7ecda348
(fancy-diary-display-mode): Bind "q" to `quit-window'
Sam Steingold <sds@gnu.org>
parents:
49737
diff
changeset
|
225 If entry is nil, then the fileglobattrs are being searched for, |
|
fa4e7ecda348
(fancy-diary-display-mode): Bind "q" to `quit-window'
Sam Steingold <sds@gnu.org>
parents:
49737
diff
changeset
|
226 the fileglobattrs variable is ignored, and |
|
fa4e7ecda348
(fancy-diary-display-mode): Bind "q" to `quit-window'
Sam Steingold <sds@gnu.org>
parents:
49737
diff
changeset
|
227 diary-glob-file-regexp-prefix is prepended to the regexps before each |
|
49737
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
228 search." |
|
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
229 (save-excursion |
|
50904
44fe653dccdb
(diary-pull-attrs): Make `ret-attr', `attr' local.
Glenn Morris <rgm@gnu.org>
parents:
50699
diff
changeset
|
230 (let (regexp regnum attrname attr-list attrname attrvalue type |
|
44fe653dccdb
(diary-pull-attrs): Make `ret-attr', `attr' local.
Glenn Morris <rgm@gnu.org>
parents:
50699
diff
changeset
|
231 ret-attr attr) |
|
49737
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
232 (if (null entry) |
|
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
233 (progn |
|
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
234 (setq ret-attr '() |
|
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
235 attr-list diary-face-attrs) |
|
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
236 (while attr-list |
|
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
237 (goto-char (point-min)) |
|
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
238 (setq attr (car attr-list) |
|
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
239 regexp (nth 0 attr) |
|
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
240 regnum (nth 1 attr) |
|
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
241 attrname (nth 2 attr) |
|
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
242 type (nth 3 attr) |
|
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
243 regexp (concat diary-glob-file-regexp-prefix regexp)) |
|
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
244 (setq attrvalue nil) |
|
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
245 (if (re-search-forward regexp (point-max) t) |
|
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
246 (setq attrvalue (buffer-substring-no-properties |
|
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
247 (match-beginning regnum) |
|
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
248 (match-end regnum)))) |
|
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
249 (if (and attrvalue |
|
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
250 (setq attrvalue (diary-attrtype-convert attrvalue type))) |
|
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
251 (setq ret-attr (append ret-attr (list attrname attrvalue)))) |
|
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
252 (setq attr-list (cdr attr-list))) |
|
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
253 (setq fileglobattrs ret-attr)) |
|
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
254 (progn |
|
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
255 (setq ret-attr fileglobattrs |
|
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
256 attr-list diary-face-attrs) |
|
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
257 (while attr-list |
|
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
258 (goto-char (point-min)) |
|
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
259 (setq attr (car attr-list) |
|
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
260 regexp (nth 0 attr) |
|
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
261 regnum (nth 1 attr) |
|
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
262 attrname (nth 2 attr) |
|
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
263 type (nth 3 attr)) |
|
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
264 (setq attrvalue nil) |
|
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
265 (if (string-match regexp entry) |
|
50699
fa4e7ecda348
(fancy-diary-display-mode): Bind "q" to `quit-window'
Sam Steingold <sds@gnu.org>
parents:
49737
diff
changeset
|
266 (progn |
|
49737
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
267 (setq attrvalue (substring-no-properties entry |
|
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
268 (match-beginning regnum) |
|
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
269 (match-end regnum))) |
|
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
270 (setq entry (replace-match "" t t entry)))) |
|
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
271 (if (and attrvalue |
|
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
272 (setq attrvalue (diary-attrtype-convert attrvalue type))) |
|
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
273 (setq ret-attr (append ret-attr (list attrname attrvalue)))) |
|
50904
44fe653dccdb
(diary-pull-attrs): Make `ret-attr', `attr' local.
Glenn Morris <rgm@gnu.org>
parents:
50699
diff
changeset
|
274 (setq attr-list (cdr attr-list))))) |
|
44fe653dccdb
(diary-pull-attrs): Make `ret-attr', `attr' local.
Glenn Morris <rgm@gnu.org>
parents:
50699
diff
changeset
|
275 (list entry ret-attr)))) |
|
50699
fa4e7ecda348
(fancy-diary-display-mode): Bind "q" to `quit-window'
Sam Steingold <sds@gnu.org>
parents:
49737
diff
changeset
|
276 |
|
fa4e7ecda348
(fancy-diary-display-mode): Bind "q" to `quit-window'
Sam Steingold <sds@gnu.org>
parents:
49737
diff
changeset
|
277 |
|
52412
58f90e8a7543
(diary-header-line-flag, diary-header-line-format): New variables.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
278 ;; This can be removed once the kill/yank treatment of invisible text |
|
58f90e8a7543
(diary-header-line-flag, diary-header-line-format): New variables.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
279 ;; (see etc/TODO) is fixed. -- gm |
|
58f90e8a7543
(diary-header-line-flag, diary-header-line-format): New variables.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
280 (defcustom diary-header-line-flag t |
|
58f90e8a7543
(diary-header-line-flag, diary-header-line-format): New variables.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
281 "*If non-nil, `simple-diary-display' will show a header line. |
|
58f90e8a7543
(diary-header-line-flag, diary-header-line-format): New variables.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
282 The format of the header is specified by `diary-header-line-format'." |
|
58f90e8a7543
(diary-header-line-flag, diary-header-line-format): New variables.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
283 :group 'diary |
|
58f90e8a7543
(diary-header-line-flag, diary-header-line-format): New variables.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
284 :type 'boolean |
|
58f90e8a7543
(diary-header-line-flag, diary-header-line-format): New variables.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
285 :version "21.4") |
|
58f90e8a7543
(diary-header-line-flag, diary-header-line-format): New variables.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
286 |
|
58f90e8a7543
(diary-header-line-flag, diary-header-line-format): New variables.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
287 (defcustom diary-header-line-format |
|
58f90e8a7543
(diary-header-line-flag, diary-header-line-format): New variables.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
288 '(:eval (calendar-string-spread |
|
58f90e8a7543
(diary-header-line-flag, diary-header-line-format): New variables.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
289 (list (if selective-display |
|
58f90e8a7543
(diary-header-line-flag, diary-header-line-format): New variables.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
290 "Selective display active - press \"s\" in calendar \ |
|
58f90e8a7543
(diary-header-line-flag, diary-header-line-format): New variables.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
291 before edit/copy" |
|
58f90e8a7543
(diary-header-line-flag, diary-header-line-format): New variables.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
292 "Diary")) |
|
58f90e8a7543
(diary-header-line-flag, diary-header-line-format): New variables.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
293 ?\ (frame-width))) |
|
58f90e8a7543
(diary-header-line-flag, diary-header-line-format): New variables.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
294 "*Format of the header line displayed by `simple-diary-display'. |
|
58f90e8a7543
(diary-header-line-flag, diary-header-line-format): New variables.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
295 Only used if `diary-header-line-flag' is non-nil." |
|
58f90e8a7543
(diary-header-line-flag, diary-header-line-format): New variables.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
296 :group 'diary |
|
58f90e8a7543
(diary-header-line-flag, diary-header-line-format): New variables.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
297 :type 'sexp |
|
58f90e8a7543
(diary-header-line-flag, diary-header-line-format): New variables.
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
298 :version "21.4") |
|
49737
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
299 |
| 57255 | 300 (defvar diary-saved-point) ; internal |
| 301 | |
| 13053 | 302 (defun list-diary-entries (date number) |
| 303 "Create and display a buffer containing the relevant lines in diary-file. | |
| 304 The arguments are DATE and NUMBER; the entries selected are those | |
| 305 for NUMBER days starting with date DATE. The other entries are hidden | |
| 53557 | 306 using selective display. If NUMBER is less than 1, this function does nothing. |
| 13053 | 307 |
| 308 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
|
309 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
|
310 \(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
|
311 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
|
312 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
|
313 for a date with no diary entries. |
| 13053 | 314 |
| 315 After the list is prepared, the hooks `nongregorian-diary-listing-hook', | |
| 316 `list-diary-entries-hook', `diary-display-hook', and `diary-hook' are run. | |
| 317 These hooks have the following distinct roles: | |
| 318 | |
| 319 `nongregorian-diary-listing-hook' can cull dates from the diary | |
| 320 and each included file. Usually used for Hebrew or Islamic | |
| 321 diary entries in files. Applied to *each* file. | |
| 322 | |
| 323 `list-diary-entries-hook' adds or manipulates diary entries from | |
| 324 external sources. Used, for example, to include diary entries | |
| 325 from other files or to sort the diary entries. Invoked *once* only, | |
| 326 before the display hook is run. | |
| 327 | |
| 328 `diary-display-hook' does the actual display of information. If this is | |
| 329 nil, simple-diary-display will be used. Use add-hook to set this to | |
| 330 fancy-diary-display, if desired. If you want no diary display, use | |
| 331 add-hook to set this to ignore. | |
| 332 | |
| 333 `diary-hook' is run last. This can be used for an appointment | |
| 334 notification function." | |
| 335 | |
| 53557 | 336 (when (> number 0) |
| 337 (let ((original-date date);; save for possible use in the hooks | |
| 338 old-diary-syntax-table | |
| 339 diary-entries-list | |
| 340 file-glob-attrs | |
| 341 (date-string (calendar-date-string date)) | |
| 342 (d-file (substitute-in-file-name diary-file))) | |
| 343 (message "Preparing diary...") | |
| 344 (save-excursion | |
| 345 (let ((diary-buffer (find-buffer-visiting d-file))) | |
| 346 (if (not diary-buffer) | |
| 347 (set-buffer (find-file-noselect d-file t)) | |
| 348 (set-buffer diary-buffer) | |
| 349 (or (verify-visited-file-modtime diary-buffer) | |
| 350 (revert-buffer t t)))) | |
| 57255 | 351 ;; d-s-p is passed to the diary display function. |
| 352 (let ((diary-saved-point (point))) | |
| 353 (save-excursion | |
| 354 (setq file-glob-attrs (nth 1 (diary-pull-attrs nil ""))) | |
| 355 (setq selective-display t) | |
| 356 (setq selective-display-ellipses nil) | |
| 357 (if diary-header-line-flag | |
| 358 (setq header-line-format diary-header-line-format)) | |
| 359 (setq old-diary-syntax-table (syntax-table)) | |
| 360 (set-syntax-table diary-syntax-table) | |
| 361 (unwind-protect | |
| 362 (let ((buffer-read-only nil) | |
| 363 (diary-modified (buffer-modified-p)) | |
| 364 (mark (regexp-quote diary-nonmarking-symbol))) | |
| 365 ;; First and last characters must be ^M or \n for | |
| 366 ;; selective display to work properly | |
| 367 (goto-char (1- (point-max))) | |
| 368 (if (not (looking-at "\^M\\|\n")) | |
| 369 (progn | |
| 370 (goto-char (point-max)) | |
| 371 (insert "\^M"))) | |
| 372 (goto-char (point-min)) | |
| 373 (if (not (looking-at "\^M\\|\n")) | |
| 374 (insert "\^M")) | |
| 375 (subst-char-in-region (point-min) (point-max) ?\n ?\^M t) | |
| 376 (calendar-for-loop | |
| 377 i from 1 to number do | |
| 378 (let ((d diary-date-forms) | |
| 379 (month (extract-calendar-month date)) | |
| 380 (day (extract-calendar-day date)) | |
| 381 (year (extract-calendar-year date)) | |
| 382 (entry-found (list-sexp-diary-entries date))) | |
| 383 (while d | |
| 384 (let* | |
| 385 ((date-form (if (equal (car (car d)) 'backup) | |
| 386 (cdr (car d)) | |
| 387 (car d))) | |
| 388 (backup (equal (car (car d)) 'backup)) | |
| 389 (dayname | |
| 390 (format "%s\\|%s\\.?" | |
| 391 (calendar-day-name date) | |
| 392 (calendar-day-name date 'abbrev))) | |
| 393 (monthname | |
| 394 (format "\\*\\|%s\\|%s\\.?" | |
| 395 (calendar-month-name month) | |
| 396 (calendar-month-name month 'abbrev))) | |
| 397 (month (concat "\\*\\|0*" (int-to-string month))) | |
| 398 (day (concat "\\*\\|0*" (int-to-string day))) | |
| 399 (year | |
| 400 (concat | |
| 401 "\\*\\|0*" (int-to-string year) | |
| 402 (if abbreviated-calendar-year | |
| 403 (concat "\\|" (format "%02d" (% year 100))) | |
| 404 ""))) | |
| 405 (regexp | |
| 406 (concat | |
| 407 "\\(\\`\\|\^M\\|\n\\)" mark "?\\(" | |
| 408 (mapconcat 'eval date-form "\\)\\(") | |
| 409 "\\)")) | |
| 410 (case-fold-search t)) | |
| 411 (goto-char (point-min)) | |
| 412 (while (re-search-forward regexp nil t) | |
| 413 (if backup (re-search-backward "\\<" nil t)) | |
| 414 (if (and (or (char-equal (preceding-char) ?\^M) | |
| 415 (char-equal (preceding-char) ?\n)) | |
| 416 (not (looking-at " \\|\^I"))) | |
| 417 ;; Diary entry that consists only of date. | |
| 418 (backward-char 1) | |
| 419 ;; Found a nonempty diary entry--make it | |
| 420 ;; visible and add it to the list. | |
| 421 (setq entry-found t) | |
| 422 (let ((entry-start (point)) | |
| 423 date-start temp) | |
| 424 (re-search-backward "\^M\\|\n\\|\\`") | |
| 425 (setq date-start (point)) | |
| 426 (re-search-forward "\^M\\|\n" nil t 2) | |
| 427 (while (looking-at " \\|\^I") | |
| 428 (re-search-forward "\^M\\|\n" nil t)) | |
| 429 (backward-char 1) | |
| 430 (subst-char-in-region date-start | |
| 431 (point) ?\^M ?\n t) | |
| 432 (setq entry (buffer-substring entry-start (point)) | |
| 433 temp (diary-pull-attrs entry file-glob-attrs) | |
| 434 entry (nth 0 temp)) | |
| 435 (add-to-diary-list | |
| 436 date | |
| 437 entry | |
| 438 (buffer-substring | |
| 439 (1+ date-start) (1- entry-start)) | |
| 440 (copy-marker entry-start) (nth 1 temp)))))) | |
| 441 (setq d (cdr d))) | |
| 442 (or entry-found | |
| 443 (not diary-list-include-blanks) | |
| 444 (setq diary-entries-list | |
| 445 (append diary-entries-list | |
| 446 (list (list date "" "" "" ""))))) | |
| 447 (setq date | |
| 448 (calendar-gregorian-from-absolute | |
| 449 (1+ (calendar-absolute-from-gregorian date)))) | |
| 450 (setq entry-found nil))) | |
| 451 (set-buffer-modified-p diary-modified)) | |
| 452 (set-syntax-table old-diary-syntax-table)) | |
| 453 (goto-char (point-min)) | |
| 454 (run-hooks 'nongregorian-diary-listing-hook | |
| 455 'list-diary-entries-hook) | |
| 456 (if diary-display-hook | |
| 457 (run-hooks 'diary-display-hook) | |
| 458 (simple-diary-display)) | |
| 459 (run-hooks 'diary-hook) | |
| 460 diary-entries-list)))))) | |
| 13053 | 461 |
| 462 (defun include-other-diary-files () | |
| 463 "Include the diary entries from other diary files with those of diary-file. | |
| 464 This function is suitable for use in `list-diary-entries-hook'; | |
| 465 it enables you to use shared diary files together with your own. | |
| 466 The files included are specified in the diaryfile by lines of this form: | |
| 467 #include \"filename\" | |
| 468 This is recursive; that is, #include directives in diary files thus included | |
| 469 are obeyed. You can change the `#include' to some other string by | |
| 470 changing the variable `diary-include-string'." | |
| 471 (goto-char (point-min)) | |
| 472 (while (re-search-forward | |
| 473 (concat | |
| 474 "\\(\\`\\|\^M\\|\n\\)" | |
| 475 (regexp-quote diary-include-string) | |
| 476 " \"\\([^\"]*\\)\"") | |
| 477 nil t) | |
|
27842
cfa579c1229f
(include-other-diary-files): Undo the selective
Gerd Moellmann <gerd@gnu.org>
parents:
26330
diff
changeset
|
478 (let* ((diary-file (substitute-in-file-name |
|
cfa579c1229f
(include-other-diary-files): Undo the selective
Gerd Moellmann <gerd@gnu.org>
parents:
26330
diff
changeset
|
479 (buffer-substring-no-properties |
|
cfa579c1229f
(include-other-diary-files): Undo the selective
Gerd Moellmann <gerd@gnu.org>
parents:
26330
diff
changeset
|
480 (match-beginning 2) (match-end 2)))) |
|
cfa579c1229f
(include-other-diary-files): Undo the selective
Gerd Moellmann <gerd@gnu.org>
parents:
26330
diff
changeset
|
481 (diary-list-include-blanks nil) |
|
cfa579c1229f
(include-other-diary-files): Undo the selective
Gerd Moellmann <gerd@gnu.org>
parents:
26330
diff
changeset
|
482 (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
|
483 (diary-display-hook 'ignore) |
|
cfa579c1229f
(include-other-diary-files): Undo the selective
Gerd Moellmann <gerd@gnu.org>
parents:
26330
diff
changeset
|
484 (diary-hook nil) |
|
cfa579c1229f
(include-other-diary-files): Undo the selective
Gerd Moellmann <gerd@gnu.org>
parents:
26330
diff
changeset
|
485 (d-buffer (find-buffer-visiting diary-file)) |
|
cfa579c1229f
(include-other-diary-files): Undo the selective
Gerd Moellmann <gerd@gnu.org>
parents:
26330
diff
changeset
|
486 (diary-modified (if d-buffer |
|
cfa579c1229f
(include-other-diary-files): Undo the selective
Gerd Moellmann <gerd@gnu.org>
parents:
26330
diff
changeset
|
487 (save-excursion |
|
cfa579c1229f
(include-other-diary-files): Undo the selective
Gerd Moellmann <gerd@gnu.org>
parents:
26330
diff
changeset
|
488 (set-buffer d-buffer) |
|
cfa579c1229f
(include-other-diary-files): Undo the selective
Gerd Moellmann <gerd@gnu.org>
parents:
26330
diff
changeset
|
489 (buffer-modified-p))))) |
| 13053 | 490 (if (file-exists-p diary-file) |
| 491 (if (file-readable-p diary-file) | |
| 492 (unwind-protect | |
| 493 (setq diary-entries-list | |
| 494 (append diary-entries-list | |
| 495 (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
|
496 (save-excursion |
|
dc6ae1a1331c
(include-other-diary-files): Fix the fix of
Gerd Moellmann <gerd@gnu.org>
parents:
27918
diff
changeset
|
497 (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
|
498 (let ((inhibit-read-only t)) |
|
a3338547dad4
(include-other-diary-files): Allow modifying
Richard M. Stallman <rms@gnu.org>
parents:
43646
diff
changeset
|
499 (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
|
500 (setq selective-display nil) |
|
dc6ae1a1331c
(include-other-diary-files): Fix the fix of
Gerd Moellmann <gerd@gnu.org>
parents:
27918
diff
changeset
|
501 (set-buffer-modified-p diary-modified))) |
| 13053 | 502 (beep) |
| 503 (message "Can't read included diary file %s" diary-file) | |
| 504 (sleep-for 2)) | |
| 505 (beep) | |
| 506 (message "Can't find included diary file %s" diary-file) | |
| 507 (sleep-for 2)))) | |
| 508 (goto-char (point-min))) | |
| 509 | |
| 510 (defun simple-diary-display () | |
| 511 "Display the diary buffer if there are any relevant entries or holidays." | |
| 512 (let* ((holiday-list (if holidays-in-diary-buffer | |
| 513 (check-calendar-holidays original-date))) | |
|
52319
c701edc37ab5
(simple-diary-display, make-diary-entry): Allow the diary to pop up a
Glenn Morris <rgm@gnu.org>
parents:
52117
diff
changeset
|
514 (hol-string (format "%s%s%s" |
|
c701edc37ab5
(simple-diary-display, make-diary-entry): Allow the diary to pop up a
Glenn Morris <rgm@gnu.org>
parents:
52117
diff
changeset
|
515 date-string |
|
c701edc37ab5
(simple-diary-display, make-diary-entry): Allow the diary to pop up a
Glenn Morris <rgm@gnu.org>
parents:
52117
diff
changeset
|
516 (if holiday-list ": " "") |
|
c701edc37ab5
(simple-diary-display, make-diary-entry): Allow the diary to pop up a
Glenn Morris <rgm@gnu.org>
parents:
52117
diff
changeset
|
517 (mapconcat 'identity holiday-list "; "))) |
|
c701edc37ab5
(simple-diary-display, make-diary-entry): Allow the diary to pop up a
Glenn Morris <rgm@gnu.org>
parents:
52117
diff
changeset
|
518 (msg (format "No diary entries for %s" hol-string)) |
|
c701edc37ab5
(simple-diary-display, make-diary-entry): Allow the diary to pop up a
Glenn Morris <rgm@gnu.org>
parents:
52117
diff
changeset
|
519 ;; If selected window is dedicated (to the calendar), |
|
c701edc37ab5
(simple-diary-display, make-diary-entry): Allow the diary to pop up a
Glenn Morris <rgm@gnu.org>
parents:
52117
diff
changeset
|
520 ;; need a new one to display the diary. |
|
c701edc37ab5
(simple-diary-display, make-diary-entry): Allow the diary to pop up a
Glenn Morris <rgm@gnu.org>
parents:
52117
diff
changeset
|
521 (pop-up-frames (window-dedicated-p (selected-window)))) |
|
c701edc37ab5
(simple-diary-display, make-diary-entry): Allow the diary to pop up a
Glenn Morris <rgm@gnu.org>
parents:
52117
diff
changeset
|
522 (calendar-set-mode-line (format "Diary for %s" hol-string)) |
| 13053 | 523 (if (or (not diary-entries-list) |
| 524 (and (not (cdr diary-entries-list)) | |
| 525 (string-equal (car (cdr (car diary-entries-list))) ""))) | |
|
52319
c701edc37ab5
(simple-diary-display, make-diary-entry): Allow the diary to pop up a
Glenn Morris <rgm@gnu.org>
parents:
52117
diff
changeset
|
526 (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
|
527 (message "%s" msg) |
| 13053 | 528 (set-buffer (get-buffer-create holiday-buffer)) |
| 529 (setq buffer-read-only nil) | |
| 530 (calendar-set-mode-line date-string) | |
| 531 (erase-buffer) | |
| 532 (insert (mapconcat 'identity holiday-list "\n")) | |
| 533 (goto-char (point-min)) | |
| 534 (set-buffer-modified-p nil) | |
| 535 (setq buffer-read-only t) | |
| 536 (display-buffer holiday-buffer) | |
| 537 (message "No diary entries for %s" date-string)) | |
| 57255 | 538 (with-current-buffer |
| 539 (find-buffer-visiting (substitute-in-file-name diary-file)) | |
| 540 (let ((window (display-buffer (current-buffer)))) | |
| 541 ;; d-s-p is passed from list-diary-entries. | |
| 542 (set-window-point window diary-saved-point) | |
| 543 (set-window-start window (point-min)))) | |
| 13053 | 544 (message "Preparing diary...done")))) |
| 545 | |
|
48365
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
546 (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
|
547 (:foreground "lightblue"))) |
|
48372
dedfe509d0ca
(diary-button-face): Add group and version number.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48365
diff
changeset
|
548 "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
|
549 :version "21.4" |
|
dedfe509d0ca
(diary-button-face): Add group and version number.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48365
diff
changeset
|
550 :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
|
551 |
|
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
552 (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
|
553 '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
|
554 '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
|
555 |
|
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
556 (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
|
557 (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
|
558 (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
|
559 (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
|
560 (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
|
561 |
| 13053 | 562 (defun fancy-diary-display () |
| 563 "Prepare a diary buffer with relevant entries in a fancy, noneditable form. | |
| 564 This function is provided for optional use as the `diary-display-hook'." | |
| 565 (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
|
566 (set-buffer (find-buffer-visiting (substitute-in-file-name diary-file))) |
| 13053 | 567 (let ((diary-modified (buffer-modified-p))) |
| 568 (subst-char-in-region (point-min) (point-max) ?\^M ?\n t) | |
| 569 (setq selective-display nil) | |
| 570 (kill-local-variable 'mode-line-format) | |
| 571 (set-buffer-modified-p diary-modified))) | |
| 572 (if (or (not diary-entries-list) | |
| 573 (and (not (cdr diary-entries-list)) | |
| 574 (string-equal (car (cdr (car diary-entries-list))) ""))) | |
| 575 (let* ((holiday-list (if holidays-in-diary-buffer | |
| 576 (check-calendar-holidays original-date))) | |
| 577 (msg (format "No diary entries for %s %s" | |
| 578 (concat date-string (if holiday-list ":" "")) | |
| 579 (mapconcat 'identity holiday-list "; ")))) | |
| 580 (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
|
581 (message "%s" msg) |
| 13053 | 582 (set-buffer (get-buffer-create holiday-buffer)) |
| 583 (setq buffer-read-only nil) | |
| 584 (erase-buffer) | |
| 585 (insert (mapconcat 'identity holiday-list "\n")) | |
| 586 (goto-char (point-min)) | |
| 587 (set-buffer-modified-p nil) | |
| 588 (setq buffer-read-only t) | |
| 589 (display-buffer holiday-buffer) | |
| 590 (message "No diary entries for %s" date-string))) | |
| 591 (save-excursion;; Prepare the fancy diary buffer. | |
| 592 (set-buffer (make-fancy-diary-buffer)) | |
| 593 (setq buffer-read-only nil) | |
| 594 (let ((entry-list diary-entries-list) | |
| 595 (holiday-list) | |
| 596 (holiday-list-last-month 1) | |
| 597 (holiday-list-last-year 1) | |
| 598 (date (list 0 0 0))) | |
| 599 (while entry-list | |
| 600 (if (not (calendar-date-equal date (car (car entry-list)))) | |
| 601 (progn | |
| 602 (setq date (car (car entry-list))) | |
| 603 (and holidays-in-diary-buffer | |
| 604 (calendar-date-compare | |
| 605 (list (list holiday-list-last-month | |
| 606 (calendar-last-day-of-month | |
| 607 holiday-list-last-month | |
| 608 holiday-list-last-year) | |
| 609 holiday-list-last-year)) | |
| 610 (list date)) | |
| 611 ;; We need to get the holidays for the next 3 months. | |
| 612 (setq holiday-list-last-month | |
| 613 (extract-calendar-month date)) | |
| 614 (setq holiday-list-last-year | |
| 615 (extract-calendar-year date)) | |
|
54127
35aa728a0635
Matthew Mundell <matt@mundell.ukfsn.org>
Glenn Morris <rgm@gnu.org>
parents:
54078
diff
changeset
|
616 (progn |
|
35aa728a0635
Matthew Mundell <matt@mundell.ukfsn.org>
Glenn Morris <rgm@gnu.org>
parents:
54078
diff
changeset
|
617 (increment-calendar-month |
|
35aa728a0635
Matthew Mundell <matt@mundell.ukfsn.org>
Glenn Morris <rgm@gnu.org>
parents:
54078
diff
changeset
|
618 holiday-list-last-month holiday-list-last-year 1) |
|
35aa728a0635
Matthew Mundell <matt@mundell.ukfsn.org>
Glenn Morris <rgm@gnu.org>
parents:
54078
diff
changeset
|
619 t) |
| 13053 | 620 (setq holiday-list |
| 621 (let ((displayed-month holiday-list-last-month) | |
| 622 (displayed-year holiday-list-last-year)) | |
| 623 (calendar-holiday-list))) | |
| 624 (increment-calendar-month | |
| 625 holiday-list-last-month holiday-list-last-year 1)) | |
| 626 (let* ((date-string (calendar-date-string date)) | |
| 627 (date-holiday-list | |
| 628 (let ((h holiday-list) | |
| 629 (d)) | |
| 630 ;; Make a list of all holidays for date. | |
| 631 (while h | |
| 632 (if (calendar-date-equal date (car (car h))) | |
| 633 (setq d (append d (cdr (car h))))) | |
| 634 (setq h (cdr h))) | |
| 635 d))) | |
| 636 (insert (if (= (point) (point-min)) "" ?\n) date-string) | |
| 637 (if date-holiday-list (insert ": ")) | |
|
14954
a9102c34a5b6
Fix length of separator string.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
14687
diff
changeset
|
638 (let* ((l (current-column)) |
|
a9102c34a5b6
Fix length of separator string.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
14687
diff
changeset
|
639 (longest 0)) |
|
28615
4c6883cb70ab
(fancy-diary-display, mark-diary-entries)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28575
diff
changeset
|
640 (insert (mapconcat (lambda (x) |
|
4c6883cb70ab
(fancy-diary-display, mark-diary-entries)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28575
diff
changeset
|
641 (if (< longest (length x)) |
|
4c6883cb70ab
(fancy-diary-display, mark-diary-entries)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28575
diff
changeset
|
642 (setq longest (length x))) |
|
4c6883cb70ab
(fancy-diary-display, mark-diary-entries)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28575
diff
changeset
|
643 x) |
|
14954
a9102c34a5b6
Fix length of separator string.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
14687
diff
changeset
|
644 date-holiday-list |
|
a9102c34a5b6
Fix length of separator string.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
14687
diff
changeset
|
645 (concat "\n" (make-string l ? )))) |
|
a9102c34a5b6
Fix length of separator string.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
14687
diff
changeset
|
646 (insert ?\n (make-string (+ l longest) ?=) ?\n))))) |
|
49737
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
647 |
|
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
648 (setq entry (car (cdr (car entry-list)))) |
|
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
649 (if (< 0 (length entry)) |
|
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
650 (progn |
|
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
651 (if (nth 3 (car entry-list)) |
|
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
652 (insert-button (concat entry "\n") |
|
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
653 'marker (nth 3 (car entry-list)) |
|
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
654 :type 'diary-entry) |
|
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
655 (insert entry ?\n)) |
|
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
656 (save-excursion |
|
50904
44fe653dccdb
(diary-pull-attrs): Make `ret-attr', `attr' local.
Glenn Morris <rgm@gnu.org>
parents:
50699
diff
changeset
|
657 (let* ((marks (nth 4 (car entry-list))) |
|
44fe653dccdb
(diary-pull-attrs): Make `ret-attr', `attr' local.
Glenn Morris <rgm@gnu.org>
parents:
50699
diff
changeset
|
658 (temp-face (make-symbol |
|
44fe653dccdb
(diary-pull-attrs): Make `ret-attr', `attr' local.
Glenn Morris <rgm@gnu.org>
parents:
50699
diff
changeset
|
659 (apply |
|
44fe653dccdb
(diary-pull-attrs): Make `ret-attr', `attr' local.
Glenn Morris <rgm@gnu.org>
parents:
50699
diff
changeset
|
660 'concat "temp-face-" |
|
44fe653dccdb
(diary-pull-attrs): Make `ret-attr', `attr' local.
Glenn Morris <rgm@gnu.org>
parents:
50699
diff
changeset
|
661 (mapcar '(lambda (sym) |
|
44fe653dccdb
(diary-pull-attrs): Make `ret-attr', `attr' local.
Glenn Morris <rgm@gnu.org>
parents:
50699
diff
changeset
|
662 (if (stringp sym) |
|
44fe653dccdb
(diary-pull-attrs): Make `ret-attr', `attr' local.
Glenn Morris <rgm@gnu.org>
parents:
50699
diff
changeset
|
663 sym |
|
44fe653dccdb
(diary-pull-attrs): Make `ret-attr', `attr' local.
Glenn Morris <rgm@gnu.org>
parents:
50699
diff
changeset
|
664 (symbol-name sym))) |
|
44fe653dccdb
(diary-pull-attrs): Make `ret-attr', `attr' local.
Glenn Morris <rgm@gnu.org>
parents:
50699
diff
changeset
|
665 marks)))) |
| 53557 | 666 (faceinfo marks)) |
| 667 (make-face temp-face) | |
|
53548
65fe9b0d6ac6
(diary-entry-time): Also accept time in the form XX[.XX][am/pm/AM/PM].
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52412
diff
changeset
|
668 ;; Remove :face info from the marks, |
|
50904
44fe653dccdb
(diary-pull-attrs): Make `ret-attr', `attr' local.
Glenn Morris <rgm@gnu.org>
parents:
50699
diff
changeset
|
669 ;; copy the face info into temp-face |
|
44fe653dccdb
(diary-pull-attrs): Make `ret-attr', `attr' local.
Glenn Morris <rgm@gnu.org>
parents:
50699
diff
changeset
|
670 (while (setq faceinfo (memq :face faceinfo)) |
|
44fe653dccdb
(diary-pull-attrs): Make `ret-attr', `attr' local.
Glenn Morris <rgm@gnu.org>
parents:
50699
diff
changeset
|
671 (copy-face (read (nth 1 faceinfo)) temp-face) |
|
44fe653dccdb
(diary-pull-attrs): Make `ret-attr', `attr' local.
Glenn Morris <rgm@gnu.org>
parents:
50699
diff
changeset
|
672 (setcar faceinfo nil) |
|
44fe653dccdb
(diary-pull-attrs): Make `ret-attr', `attr' local.
Glenn Morris <rgm@gnu.org>
parents:
50699
diff
changeset
|
673 (setcar (cdr faceinfo) nil)) |
|
44fe653dccdb
(diary-pull-attrs): Make `ret-attr', `attr' local.
Glenn Morris <rgm@gnu.org>
parents:
50699
diff
changeset
|
674 (setq marks (delq nil marks)) |
|
49737
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
675 ;; Apply the font aspects |
|
50904
44fe653dccdb
(diary-pull-attrs): Make `ret-attr', `attr' local.
Glenn Morris <rgm@gnu.org>
parents:
50699
diff
changeset
|
676 (apply 'set-face-attribute temp-face nil marks) |
|
44fe653dccdb
(diary-pull-attrs): Make `ret-attr', `attr' local.
Glenn Morris <rgm@gnu.org>
parents:
50699
diff
changeset
|
677 (search-backward entry) |
|
44fe653dccdb
(diary-pull-attrs): Make `ret-attr', `attr' local.
Glenn Morris <rgm@gnu.org>
parents:
50699
diff
changeset
|
678 (overlay-put |
|
44fe653dccdb
(diary-pull-attrs): Make `ret-attr', `attr' local.
Glenn Morris <rgm@gnu.org>
parents:
50699
diff
changeset
|
679 (make-overlay (match-beginning 0) (match-end 0)) |
|
44fe653dccdb
(diary-pull-attrs): Make `ret-attr', `attr' local.
Glenn Morris <rgm@gnu.org>
parents:
50699
diff
changeset
|
680 'face temp-face))))) |
|
49737
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
681 (setq entry-list (cdr entry-list)))) |
| 13053 | 682 (set-buffer-modified-p nil) |
| 683 (goto-char (point-min)) | |
| 684 (setq buffer-read-only t) | |
| 685 (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
|
686 (fancy-diary-display-mode) |
| 54537 | 687 (calendar-set-mode-line date-string) |
| 13053 | 688 (message "Preparing diary...done")))) |
| 689 | |
| 690 (defun make-fancy-diary-buffer () | |
| 691 "Create and return the initial fancy diary buffer." | |
| 692 (save-excursion | |
| 693 (set-buffer (get-buffer-create fancy-diary-buffer)) | |
| 694 (setq buffer-read-only nil) | |
| 695 (calendar-set-mode-line "Diary Entries") | |
| 696 (erase-buffer) | |
| 697 (set-buffer-modified-p nil) | |
| 698 (setq buffer-read-only t) | |
| 699 (get-buffer fancy-diary-buffer))) | |
| 700 | |
| 701 (defun print-diary-entries () | |
| 702 "Print a hard copy of the diary display. | |
| 703 | |
| 704 If the simple diary display is being used, prepare a temp buffer with the | |
| 705 visible lines of the diary buffer, add a heading line composed from the mode | |
| 706 line, print the temp buffer, and destroy it. | |
| 707 | |
| 708 If the fancy diary display is being used, just print the buffer. | |
| 709 | |
| 710 The hooks given by the variable `print-diary-entries-hook' are called to do | |
| 711 the actual printing." | |
| 712 (interactive) | |
| 713 (if (bufferp (get-buffer fancy-diary-buffer)) | |
| 714 (save-excursion | |
| 715 (set-buffer (get-buffer fancy-diary-buffer)) | |
| 716 (run-hooks 'print-diary-entries-hook)) | |
| 717 (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
|
718 (find-buffer-visiting (substitute-in-file-name diary-file)))) |
| 13053 | 719 (if diary-buffer |
| 720 (let ((temp-buffer (get-buffer-create "*Printable Diary Entries*")) | |
| 721 (heading)) | |
| 722 (save-excursion | |
| 723 (set-buffer diary-buffer) | |
| 724 (setq heading | |
| 725 (if (not (stringp mode-line-format)) | |
| 726 "All Diary Entries" | |
| 727 (string-match "^-*\\([^-].*[^-]\\)-*$" mode-line-format) | |
| 728 (substring mode-line-format | |
| 729 (match-beginning 1) (match-end 1)))) | |
| 730 (copy-to-buffer temp-buffer (point-min) (point-max)) | |
| 731 (set-buffer temp-buffer) | |
| 732 (while (re-search-forward "\^M.*$" nil t) | |
| 733 (replace-match "")) | |
| 734 (goto-char (point-min)) | |
| 735 (insert heading "\n" | |
| 736 (make-string (length heading) ?=) "\n") | |
| 737 (run-hooks 'print-diary-entries-hook) | |
| 738 (kill-buffer temp-buffer))) | |
| 739 (error "You don't have a diary buffer!"))))) | |
| 740 | |
| 741 (defun show-all-diary-entries () | |
| 742 "Show all of the diary entries in the diary file. | |
| 743 This function gets rid of the selective display of the diary file so that | |
| 744 all entries, not just some, are visible. If there is no diary buffer, one | |
| 745 is created." | |
| 746 (interactive) | |
| 53557 | 747 (let ((d-file (diary-check-diary-file)) |
| 748 (pop-up-frames (window-dedicated-p (selected-window)))) | |
|
51640
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
749 (save-excursion |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
750 (set-buffer (or (find-buffer-visiting d-file) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
751 (find-file-noselect d-file t))) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
752 (let ((buffer-read-only nil) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
753 (diary-modified (buffer-modified-p))) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
754 (subst-char-in-region (point-min) (point-max) ?\^M ?\n t) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
755 (setq selective-display nil |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
756 mode-line-format default-mode-line-format) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
757 (display-buffer (current-buffer)) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
758 (set-buffer-modified-p diary-modified))))) |
|
20345
69818ee01344
(diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
20269
diff
changeset
|
759 |
|
39615
4287ce76bf9f
(diary-entry-compare): When times are identical, compare the entries
Sam Steingold <sds@gnu.org>
parents:
38422
diff
changeset
|
760 (defcustom diary-mail-addr |
|
51640
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
761 (if (boundp 'user-mail-address) user-mail-address "") |
|
20345
69818ee01344
(diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
20269
diff
changeset
|
762 "*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
|
763 :group 'diary |
|
51640
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
764 :type 'string |
|
21668
621dd51298ec
*** empty log message ***
Dan Nicolaescu <done@ece.arizona.edu>
parents:
20354
diff
changeset
|
765 :version "20.3") |
|
20345
69818ee01344
(diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
20269
diff
changeset
|
766 |
|
69818ee01344
(diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
20269
diff
changeset
|
767 (defcustom diary-mail-days 7 |
|
51640
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
768 "*Default number of days for `diary-mail-entries' to check." |
|
20345
69818ee01344
(diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
20269
diff
changeset
|
769 :group 'diary |
|
21668
621dd51298ec
*** empty log message ***
Dan Nicolaescu <done@ece.arizona.edu>
parents:
20354
diff
changeset
|
770 :type 'integer |
|
621dd51298ec
*** empty log message ***
Dan Nicolaescu <done@ece.arizona.edu>
parents:
20354
diff
changeset
|
771 :version "20.3") |
|
20345
69818ee01344
(diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
20269
diff
changeset
|
772 |
|
21957
a74e1cee89bf
(diary-mail-entries): Add autoload cookie.
Richard M. Stallman <rms@gnu.org>
parents:
21893
diff
changeset
|
773 ;;;###autoload |
|
20345
69818ee01344
(diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
20269
diff
changeset
|
774 (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
|
775 "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
|
776 If no prefix argument is given, NDAYS is set to `diary-mail-days'. |
|
51640
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
777 Mail is sent to the address specified by `diary-mail-addr'. |
|
20345
69818ee01344
(diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
20269
diff
changeset
|
778 |
|
69818ee01344
(diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
20269
diff
changeset
|
779 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
|
780 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
|
781 `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
|
782 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
|
783 |
|
69818ee01344
(diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
20269
diff
changeset
|
784 #!/bin/sh |
|
69818ee01344
(diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
20269
diff
changeset
|
785 # 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
|
786 emacs -batch \\ |
|
69818ee01344
(diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
20269
diff
changeset
|
787 -eval \"(setq diary-mail-days 3 \\ |
|
51640
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
788 diary-file \\\"/path/to/diary.file\\\" \\ |
|
20345
69818ee01344
(diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
20269
diff
changeset
|
789 european-calendar-style t \\ |
|
69818ee01344
(diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
20269
diff
changeset
|
790 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
|
791 -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
|
792 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
|
793 |
|
69818ee01344
(diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
20269
diff
changeset
|
794 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
|
795 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
|
796 0 1 * * * diary-rem.sh |
|
69818ee01344
(diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
20269
diff
changeset
|
797 to run it every morning at 1am." |
|
35500
38b437f4134e
(diary-float): Fix case of MONTH
Gerd Moellmann <gerd@gnu.org>
parents:
34036
diff
changeset
|
798 (interactive "P") |
|
51640
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
799 (if (string-equal diary-mail-addr "") |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
800 (error "You must set `diary-mail-addr' to use this command") |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
801 (let ((diary-display-hook 'fancy-diary-display)) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
802 (list-diary-entries (calendar-current-date) (or ndays diary-mail-days))) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
803 (compose-mail diary-mail-addr |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
804 (concat "Diary entries generated " |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
805 (calendar-date-string (calendar-current-date)))) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
806 (insert |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
807 (if (get-buffer fancy-diary-buffer) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
808 (save-excursion |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
809 (set-buffer fancy-diary-buffer) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
810 (buffer-substring (point-min) (point-max))) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
811 "No entries found")) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
812 (call-interactively (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
|
813 |
|
52117
e8a77526768b
(list-diary-entries): Adapt for new behaviour of `calendar-day-name'
Glenn Morris <rgm@gnu.org>
parents:
51640
diff
changeset
|
814 (defun diary-name-pattern (string-array &optional abbrev-array paren) |
|
e8a77526768b
(list-diary-entries): Adapt for new behaviour of `calendar-day-name'
Glenn Morris <rgm@gnu.org>
parents:
51640
diff
changeset
|
815 "Return a regexp matching the strings in the array STRING-ARRAY. |
|
e8a77526768b
(list-diary-entries): Adapt for new behaviour of `calendar-day-name'
Glenn Morris <rgm@gnu.org>
parents:
51640
diff
changeset
|
816 If the optional argument ABBREV-ARRAY is present, then the function |
|
e8a77526768b
(list-diary-entries): Adapt for new behaviour of `calendar-day-name'
Glenn Morris <rgm@gnu.org>
parents:
51640
diff
changeset
|
817 `calendar-abbrev-construct' is used to construct abbreviations from the |
|
e8a77526768b
(list-diary-entries): Adapt for new behaviour of `calendar-day-name'
Glenn Morris <rgm@gnu.org>
parents:
51640
diff
changeset
|
818 two supplied arrays. The returned regexp will then also match these |
|
e8a77526768b
(list-diary-entries): Adapt for new behaviour of `calendar-day-name'
Glenn Morris <rgm@gnu.org>
parents:
51640
diff
changeset
|
819 abbreviations, with or without final `.' characters. If the optional |
|
e8a77526768b
(list-diary-entries): Adapt for new behaviour of `calendar-day-name'
Glenn Morris <rgm@gnu.org>
parents:
51640
diff
changeset
|
820 argument PAREN is non-nil, the regexp is surrounded by parentheses." |
|
e8a77526768b
(list-diary-entries): Adapt for new behaviour of `calendar-day-name'
Glenn Morris <rgm@gnu.org>
parents:
51640
diff
changeset
|
821 (regexp-opt (append string-array |
|
e8a77526768b
(list-diary-entries): Adapt for new behaviour of `calendar-day-name'
Glenn Morris <rgm@gnu.org>
parents:
51640
diff
changeset
|
822 (if abbrev-array |
|
e8a77526768b
(list-diary-entries): Adapt for new behaviour of `calendar-day-name'
Glenn Morris <rgm@gnu.org>
parents:
51640
diff
changeset
|
823 (calendar-abbrev-construct abbrev-array |
|
e8a77526768b
(list-diary-entries): Adapt for new behaviour of `calendar-day-name'
Glenn Morris <rgm@gnu.org>
parents:
51640
diff
changeset
|
824 string-array)) |
|
e8a77526768b
(list-diary-entries): Adapt for new behaviour of `calendar-day-name'
Glenn Morris <rgm@gnu.org>
parents:
51640
diff
changeset
|
825 (if abbrev-array |
|
e8a77526768b
(list-diary-entries): Adapt for new behaviour of `calendar-day-name'
Glenn Morris <rgm@gnu.org>
parents:
51640
diff
changeset
|
826 (calendar-abbrev-construct abbrev-array |
|
e8a77526768b
(list-diary-entries): Adapt for new behaviour of `calendar-day-name'
Glenn Morris <rgm@gnu.org>
parents:
51640
diff
changeset
|
827 string-array |
|
e8a77526768b
(list-diary-entries): Adapt for new behaviour of `calendar-day-name'
Glenn Morris <rgm@gnu.org>
parents:
51640
diff
changeset
|
828 'period)) |
|
e8a77526768b
(list-diary-entries): Adapt for new behaviour of `calendar-day-name'
Glenn Morris <rgm@gnu.org>
parents:
51640
diff
changeset
|
829 nil) |
|
e8a77526768b
(list-diary-entries): Adapt for new behaviour of `calendar-day-name'
Glenn Morris <rgm@gnu.org>
parents:
51640
diff
changeset
|
830 paren)) |
| 13053 | 831 |
| 832 (defvar marking-diary-entries nil | |
| 833 "True during the marking of diary entries, nil otherwise.") | |
| 834 | |
| 835 (defvar marking-diary-entry nil | |
| 836 "True during the marking of diary entries, if current entry is marking.") | |
| 837 | |
| 838 (defun mark-diary-entries () | |
| 839 "Mark days in the calendar window that have diary entries. | |
| 840 Each entry in the diary file visible in the calendar window is marked. | |
| 841 After the entries are marked, the hooks `nongregorian-diary-marking-hook' and | |
| 842 `mark-diary-entries-hook' are run." | |
| 843 (interactive) | |
| 844 (setq mark-diary-entries-in-calendar t) | |
|
51640
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
845 (let ((marking-diary-entries t) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
846 file-glob-attrs marks) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
847 (save-excursion |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
848 (set-buffer (find-file-noselect (diary-check-diary-file) t)) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
849 (message "Marking diary entries...") |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
850 (setq file-glob-attrs (nth 1 (diary-pull-attrs nil '()))) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
851 (let ((d diary-date-forms) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
852 (old-diary-syntax-table (syntax-table)) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
853 temp) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
854 (set-syntax-table diary-syntax-table) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
855 (while d |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
856 (let* ((date-form (if (equal (car (car d)) 'backup) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
857 (cdr (car d)) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
858 (car d)));; ignore 'backup directive |
|
52117
e8a77526768b
(list-diary-entries): Adapt for new behaviour of `calendar-day-name'
Glenn Morris <rgm@gnu.org>
parents:
51640
diff
changeset
|
859 (dayname |
|
e8a77526768b
(list-diary-entries): Adapt for new behaviour of `calendar-day-name'
Glenn Morris <rgm@gnu.org>
parents:
51640
diff
changeset
|
860 (diary-name-pattern calendar-day-name-array |
|
e8a77526768b
(list-diary-entries): Adapt for new behaviour of `calendar-day-name'
Glenn Morris <rgm@gnu.org>
parents:
51640
diff
changeset
|
861 calendar-day-abbrev-array)) |
|
51640
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
862 (monthname |
|
52117
e8a77526768b
(list-diary-entries): Adapt for new behaviour of `calendar-day-name'
Glenn Morris <rgm@gnu.org>
parents:
51640
diff
changeset
|
863 (format "%s\\|\\*" |
|
e8a77526768b
(list-diary-entries): Adapt for new behaviour of `calendar-day-name'
Glenn Morris <rgm@gnu.org>
parents:
51640
diff
changeset
|
864 (diary-name-pattern calendar-month-name-array |
|
e8a77526768b
(list-diary-entries): Adapt for new behaviour of `calendar-day-name'
Glenn Morris <rgm@gnu.org>
parents:
51640
diff
changeset
|
865 calendar-month-abbrev-array))) |
|
51640
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
866 (month "[0-9]+\\|\\*") |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
867 (day "[0-9]+\\|\\*") |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
868 (year "[0-9]+\\|\\*") |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
869 (l (length date-form)) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
870 (d-name-pos (- l (length (memq 'dayname date-form)))) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
871 (d-name-pos (if (/= l d-name-pos) (+ 2 d-name-pos))) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
872 (m-name-pos (- l (length (memq 'monthname date-form)))) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
873 (m-name-pos (if (/= l m-name-pos) (+ 2 m-name-pos))) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
874 (d-pos (- l (length (memq 'day date-form)))) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
875 (d-pos (if (/= l d-pos) (+ 2 d-pos))) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
876 (m-pos (- l (length (memq 'month date-form)))) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
877 (m-pos (if (/= l m-pos) (+ 2 m-pos))) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
878 (y-pos (- l (length (memq 'year date-form)))) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
879 (y-pos (if (/= l y-pos) (+ 2 y-pos))) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
880 (regexp |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
881 (concat |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
882 "\\(\\`\\|\^M\\|\n\\)\\(" |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
883 (mapconcat 'eval date-form "\\)\\(") |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
884 "\\)")) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
885 (case-fold-search t)) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
886 (goto-char (point-min)) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
887 (while (re-search-forward regexp nil t) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
888 (let* ((dd-name |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
889 (if d-name-pos |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
890 (buffer-substring-no-properties |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
891 (match-beginning d-name-pos) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
892 (match-end d-name-pos)))) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
893 (mm-name |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
894 (if m-name-pos |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
895 (buffer-substring-no-properties |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
896 (match-beginning m-name-pos) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
897 (match-end m-name-pos)))) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
898 (mm (string-to-int |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
899 (if m-pos |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
900 (buffer-substring-no-properties |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
901 (match-beginning m-pos) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
902 (match-end m-pos)) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
903 ""))) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
904 (dd (string-to-int |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
905 (if d-pos |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
906 (buffer-substring-no-properties |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
907 (match-beginning d-pos) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
908 (match-end d-pos)) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
909 ""))) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
910 (y-str (if y-pos |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
911 (buffer-substring-no-properties |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
912 (match-beginning y-pos) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
913 (match-end y-pos)))) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
914 (yy (if (not y-str) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
915 0 |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
916 (if (and (= (length y-str) 2) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
917 abbreviated-calendar-year) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
918 (let* ((current-y |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
919 (extract-calendar-year |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
920 (calendar-current-date))) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
921 (y (+ (string-to-int y-str) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
922 (* 100 |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
923 (/ current-y 100))))) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
924 (if (> (- y current-y) 50) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
925 (- y 100) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
926 (if (> (- current-y y) 50) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
927 (+ y 100) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
928 y))) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
929 (string-to-int y-str)))) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
930 (save-excursion |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
931 (setq entry (buffer-substring-no-properties |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
932 (point) (line-end-position)) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
933 temp (diary-pull-attrs entry file-glob-attrs) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
934 entry (nth 0 temp) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
935 marks (nth 1 temp)))) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
936 (if dd-name |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
937 (mark-calendar-days-named |
|
54078
eeaae818026b
(mark-diary-entries): Use assoc-string instead of assoc-ignore-case.
Glenn Morris <rgm@gnu.org>
parents:
53613
diff
changeset
|
938 (cdr (assoc-string |
|
52117
e8a77526768b
(list-diary-entries): Adapt for new behaviour of `calendar-day-name'
Glenn Morris <rgm@gnu.org>
parents:
51640
diff
changeset
|
939 dd-name |
|
51640
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
940 (calendar-make-alist |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
941 calendar-day-name-array |
|
54078
eeaae818026b
(mark-diary-entries): Use assoc-string instead of assoc-ignore-case.
Glenn Morris <rgm@gnu.org>
parents:
53613
diff
changeset
|
942 0 nil calendar-day-abbrev-array) t)) marks) |
|
51640
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
943 (if mm-name |
|
52117
e8a77526768b
(list-diary-entries): Adapt for new behaviour of `calendar-day-name'
Glenn Morris <rgm@gnu.org>
parents:
51640
diff
changeset
|
944 (setq mm |
|
e8a77526768b
(list-diary-entries): Adapt for new behaviour of `calendar-day-name'
Glenn Morris <rgm@gnu.org>
parents:
51640
diff
changeset
|
945 (if (string-equal mm-name "*") 0 |
|
54078
eeaae818026b
(mark-diary-entries): Use assoc-string instead of assoc-ignore-case.
Glenn Morris <rgm@gnu.org>
parents:
53613
diff
changeset
|
946 (cdr (assoc-string |
|
52117
e8a77526768b
(list-diary-entries): Adapt for new behaviour of `calendar-day-name'
Glenn Morris <rgm@gnu.org>
parents:
51640
diff
changeset
|
947 mm-name |
|
51640
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
948 (calendar-make-alist |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
949 calendar-month-name-array |
|
54078
eeaae818026b
(mark-diary-entries): Use assoc-string instead of assoc-ignore-case.
Glenn Morris <rgm@gnu.org>
parents:
53613
diff
changeset
|
950 1 nil calendar-month-abbrev-array) t))))) |
|
51640
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
951 (mark-calendar-date-pattern mm dd yy marks)))) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
952 (setq d (cdr d)))) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
953 (mark-sexp-diary-entries) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
954 (run-hooks 'nongregorian-diary-marking-hook |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
955 'mark-diary-entries-hook) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
956 (set-syntax-table old-diary-syntax-table) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
957 (message "Marking diary entries...done"))))) |
| 13053 | 958 |
| 959 (defun mark-sexp-diary-entries () | |
| 960 "Mark days in the calendar window that have sexp diary entries. | |
| 961 Each entry in the diary file (or included files) visible in the calendar window | |
| 962 is marked. See the documentation for the function `list-sexp-diary-entries'." | |
| 963 (let* ((sexp-mark (regexp-quote sexp-diary-entry-symbol)) | |
| 964 (s-entry (concat "\\(\\`\\|\^M\\|\n\\)\\(" | |
|
51640
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
965 sexp-mark "(\\)\\|\\(" |
| 13053 | 966 (regexp-quote diary-nonmarking-symbol) |
|
51640
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
967 sexp-mark "(diary-remind\\)")) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
968 (file-glob-attrs (nth 1 (diary-pull-attrs nil '()))) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
969 m y first-date last-date mark file-glob-attrs) |
| 13053 | 970 (save-excursion |
| 971 (set-buffer calendar-buffer) | |
| 972 (setq m displayed-month) | |
| 973 (setq y displayed-year)) | |
| 974 (increment-calendar-month m y -1) | |
| 975 (setq first-date | |
| 976 (calendar-absolute-from-gregorian (list m 1 y))) | |
| 977 (increment-calendar-month m y 2) | |
| 978 (setq last-date | |
| 979 (calendar-absolute-from-gregorian | |
| 980 (list m (calendar-last-day-of-month m y) y))) | |
| 981 (goto-char (point-min)) | |
| 982 (while (re-search-forward s-entry nil t) | |
|
51640
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
983 (setq marking-diary-entry (char-equal (preceding-char) ?\()) |
| 13053 | 984 (re-search-backward "(") |
| 985 (let ((sexp-start (point)) | |
|
50904
44fe653dccdb
(diary-pull-attrs): Make `ret-attr', `attr' local.
Glenn Morris <rgm@gnu.org>
parents:
50699
diff
changeset
|
986 sexp entry entry-start line-start marks) |
| 13053 | 987 (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
|
988 (setq sexp (buffer-substring-no-properties sexp-start (point))) |
| 13053 | 989 (save-excursion |
| 990 (re-search-backward "\^M\\|\n\\|\\`") | |
| 991 (setq line-start (point))) | |
| 992 (forward-char 1) | |
| 993 (if (and (or (char-equal (preceding-char) ?\^M) | |
| 994 (char-equal (preceding-char) ?\n)) | |
| 995 (not (looking-at " \\|\^I"))) | |
| 996 (progn;; Diary entry consists only of the sexp | |
| 997 (backward-char 1) | |
| 998 (setq entry "")) | |
| 999 (setq entry-start (point)) | |
|
23247
1f91824c4087
(mark-sexp-diary-entries): Fix previous chg.
Karl Heuer <kwzh@gnu.org>
parents:
23232
diff
changeset
|
1000 ;; Find end of entry |
| 13053 | 1001 (re-search-forward "\^M\\|\n" nil t) |
| 1002 (while (looking-at " \\|\^I") | |
|
23232
97332957a969
(mark-sexp-diary-entries): Avoid infinite loop when
Karl Heuer <kwzh@gnu.org>
parents:
23122
diff
changeset
|
1003 (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
|
1004 (re-search-forward "$" nil t))) |
|
23247
1f91824c4087
(mark-sexp-diary-entries): Fix previous chg.
Karl Heuer <kwzh@gnu.org>
parents:
23232
diff
changeset
|
1005 (if (or (char-equal (preceding-char) ?\^M) |
|
1f91824c4087
(mark-sexp-diary-entries): Fix previous chg.
Karl Heuer <kwzh@gnu.org>
parents:
23232
diff
changeset
|
1006 (char-equal (preceding-char) ?\n)) |
|
1f91824c4087
(mark-sexp-diary-entries): Fix previous chg.
Karl Heuer <kwzh@gnu.org>
parents:
23232
diff
changeset
|
1007 (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
|
1008 (setq entry (buffer-substring-no-properties entry-start (point))) |
| 13053 | 1009 (while (string-match "[\^M]" entry) |
| 1010 (aset entry (match-beginning 0) ?\n ))) | |
| 1011 (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
|
1012 (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
|
1013 (calendar-gregorian-from-absolute date))) |
|
49737
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
1014 (progn |
|
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
1015 (setq marks (diary-pull-attrs entry file-glob-attrs) |
|
50904
44fe653dccdb
(diary-pull-attrs): Make `ret-attr', `attr' local.
Glenn Morris <rgm@gnu.org>
parents:
50699
diff
changeset
|
1016 marks (nth 1 (diary-pull-attrs entry file-glob-attrs))) |
|
49737
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
1017 (mark-visible-calendar-date |
|
50699
fa4e7ecda348
(fancy-diary-display-mode): Bind "q" to `quit-window'
Sam Steingold <sds@gnu.org>
parents:
49737
diff
changeset
|
1018 (calendar-gregorian-from-absolute date) |
|
49737
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
1019 (if (< 0 (length marks)) |
|
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
1020 marks |
|
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
1021 (if (consp mark) |
|
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
1022 (car mark))))))))))) |
| 13053 | 1023 |
| 1024 (defun mark-included-diary-files () | |
| 1025 "Mark the diary entries from other diary files with those of the diary file. | |
| 1026 This function is suitable for use as the `mark-diary-entries-hook'; it enables | |
| 1027 you to use shared diary files together with your own. The files included are | |
| 1028 specified in the diary-file by lines of this form: | |
| 1029 #include \"filename\" | |
| 1030 This is recursive; that is, #include directives in diary files thus included | |
| 1031 are obeyed. You can change the `#include' to some other string by | |
| 1032 changing the variable `diary-include-string'." | |
| 1033 (goto-char (point-min)) | |
| 1034 (while (re-search-forward | |
| 1035 (concat | |
| 1036 "\\(\\`\\|\^M\\|\n\\)" | |
| 1037 (regexp-quote diary-include-string) | |
| 1038 " \"\\([^\"]*\\)\"") | |
| 1039 nil t) | |
| 1040 (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
|
1041 (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
|
1042 (match-beginning 2) (match-end 2)))) |
| 13053 | 1043 (mark-diary-entries-hook 'mark-included-diary-files)) |
| 1044 (if (file-exists-p diary-file) | |
| 1045 (if (file-readable-p diary-file) | |
| 1046 (progn | |
| 1047 (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
|
1048 (kill-buffer (find-buffer-visiting diary-file))) |
| 13053 | 1049 (beep) |
| 1050 (message "Can't read included diary file %s" diary-file) | |
| 1051 (sleep-for 2)) | |
| 1052 (beep) | |
| 1053 (message "Can't find included diary file %s" diary-file) | |
| 1054 (sleep-for 2)))) | |
| 1055 (goto-char (point-min))) | |
| 1056 | |
|
49737
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
1057 (defun mark-calendar-days-named (dayname &optional color) |
| 13053 | 1058 "Mark all dates in the calendar window that are day DAYNAME of the week. |
| 1059 0 means all Sundays, 1 means all Mondays, and so on." | |
| 1060 (save-excursion | |
| 1061 (set-buffer calendar-buffer) | |
| 1062 (let ((prev-month displayed-month) | |
| 1063 (prev-year displayed-year) | |
| 1064 (succ-month displayed-month) | |
| 1065 (succ-year displayed-year) | |
| 1066 (last-day) | |
| 1067 (day)) | |
| 1068 (increment-calendar-month succ-month succ-year 1) | |
| 1069 (increment-calendar-month prev-month prev-year -1) | |
| 1070 (setq day (calendar-absolute-from-gregorian | |
| 1071 (calendar-nth-named-day 1 dayname prev-month prev-year))) | |
| 1072 (setq last-day (calendar-absolute-from-gregorian | |
| 1073 (calendar-nth-named-day -1 dayname succ-month succ-year))) | |
| 1074 (while (<= day last-day) | |
|
49737
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
1075 (mark-visible-calendar-date (calendar-gregorian-from-absolute day) color) |
| 13053 | 1076 (setq day (+ day 7)))))) |
| 1077 | |
|
49737
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
1078 (defun mark-calendar-date-pattern (month day year &optional color) |
| 13053 | 1079 "Mark all dates in the calendar window that conform to MONTH/DAY/YEAR. |
| 1080 A value of 0 in any position is a wildcard." | |
| 1081 (save-excursion | |
| 1082 (set-buffer calendar-buffer) | |
| 1083 (let ((m displayed-month) | |
| 1084 (y displayed-year)) | |
| 1085 (increment-calendar-month m y -1) | |
| 1086 (calendar-for-loop i from 0 to 2 do | |
|
49737
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
1087 (mark-calendar-month m y month day year color) |
| 13053 | 1088 (increment-calendar-month m y 1))))) |
| 1089 | |
|
49737
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
1090 (defun mark-calendar-month (month year p-month p-day p-year &optional color) |
| 13053 | 1091 "Mark dates in the MONTH/YEAR that conform to pattern P-MONTH/P_DAY/P-YEAR. |
| 1092 A value of 0 in any position of the pattern is a wildcard." | |
| 1093 (if (or (and (= month p-month) | |
| 1094 (or (= p-year 0) (= year p-year))) | |
| 1095 (and (= p-month 0) | |
| 1096 (or (= p-year 0) (= year p-year)))) | |
| 1097 (if (= p-day 0) | |
| 1098 (calendar-for-loop | |
| 1099 i from 1 to (calendar-last-day-of-month month year) do | |
|
49737
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
1100 (mark-visible-calendar-date (list month i year) color)) |
|
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
1101 (mark-visible-calendar-date (list month p-day year) color)))) |
| 13053 | 1102 |
| 1103 (defun sort-diary-entries () | |
| 1104 "Sort the list of diary entries by time of day." | |
| 1105 (setq diary-entries-list (sort diary-entries-list 'diary-entry-compare))) | |
| 1106 | |
| 1107 (defun diary-entry-compare (e1 e2) | |
| 1108 "Returns t if E1 is earlier than E2." | |
| 1109 (or (calendar-date-compare e1 e2) | |
| 1110 (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
|
1111 (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
|
1112 (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
|
1113 (or (< t1 t2) |
|
4287ce76bf9f
(diary-entry-compare): When times are identical, compare the entries
Sam Steingold <sds@gnu.org>
parents:
38422
diff
changeset
|
1114 (and (= t1 t2) |
|
4287ce76bf9f
(diary-entry-compare): When times are identical, compare the entries
Sam Steingold <sds@gnu.org>
parents:
38422
diff
changeset
|
1115 (string-lessp ts1 ts2))))))) |
| 13053 | 1116 |
|
20269
ca337d0a1553
(list-diary-entries, list-sexp-diary-entries, add-to-diary-list):
Karl Heuer <kwzh@gnu.org>
parents:
19324
diff
changeset
|
1117 (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
|
1118 -9999 |
|
ca337d0a1553
(list-diary-entries, list-sexp-diary-entries, add-to-diary-list):
Karl Heuer <kwzh@gnu.org>
parents:
19324
diff
changeset
|
1119 "*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
|
1120 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
|
1121 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
|
1122 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
|
1123 :type 'integer |
|
21669
9861518505cb
*** empty log message ***
Dan Nicolaescu <done@ece.arizona.edu>
parents:
21668
diff
changeset
|
1124 :group 'diary |
|
9861518505cb
*** empty log message ***
Dan Nicolaescu <done@ece.arizona.edu>
parents:
21668
diff
changeset
|
1125 :version "20.3") |
|
39615
4287ce76bf9f
(diary-entry-compare): When times are identical, compare the entries
Sam Steingold <sds@gnu.org>
parents:
38422
diff
changeset
|
1126 |
| 13053 | 1127 (defun diary-entry-time (s) |
|
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
1128 "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
|
1129 For example, returns 1325 for 1:25pm. |
|
53548
65fe9b0d6ac6
(diary-entry-time): Also accept time in the form XX[.XX][am/pm/AM/PM].
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52412
diff
changeset
|
1130 |
|
65fe9b0d6ac6
(diary-entry-time): Also accept time in the form XX[.XX][am/pm/AM/PM].
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52412
diff
changeset
|
1131 Returns `diary-unknown-time' (default value -9999) if no time is recognized. |
|
65fe9b0d6ac6
(diary-entry-time): Also accept time in the form XX[.XX][am/pm/AM/PM].
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52412
diff
changeset
|
1132 The recognized forms are XXXX, X:XX, or XX:XX (military time), and XXam, |
| 53557 | 1133 XXAM, XXpm, XXPM, XX:XXam, XX:XXAM XX:XXpm, or XX:XXPM. A period (.) can |
| 1134 be used instead of a colon (:) to separate the hour and minute parts." | |
|
19324
02a8fe146fa6
(diary-entry-time): Bind case-fold-search to nil.
Richard M. Stallman <rms@gnu.org>
parents:
18922
diff
changeset
|
1135 (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
|
1136 (cond ((string-match ; Military time |
|
53548
65fe9b0d6ac6
(diary-entry-time): Also accept time in the form XX[.XX][am/pm/AM/PM].
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52412
diff
changeset
|
1137 "\\`[ \t\n\\^M]*\\([0-9]?[0-9]\\)[:.]?\\([0-9][0-9]\\)\\(\\>\\|[^ap]\\)" |
|
65fe9b0d6ac6
(diary-entry-time): Also accept time in the form XX[.XX][am/pm/AM/PM].
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52412
diff
changeset
|
1138 s) |
|
19324
02a8fe146fa6
(diary-entry-time): Bind case-fold-search to nil.
Richard M. Stallman <rms@gnu.org>
parents:
18922
diff
changeset
|
1139 (+ (* 100 (string-to-int |
|
02a8fe146fa6
(diary-entry-time): Bind case-fold-search to nil.
Richard M. Stallman <rms@gnu.org>
parents:
18922
diff
changeset
|
1140 (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
|
1141 (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
|
1142 ((string-match ; Hour only XXam or XXpm |
|
34036
c2a8edb5b5ec
(diary-entry-time): Anchor pattern correctly
Gerd Moellmann <gerd@gnu.org>
parents:
32415
diff
changeset
|
1143 "\\`[ \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
|
1144 (+ (* 100 (% (string-to-int |
|
02a8fe146fa6
(diary-entry-time): Bind case-fold-search to nil.
Richard M. Stallman <rms@gnu.org>
parents:
18922
diff
changeset
|
1145 (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
|
1146 12)) |
|
02a8fe146fa6
(diary-entry-time): Bind case-fold-search to nil.
Richard M. Stallman <rms@gnu.org>
parents:
18922
diff
changeset
|
1147 (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
|
1148 0 1200))) |
|
39615
4287ce76bf9f
(diary-entry-compare): When times are identical, compare the entries
Sam Steingold <sds@gnu.org>
parents:
38422
diff
changeset
|
1149 ((string-match ; Hour and minute XX:XXam or XX:XXpm |
|
53613
2f99823b0a96
(diary-entry-time): Fix typo/bug:
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
53557
diff
changeset
|
1150 "\\`[ \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
|
1151 (+ (* 100 (% (string-to-int |
|
02a8fe146fa6
(diary-entry-time): Bind case-fold-search to nil.
Richard M. Stallman <rms@gnu.org>
parents:
18922
diff
changeset
|
1152 (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
|
1153 12)) |
|
02a8fe146fa6
(diary-entry-time): Bind case-fold-search to nil.
Richard M. Stallman <rms@gnu.org>
parents:
18922
diff
changeset
|
1154 (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
|
1155 (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
|
1156 0 1200))) |
|
39615
4287ce76bf9f
(diary-entry-compare): When times are identical, compare the entries
Sam Steingold <sds@gnu.org>
parents:
38422
diff
changeset
|
1157 (t diary-unknown-time)))) ; Unrecognizable |
|
34036
c2a8edb5b5ec
(diary-entry-time): Anchor pattern correctly
Gerd Moellmann <gerd@gnu.org>
parents:
32415
diff
changeset
|
1158 |
|
55431
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
55249
diff
changeset
|
1159 ;; Unrecognizable |
|
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
55249
diff
changeset
|
1160 |
| 13053 | 1161 (defun list-sexp-diary-entries (date) |
| 1162 "Add sexp entries for DATE from the diary file to `diary-entries-list'. | |
| 1163 Also, Make them visible in the diary file. Returns t if any entries were | |
| 1164 found. | |
| 1165 | |
| 1166 Sexp diary entries must be prefaced by a `sexp-diary-entry-symbol' (normally | |
| 1167 `%%'). The form of a sexp diary entry is | |
| 1168 | |
| 1169 %%(SEXP) ENTRY | |
| 1170 | |
| 1171 Both ENTRY and DATE are globally available when the SEXP is evaluated. If the | |
| 1172 SEXP yields the value nil, the diary entry does not apply. If it yields a | |
| 1173 non-nil value, ENTRY will be taken to apply to DATE; if the non-nil value is a | |
| 1174 string, that string will be the diary entry in the fancy diary display. | |
| 1175 | |
| 1176 For example, the following diary entry will apply to the 21st of the month | |
| 1177 if it is a weekday and the Friday before if the 21st is on a weekend: | |
| 1178 | |
| 1179 &%%(let ((dayname (calendar-day-of-week date)) | |
| 1180 (day (extract-calendar-day date))) | |
| 1181 (or | |
| 1182 (and (= day 21) (memq dayname '(1 2 3 4 5))) | |
| 1183 (and (memq day '(19 20)) (= dayname 5))) | |
| 1184 ) UIUC pay checks deposited | |
| 1185 | |
| 1186 A number of built-in functions are available for this type of diary entry: | |
| 1187 | |
|
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
1188 %%(diary-date MONTH DAY YEAR &optional MARK) text |
| 13053 | 1189 Entry applies if date is MONTH, DAY, YEAR if |
| 1190 `european-calendar-style' is nil, and DAY, MONTH, YEAR if | |
| 1191 `european-calendar-style' is t. DAY, MONTH, and YEAR | |
| 1192 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
|
1193 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
|
1194 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
|
1195 when highlighting the day in the calendar. |
| 13053 | 1196 |
|
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
1197 %%(diary-float MONTH DAYNAME N &optional DAY MARK) text |
| 13053 | 1198 Entry will appear on the Nth DAYNAME of MONTH. |
| 1199 (DAYNAME=0 means Sunday, 1 means Monday, and so on; | |
| 1200 if N is negative it counts backward from the end of | |
| 1201 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
|
1202 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
|
1203 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
|
1204 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
|
1205 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
|
1206 string to use when highlighting the day in the calendar. |
| 13053 | 1207 |
|
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
1208 %%(diary-block M1 D1 Y1 M2 D2 Y2 &optional MARK) text |
| 13053 | 1209 Entry will appear on dates between M1/D1/Y1 and M2/D2/Y2, |
| 1210 inclusive. (If `european-calendar-style' is t, the | |
| 1211 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
|
1212 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
|
1213 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
|
1214 day in the calendar. |
| 13053 | 1215 |
|
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
1216 %%(diary-anniversary MONTH DAY YEAR &optional MARK) text |
| 13053 | 1217 Entry will appear on anniversary dates of MONTH DAY, YEAR. |
| 1218 (If `european-calendar-style' is t, the order of the | |
| 1219 parameters should be changed to DAY, MONTH, YEAR.) Text | |
| 1220 can contain %d or %d%s; %d will be replaced by the number | |
| 1221 of years since the MONTH DAY, YEAR and %s will be replaced | |
| 1222 by the ordinal ending of that number (that is, `st', `nd', | |
| 1223 `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
|
1224 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
|
1225 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
|
1226 string to use when highlighting the day in the calendar. |
| 13053 | 1227 |
|
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
1228 %%(diary-cyclic N MONTH DAY YEAR &optional MARK) text |
| 13053 | 1229 Entry will appear every N days, starting MONTH DAY, YEAR. |
| 1230 (If `european-calendar-style' is t, the order of the | |
| 1231 parameters should be changed to N, DAY, MONTH, YEAR.) Text | |
| 1232 can contain %d or %d%s; %d will be replaced by the number | |
| 1233 of repetitions since the MONTH DAY, YEAR and %s will | |
| 1234 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
|
1235 `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
|
1236 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
|
1237 to use when highlighting the day in the calendar. |
| 13053 | 1238 |
| 1239 %%(diary-remind SEXP DAYS &optional MARKING) text | |
| 1240 Entry is a reminder for diary sexp SEXP. DAYS is either a | |
| 1241 single number or a list of numbers indicating the number(s) | |
| 1242 of days before the event that the warning(s) should occur. | |
| 1243 If the current date is (one of) DAYS before the event | |
| 1244 indicated by EXPR, then a suitable message (as specified | |
| 1245 by `diary-remind-message') appears. In addition to the | |
| 1246 reminders beforehand, the diary entry also appears on | |
| 1247 the date itself. If optional MARKING is non-nil then the | |
| 1248 *reminders* are marked on the calendar. Marking of | |
| 1249 reminders is independent of whether the entry *itself* is | |
| 1250 a marking or nonmarking one. | |
| 1251 | |
| 1252 %%(diary-day-of-year) | |
| 1253 Diary entries giving the day of the year and the number of | |
| 1254 days remaining in the year will be made every day. Note | |
| 1255 that since there is no text, it makes sense only if the | |
| 1256 fancy diary display is used. | |
| 1257 | |
| 1258 %%(diary-iso-date) | |
| 1259 Diary entries giving the corresponding ISO commercial date | |
| 1260 will be made every day. Note that since there is no text, | |
| 1261 it makes sense only if the fancy diary display is used. | |
| 1262 | |
| 1263 %%(diary-french-date) | |
| 1264 Diary entries giving the corresponding French Revolutionary | |
| 1265 date will be made every day. Note that since there is no | |
| 1266 text, it makes sense only if the fancy diary display is used. | |
| 1267 | |
| 1268 %%(diary-islamic-date) | |
| 1269 Diary entries giving the corresponding Islamic date will be | |
| 1270 made every day. Note that since there is no text, it | |
| 1271 makes sense only if the fancy diary display is used. | |
| 1272 | |
| 1273 %%(diary-hebrew-date) | |
| 1274 Diary entries giving the corresponding Hebrew date will be | |
| 1275 made every day. Note that since there is no text, it | |
| 1276 makes sense only if the fancy diary display is used. | |
| 1277 | |
| 1278 %%(diary-astro-day-number) Diary entries giving the corresponding | |
| 1279 astronomical (Julian) day number will be made every day. | |
| 1280 Note that since there is no text, it makes sense only if the | |
| 1281 fancy diary display is used. | |
| 1282 | |
| 1283 %%(diary-julian-date) Diary entries giving the corresponding | |
| 1284 Julian date will be made every day. Note that since | |
| 1285 there is no text, it makes sense only if the fancy diary | |
| 1286 display is used. | |
| 1287 | |
| 1288 %%(diary-sunrise-sunset) | |
| 1289 Diary entries giving the local times of sunrise and sunset | |
| 1290 will be made every day. Note that since there is no text, | |
| 1291 it makes sense only if the fancy diary display is used. | |
| 1292 Floating point required. | |
| 1293 | |
| 1294 %%(diary-phases-of-moon) | |
| 1295 Diary entries giving the times of the phases of the moon | |
| 1296 will be when appropriate. Note that since there is no text, | |
| 1297 it makes sense only if the fancy diary display is used. | |
| 1298 Floating point required. | |
| 1299 | |
| 1300 %%(diary-yahrzeit MONTH DAY YEAR) text | |
| 1301 Text is assumed to be the name of the person; the date is | |
| 1302 the date of death on the *civil* calendar. The diary entry | |
| 1303 will appear on the proper Hebrew-date anniversary and on the | |
| 1304 day before. (If `european-calendar-style' is t, the order | |
| 1305 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
|
1306 |
| 13053 | 1307 %%(diary-rosh-hodesh) |
| 1308 Diary entries will be made on the dates of Rosh Hodesh on | |
| 1309 the Hebrew calendar. Note that since there is no text, it | |
| 1310 makes sense only if the fancy diary display is used. | |
| 1311 | |
| 1312 %%(diary-parasha) | |
| 1313 Diary entries giving the weekly parasha will be made on | |
| 1314 every Saturday. Note that since there is no text, it | |
| 1315 makes sense only if the fancy diary display is used. | |
| 1316 | |
| 1317 %%(diary-omer) | |
| 1318 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
|
1319 from Passover to Shavuot. Note that since there is no text, |
| 13053 | 1320 it makes sense only if the fancy diary display is used. |
| 1321 | |
| 1322 Marking these entries is *extremely* time consuming, so these entries are | |
| 1323 best if they are nonmarking." | |
|
53548
65fe9b0d6ac6
(diary-entry-time): Also accept time in the form XX[.XX][am/pm/AM/PM].
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52412
diff
changeset
|
1324 (let ((s-entry (concat "\\(\\`\\|\^M\\|\n\\)" |
|
51640
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
1325 (regexp-quote diary-nonmarking-symbol) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
1326 "?" |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
1327 (regexp-quote sexp-diary-entry-symbol) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
1328 "(")) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
1329 entry-found file-glob-attrs marks) |
| 13053 | 1330 (goto-char (point-min)) |
|
49737
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
1331 (save-excursion |
|
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
1332 (setq file-glob-attrs (nth 1 (diary-pull-attrs nil '())))) |
| 13053 | 1333 (while (re-search-forward s-entry nil t) |
| 1334 (backward-char 1) | |
| 1335 (let ((sexp-start (point)) | |
|
51640
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
1336 sexp entry specifier entry-start line-start) |
| 13053 | 1337 (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
|
1338 (setq sexp (buffer-substring-no-properties sexp-start (point))) |
| 13053 | 1339 (save-excursion |
| 1340 (re-search-backward "\^M\\|\n\\|\\`") | |
| 1341 (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
|
1342 (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
|
1343 (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
|
1344 entry-start (1+ line-start)) |
| 13053 | 1345 (forward-char 1) |
| 1346 (if (and (or (char-equal (preceding-char) ?\^M) | |
| 1347 (char-equal (preceding-char) ?\n)) | |
| 1348 (not (looking-at " \\|\^I"))) | |
| 1349 (progn;; Diary entry consists only of the sexp | |
| 1350 (backward-char 1) | |
| 1351 (setq entry "")) | |
| 1352 (setq entry-start (point)) | |
| 1353 (re-search-forward "\^M\\|\n" nil t) | |
| 1354 (while (looking-at " \\|\^I") | |
| 1355 (re-search-forward "\^M\\|\n" nil t)) | |
| 1356 (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
|
1357 (setq entry (buffer-substring-no-properties entry-start (point))) |
| 13053 | 1358 (while (string-match "[\^M]" entry) |
| 1359 (aset entry (match-beginning 0) ?\n ))) | |
|
50904
44fe653dccdb
(diary-pull-attrs): Make `ret-attr', `attr' local.
Glenn Morris <rgm@gnu.org>
parents:
50699
diff
changeset
|
1360 (let ((diary-entry (diary-sexp-entry sexp entry date)) |
|
44fe653dccdb
(diary-pull-attrs): Make `ret-attr', `attr' local.
Glenn Morris <rgm@gnu.org>
parents:
50699
diff
changeset
|
1361 temp) |
|
49737
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
1362 (setq entry (if (consp diary-entry) |
|
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
1363 (cdr diary-entry) |
|
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
1364 diary-entry)) |
| 13053 | 1365 (if diary-entry |
|
49737
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
1366 (progn |
|
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
1367 (subst-char-in-region line-start (point) ?\^M ?\n t) |
|
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
1368 (if (< 0 (length entry)) |
|
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
1369 (setq temp (diary-pull-attrs entry file-glob-attrs) |
|
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
1370 entry (nth 0 temp) |
|
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
1371 marks (nth 1 temp))))) |
|
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
1372 (add-to-diary-list date |
|
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
1373 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
|
1374 specifier |
|
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1375 (if entry-start (copy-marker entry-start) |
|
50699
fa4e7ecda348
(fancy-diary-display-mode): Bind "q" to `quit-window'
Sam Steingold <sds@gnu.org>
parents:
49737
diff
changeset
|
1376 nil) |
|
49737
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
1377 marks) |
|
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
1378 (setq entry-found (or entry-found diary-entry))))) |
| 13053 | 1379 entry-found)) |
| 1380 | |
| 1381 (defun diary-sexp-entry (sexp entry date) | |
| 1382 "Process a SEXP diary ENTRY for DATE." | |
| 1383 (let ((result (if calendar-debug-sexp | |
| 1384 (let ((stack-trace-on-error t)) | |
| 1385 (eval (car (read-from-string sexp)))) | |
| 1386 (condition-case nil | |
| 1387 (eval (car (read-from-string sexp))) | |
| 1388 (error | |
| 1389 (beep) | |
| 1390 (message "Bad sexp at line %d in %s: %s" | |
| 1391 (save-excursion | |
| 1392 (save-restriction | |
| 1393 (narrow-to-region 1 (point)) | |
| 1394 (goto-char (point-min)) | |
| 1395 (let ((lines 1)) | |
| 1396 (while (re-search-forward "\n\\|\^M" nil t) | |
| 1397 (setq lines (1+ lines))) | |
| 1398 lines))) | |
| 1399 diary-file sexp) | |
| 1400 (sleep-for 2)))))) | |
|
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
1401 (cond ((stringp result) result) |
|
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
1402 ((and (consp result) |
|
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
1403 (stringp (cdr result))) result) |
|
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
1404 (result entry) |
|
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
1405 (t nil)))) |
| 13053 | 1406 |
|
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
1407 (defun diary-date (month day year &optional mark) |
| 13053 | 1408 "Specific date(s) diary entry. |
| 1409 Entry applies if date is MONTH, DAY, YEAR if `european-calendar-style' is nil, | |
| 1410 and DAY, MONTH, YEAR if `european-calendar-style' is t. DAY, MONTH, and YEAR | |
| 1411 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
|
1412 all values. |
|
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
1413 |
|
46826
e020f18c490a
(diary-mail-entries): Use `compose-mail'
Sam Steingold <sds@gnu.org>
parents:
46620
diff
changeset
|
1414 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
|
1415 use when highlighting the day in the calendar." |
|
51640
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
1416 (let ((dd (if european-calendar-style |
| 13053 | 1417 month |
| 1418 day)) | |
|
51640
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
1419 (mm (if european-calendar-style |
| 13053 | 1420 day |
| 1421 month)) | |
|
51640
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
1422 (m (extract-calendar-month date)) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
1423 (y (extract-calendar-year date)) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
1424 (d (extract-calendar-day date))) |
| 13053 | 1425 (if (and |
| 1426 (or (and (listp dd) (memq d dd)) | |
| 1427 (equal d dd) | |
| 1428 (eq dd t)) | |
| 1429 (or (and (listp mm) (memq m mm)) | |
| 1430 (equal m mm) | |
| 1431 (eq mm t)) | |
| 1432 (or (and (listp year) (memq y year)) | |
| 1433 (equal y year) | |
| 1434 (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
|
1435 (cons mark entry)))) |
| 13053 | 1436 |
|
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
1437 (defun diary-block (m1 d1 y1 m2 d2 y2 &optional mark) |
| 13053 | 1438 "Block diary entry. |
|
42513
22938e0c54b2
(diary-block): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
41566
diff
changeset
|
1439 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
|
1440 The order of the parameters is |
| 23122 | 1441 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
|
1442 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
|
1443 |
|
46826
e020f18c490a
(diary-mail-entries): Use `compose-mail'
Sam Steingold <sds@gnu.org>
parents:
46620
diff
changeset
|
1444 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
|
1445 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
|
1446 |
| 13053 | 1447 (let ((date1 (calendar-absolute-from-gregorian |
| 1448 (if european-calendar-style | |
| 1449 (list d1 m1 y1) | |
| 1450 (list m1 d1 y1)))) | |
| 1451 (date2 (calendar-absolute-from-gregorian | |
| 1452 (if european-calendar-style | |
| 1453 (list d2 m2 y2) | |
| 1454 (list m2 d2 y2)))) | |
| 1455 (d (calendar-absolute-from-gregorian date))) | |
| 1456 (if (and (<= date1 d) (<= d date2)) | |
|
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
1457 (cons mark entry)))) |
| 13053 | 1458 |
|
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
1459 (defun diary-float (month dayname n &optional day mark) |
| 13053 | 1460 "Floating diary entry--entry applies if date is the nth dayname of month. |
| 1461 Parameters are MONTH, DAYNAME, N. MONTH can be a list of months, the constant | |
| 1462 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
|
1463 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
|
1464 |
|
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
1465 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
|
1466 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
|
1467 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
|
1468 ;; 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
|
1469 ;; 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
|
1470 ;; 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
|
1471 ;; more grotesque. |
|
b3514551f08d
(diary-float): Rewritten to fix bug when base date
Richard M. Stallman <rms@gnu.org>
parents:
17626
diff
changeset
|
1472 (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
|
1473 (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
|
1474 (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
|
1475 (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
|
1476 (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
|
1477 (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
|
1478 (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
|
1479 (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
|
1480 (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
|
1481 (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
|
1482 ; 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
|
1483 (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
|
1484 (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
|
1485 (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
|
1486 ; 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
|
1487 (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
|
1488 (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
|
1489 (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
|
1490 (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
|
1491 (or (eq month t) |
|
38b437f4134e
(diary-float): Fix case of MONTH
Gerd Moellmann <gerd@gnu.org>
parents:
34036
diff
changeset
|
1492 (if (listp month) |
|
38b437f4134e
(diary-float): Fix case of MONTH
Gerd Moellmann <gerd@gnu.org>
parents:
34036
diff
changeset
|
1493 (memq m1 month) |
|
38b437f4134e
(diary-float): Fix case of MONTH
Gerd Moellmann <gerd@gnu.org>
parents:
34036
diff
changeset
|
1494 (= m1 month))) |
|
18590
7d2a26d2371d
(diary-float): Fix errors in previous change.
Richard M. Stallman <rms@gnu.org>
parents:
17892
diff
changeset
|
1495 (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
|
1496 1 |
|
7d2a26d2371d
(diary-float): Fix errors in previous change.
Richard M. Stallman <rms@gnu.org>
parents:
17892
diff
changeset
|
1497 (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
|
1498 (and (<= d1 d) (<= d d2)))) |
|
7d2a26d2371d
(diary-float): Fix errors in previous change.
Richard M. Stallman <rms@gnu.org>
parents:
17892
diff
changeset
|
1499 ;; 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
|
1500 (and (or (< y1 y2) |
|
6a6bb17fba97
(diary-float): Better fix of end-of-year error.
Richard M. Stallman <rms@gnu.org>
parents:
23908
diff
changeset
|
1501 (and (= y1 y2) (< m1 m2))) |
|
18590
7d2a26d2371d
(diary-float): Fix errors in previous change.
Richard M. Stallman <rms@gnu.org>
parents:
17892
diff
changeset
|
1502 (or |
|
23908
2a56bdf4cef7
(diary-float): Fix end-of-year error and typos in comments.
Karl Heuer <kwzh@gnu.org>
parents:
23247
diff
changeset
|
1503 ;; 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
|
1504 (and |
|
35500
38b437f4134e
(diary-float): Fix case of MONTH
Gerd Moellmann <gerd@gnu.org>
parents:
34036
diff
changeset
|
1505 (or (eq month t) |
|
38b437f4134e
(diary-float): Fix case of MONTH
Gerd Moellmann <gerd@gnu.org>
parents:
34036
diff
changeset
|
1506 (if (listp month) |
|
38b437f4134e
(diary-float): Fix case of MONTH
Gerd Moellmann <gerd@gnu.org>
parents:
34036
diff
changeset
|
1507 (memq m1 month) |
|
38b437f4134e
(diary-float): Fix case of MONTH
Gerd Moellmann <gerd@gnu.org>
parents:
34036
diff
changeset
|
1508 (= m1 month))) |
|
18590
7d2a26d2371d
(diary-float): Fix errors in previous change.
Richard M. Stallman <rms@gnu.org>
parents:
17892
diff
changeset
|
1509 (<= d1 (or day (if (> n 0) |
|
7d2a26d2371d
(diary-float): Fix errors in previous change.
Richard M. Stallman <rms@gnu.org>
parents:
17892
diff
changeset
|
1510 1 |
|
7d2a26d2371d
(diary-float): Fix errors in previous change.
Richard M. Stallman <rms@gnu.org>
parents:
17892
diff
changeset
|
1511 (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
|
1512 ;; m2, d2 works as a base date |
|
35500
38b437f4134e
(diary-float): Fix case of MONTH
Gerd Moellmann <gerd@gnu.org>
parents:
34036
diff
changeset
|
1513 (and (or (eq month t) |
|
38b437f4134e
(diary-float): Fix case of MONTH
Gerd Moellmann <gerd@gnu.org>
parents:
34036
diff
changeset
|
1514 (if (listp month) |
|
38b437f4134e
(diary-float): Fix case of MONTH
Gerd Moellmann <gerd@gnu.org>
parents:
34036
diff
changeset
|
1515 (memq m2 month) |
|
38b437f4134e
(diary-float): Fix case of MONTH
Gerd Moellmann <gerd@gnu.org>
parents:
34036
diff
changeset
|
1516 (= m2 month))) |
|
18590
7d2a26d2371d
(diary-float): Fix errors in previous change.
Richard M. Stallman <rms@gnu.org>
parents:
17892
diff
changeset
|
1517 (<= (or day (if (> n 0) |
|
7d2a26d2371d
(diary-float): Fix errors in previous change.
Richard M. Stallman <rms@gnu.org>
parents:
17892
diff
changeset
|
1518 1 |
|
7d2a26d2371d
(diary-float): Fix errors in previous change.
Richard M. Stallman <rms@gnu.org>
parents:
17892
diff
changeset
|
1519 (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
|
1520 d2))))) |
|
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
1521 (cons mark entry))))) |
| 13053 | 1522 |
|
35500
38b437f4134e
(diary-float): Fix case of MONTH
Gerd Moellmann <gerd@gnu.org>
parents:
34036
diff
changeset
|
1523 |
|
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
1524 (defun diary-anniversary (month day year &optional mark) |
| 13053 | 1525 "Anniversary diary entry. |
| 1526 Entry applies if date is the anniversary of MONTH, DAY, YEAR if | |
| 1527 `european-calendar-style' is nil, and DAY, MONTH, YEAR if | |
| 1528 `european-calendar-style' is t. Diary entry can contain `%d' or `%d%s'; the | |
| 1529 %d will be replaced by the number of years since the MONTH DAY, YEAR and the | |
| 1530 %s will be replaced by the ordinal ending of that number (that is, `st', `nd', | |
| 1531 `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
|
1532 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
|
1533 |
|
46826
e020f18c490a
(diary-mail-entries): Use `compose-mail'
Sam Steingold <sds@gnu.org>
parents:
46620
diff
changeset
|
1534 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
|
1535 use when highlighting the day in the calendar." |
| 13053 | 1536 (let* ((d (if european-calendar-style |
| 1537 month | |
| 1538 day)) | |
| 1539 (m (if european-calendar-style | |
| 1540 day | |
| 1541 month)) | |
| 1542 (y (extract-calendar-year date)) | |
| 1543 (diff (- y year))) | |
| 1544 (if (and (= m 2) (= d 29) (not (calendar-leap-year-p y))) | |
| 1545 (setq m 3 | |
| 1546 d 1)) | |
| 1547 (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
|
1548 (cons mark (format entry diff (diary-ordinal-suffix diff)))))) |
| 13053 | 1549 |
|
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
1550 (defun diary-cyclic (n month day year &optional mark) |
| 13053 | 1551 "Cycle diary entry--entry applies every N days starting at MONTH, DAY, YEAR. |
| 1552 If `european-calendar-style' is t, parameters are N, DAY, MONTH, YEAR. | |
| 1553 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
|
1554 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
|
1555 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
|
1556 appropriate. |
|
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
1557 |
|
46826
e020f18c490a
(diary-mail-entries): Use `compose-mail'
Sam Steingold <sds@gnu.org>
parents:
46620
diff
changeset
|
1558 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
|
1559 use when highlighting the day in the calendar." |
| 13053 | 1560 (let* ((d (if european-calendar-style |
| 1561 month | |
| 1562 day)) | |
| 1563 (m (if european-calendar-style | |
| 1564 day | |
| 1565 month)) | |
| 1566 (diff (- (calendar-absolute-from-gregorian date) | |
| 1567 (calendar-absolute-from-gregorian | |
| 1568 (list m d year)))) | |
| 1569 (cycle (/ diff n))) | |
| 1570 (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
|
1571 (cons mark (format entry cycle (diary-ordinal-suffix cycle)))))) |
| 13053 | 1572 |
| 1573 (defun diary-ordinal-suffix (n) | |
| 1574 "Ordinal suffix for N. (That is, `st', `nd', `rd', or `th', as appropriate.)" | |
| 1575 (if (or (memq (% n 100) '(11 12 13)) | |
| 1576 (< 3 (% n 10))) | |
| 1577 "th" | |
| 1578 (aref ["th" "st" "nd" "rd"] (% n 10)))) | |
| 1579 | |
| 1580 (defun diary-day-of-year () | |
| 1581 "Day of year and number of days remaining in the year of date diary entry." | |
| 1582 (calendar-day-of-year-string date)) | |
| 1583 | |
| 17626 | 1584 (defcustom diary-remind-message |
| 13053 | 1585 '("Reminder: Only " |
| 1586 (if (= 0 (% days 7)) | |
| 1587 (concat (int-to-string (/ days 7)) (if (= 7 days) " week" " weeks")) | |
| 1588 (concat (int-to-string days) (if (= 1 days) " day" " days"))) | |
| 1589 " until " | |
| 1590 diary-entry) | |
| 1591 "*Pseudo-pattern giving form of reminder messages in the fancy diary | |
| 1592 display. | |
|
39615
4287ce76bf9f
(diary-entry-compare): When times are identical, compare the entries
Sam Steingold <sds@gnu.org>
parents:
38422
diff
changeset
|
1593 |
| 13053 | 1594 Used by the function `diary-remind', a pseudo-pattern is a list of |
| 1595 expressions that can involve the keywords `days' (a number), `date' (a list of | |
| 17626 | 1596 month, day, year), and `diary-entry' (a string)." |
| 1597 :type 'sexp | |
| 1598 :group 'diary) | |
| 13053 | 1599 |
| 1600 (defun diary-remind (sexp days &optional marking) | |
| 1601 "Provide a reminder of a diary entry. | |
| 1602 SEXP is a diary-sexp. DAYS is either a single number or a list of numbers | |
| 1603 indicating the number(s) of days before the event that the warning(s) should | |
| 1604 occur on. If the current date is (one of) DAYS before the event indicated by | |
| 1605 SEXP, then a suitable message (as specified by `diary-remind-message' is | |
| 1606 returned. | |
| 1607 | |
|
24684
cca41b0e7ae7
(diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents:
24192
diff
changeset
|
1608 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
|
1609 date itself. |
|
cca41b0e7ae7
(diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents:
24192
diff
changeset
|
1610 |
|
cca41b0e7ae7
(diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents:
24192
diff
changeset
|
1611 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
|
1612 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
|
1613 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
|
1614 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
|
1615 marked on the calendar." |
|
cca41b0e7ae7
(diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents:
24192
diff
changeset
|
1616 (let ((diary-entry (eval sexp))) |
|
cca41b0e7ae7
(diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents:
24192
diff
changeset
|
1617 (cond |
|
cca41b0e7ae7
(diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents:
24192
diff
changeset
|
1618 ;; Diary entry applies on date |
|
cca41b0e7ae7
(diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents:
24192
diff
changeset
|
1619 ((and diary-entry |
|
cca41b0e7ae7
(diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents:
24192
diff
changeset
|
1620 (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
|
1621 diary-entry) |
|
cca41b0e7ae7
(diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents:
24192
diff
changeset
|
1622 ;; 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
|
1623 ((and (integerp days) |
|
cca41b0e7ae7
(diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents:
24192
diff
changeset
|
1624 (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
|
1625 (or (not marking-diary-entries) marking)) |
|
cca41b0e7ae7
(diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents:
24192
diff
changeset
|
1626 (let ((date (calendar-gregorian-from-absolute |
|
cca41b0e7ae7
(diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents:
24192
diff
changeset
|
1627 (+ (calendar-absolute-from-gregorian date) days)))) |
|
cca41b0e7ae7
(diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents:
24192
diff
changeset
|
1628 (if (setq diary-entry (eval sexp)) |
|
cca41b0e7ae7
(diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents:
24192
diff
changeset
|
1629 (mapconcat 'eval diary-remind-message "")))) |
|
cca41b0e7ae7
(diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents:
24192
diff
changeset
|
1630 ;; 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
|
1631 ((and (listp days) days) |
|
cca41b0e7ae7
(diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents:
24192
diff
changeset
|
1632 (or (diary-remind sexp (car days) marking) |
|
cca41b0e7ae7
(diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents:
24192
diff
changeset
|
1633 (diary-remind sexp (cdr days) marking)))))) |
| 13053 | 1634 |
|
49737
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
1635 (defun add-to-diary-list (date string specifier marker &optional globcolor) |
|
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
1636 "Add the entry (DATE STRING SPECIFIER MARKER GLOBCOLOR) to `diary-entries-list'. |
| 13053 | 1637 Do nothing if DATE or STRING is nil." |
|
50904
44fe653dccdb
(diary-pull-attrs): Make `ret-attr', `attr' local.
Glenn Morris <rgm@gnu.org>
parents:
50699
diff
changeset
|
1638 (when (and date string) |
|
44fe653dccdb
(diary-pull-attrs): Make `ret-attr', `attr' local.
Glenn Morris <rgm@gnu.org>
parents:
50699
diff
changeset
|
1639 (if diary-file-name-prefix |
|
44fe653dccdb
(diary-pull-attrs): Make `ret-attr', `attr' local.
Glenn Morris <rgm@gnu.org>
parents:
50699
diff
changeset
|
1640 (let ((prefix (funcall diary-file-name-prefix-function |
|
44fe653dccdb
(diary-pull-attrs): Make `ret-attr', `attr' local.
Glenn Morris <rgm@gnu.org>
parents:
50699
diff
changeset
|
1641 (buffer-file-name)))) |
|
44fe653dccdb
(diary-pull-attrs): Make `ret-attr', `attr' local.
Glenn Morris <rgm@gnu.org>
parents:
50699
diff
changeset
|
1642 (or (string= prefix "") |
|
44fe653dccdb
(diary-pull-attrs): Make `ret-attr', `attr' local.
Glenn Morris <rgm@gnu.org>
parents:
50699
diff
changeset
|
1643 (setq string (format "[%s] %s" prefix string))))) |
|
44fe653dccdb
(diary-pull-attrs): Make `ret-attr', `attr' local.
Glenn Morris <rgm@gnu.org>
parents:
50699
diff
changeset
|
1644 (setq diary-entries-list |
|
44fe653dccdb
(diary-pull-attrs): Make `ret-attr', `attr' local.
Glenn Morris <rgm@gnu.org>
parents:
50699
diff
changeset
|
1645 (append diary-entries-list |
|
44fe653dccdb
(diary-pull-attrs): Make `ret-attr', `attr' local.
Glenn Morris <rgm@gnu.org>
parents:
50699
diff
changeset
|
1646 (list (list date string specifier marker globcolor)))))) |
| 13053 | 1647 |
| 1648 (defun make-diary-entry (string &optional nonmarking file) | |
| 1649 "Insert a diary entry STRING which may be NONMARKING in FILE. | |
|
51640
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
1650 If omitted, NONMARKING defaults to nil and FILE defaults to `diary-file'." |
|
52319
c701edc37ab5
(simple-diary-display, make-diary-entry): Allow the diary to pop up a
Glenn Morris <rgm@gnu.org>
parents:
52117
diff
changeset
|
1651 (let ((pop-up-frames (window-dedicated-p (selected-window)))) |
|
c701edc37ab5
(simple-diary-display, make-diary-entry): Allow the diary to pop up a
Glenn Morris <rgm@gnu.org>
parents:
52117
diff
changeset
|
1652 (find-file-other-window (substitute-in-file-name (or 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
|
1653 (widen) |
| 13053 | 1654 (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
|
1655 (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
|
1656 (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
|
1657 (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
|
1658 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
|
1659 (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
|
1660 (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
|
1661 (previous-line 1)) |
| 13053 | 1662 (insert |
| 1663 (if (bolp) "" "\n") | |
| 1664 (if nonmarking diary-nonmarking-symbol "") | |
| 1665 string " ")) | |
| 1666 | |
| 1667 (defun insert-diary-entry (arg) | |
| 1668 "Insert a diary entry for the date indicated by point. | |
| 1669 Prefix arg will make the entry nonmarking." | |
| 1670 (interactive "P") | |
| 1671 (make-diary-entry (calendar-date-string (calendar-cursor-to-date t) t t) | |
| 1672 arg)) | |
| 1673 | |
| 1674 (defun insert-weekly-diary-entry (arg) | |
| 1675 "Insert a weekly diary entry for the day of the week indicated by point. | |
| 1676 Prefix arg will make the entry nonmarking." | |
| 1677 (interactive "P") | |
| 1678 (make-diary-entry (calendar-day-name (calendar-cursor-to-date t)) | |
| 1679 arg)) | |
| 1680 | |
| 1681 (defun insert-monthly-diary-entry (arg) | |
| 1682 "Insert a monthly diary entry for the day of the month indicated by point. | |
| 1683 Prefix arg will make the entry nonmarking." | |
| 1684 (interactive "P") | |
|
51640
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
1685 (let ((calendar-date-display-form |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
1686 (if european-calendar-style |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
1687 '(day " * ") |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
1688 '("* " day)))) |
| 13053 | 1689 (make-diary-entry (calendar-date-string (calendar-cursor-to-date t) t) |
| 1690 arg))) | |
| 1691 | |
| 1692 (defun insert-yearly-diary-entry (arg) | |
| 1693 "Insert an annual diary entry for the day of the year indicated by point. | |
| 1694 Prefix arg will make the entry nonmarking." | |
| 1695 (interactive "P") | |
|
51640
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
1696 (let ((calendar-date-display-form |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
1697 (if european-calendar-style |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
1698 '(day " " monthname) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
1699 '(monthname " " day)))) |
| 13053 | 1700 (make-diary-entry (calendar-date-string (calendar-cursor-to-date t) t) |
| 1701 arg))) | |
| 1702 | |
| 1703 (defun insert-anniversary-diary-entry (arg) | |
| 1704 "Insert an anniversary diary entry for the date given by point. | |
| 1705 Prefix arg will make the entry nonmarking." | |
| 1706 (interactive "P") | |
|
51640
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
1707 (let ((calendar-date-display-form |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
1708 (if european-calendar-style |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
1709 '(day " " month " " year) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
1710 '(month " " day " " year)))) |
| 13053 | 1711 (make-diary-entry |
| 1712 (format "%s(diary-anniversary %s)" | |
| 1713 sexp-diary-entry-symbol | |
| 1714 (calendar-date-string (calendar-cursor-to-date t) nil t)) | |
| 1715 arg))) | |
| 1716 | |
| 1717 (defun insert-block-diary-entry (arg) | |
| 1718 "Insert a block diary entry for the days between the point and marked date. | |
| 1719 Prefix arg will make the entry nonmarking." | |
| 1720 (interactive "P") | |
|
51640
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
1721 (let ((calendar-date-display-form |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
1722 (if european-calendar-style |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
1723 '(day " " month " " year) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
1724 '(month " " day " " year))) |
| 13053 | 1725 (cursor (calendar-cursor-to-date t)) |
| 1726 (mark (or (car calendar-mark-ring) | |
| 1727 (error "No mark set in this buffer"))) | |
|
51640
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
1728 start end) |
| 13053 | 1729 (if (< (calendar-absolute-from-gregorian mark) |
| 1730 (calendar-absolute-from-gregorian cursor)) | |
| 1731 (setq start mark | |
| 1732 end cursor) | |
| 1733 (setq start cursor | |
| 1734 end mark)) | |
| 1735 (make-diary-entry | |
| 1736 (format "%s(diary-block %s %s)" | |
| 1737 sexp-diary-entry-symbol | |
| 1738 (calendar-date-string start nil t) | |
| 1739 (calendar-date-string end nil t)) | |
| 1740 arg))) | |
| 1741 | |
| 1742 (defun insert-cyclic-diary-entry (arg) | |
| 1743 "Insert a cyclic diary entry starting at the date given by point. | |
| 1744 Prefix arg will make the entry nonmarking." | |
| 1745 (interactive "P") | |
|
51640
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
1746 (let ((calendar-date-display-form |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
1747 (if european-calendar-style |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
1748 '(day " " month " " year) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
1749 '(month " " day " " year)))) |
| 13053 | 1750 (make-diary-entry |
| 1751 (format "%s(diary-cyclic %d %s)" | |
| 1752 sexp-diary-entry-symbol | |
| 1753 (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
|
1754 (lambda (x) (> x 0))) |
| 13053 | 1755 (calendar-date-string (calendar-cursor-to-date t) nil t)) |
| 1756 arg))) | |
| 1757 | |
|
48365
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1758 ;;;###autoload |
|
54757
8c93a61e3b54
(diary-mode, fancy-diary-display-mode): Derive from fundamental-mode
Glenn Morris <rgm@gnu.org>
parents:
54537
diff
changeset
|
1759 (define-derived-mode diary-mode fundamental-mode |
|
48365
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1760 "Diary" |
|
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1761 "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
|
1762 (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
|
1763 '(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
|
1764 |
|
54757
8c93a61e3b54
(diary-mode, fancy-diary-display-mode): Derive from fundamental-mode
Glenn Morris <rgm@gnu.org>
parents:
54537
diff
changeset
|
1765 (define-derived-mode fancy-diary-display-mode fundamental-mode |
|
48365
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1766 "Diary" |
|
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1767 "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
|
1768 (set (make-local-variable 'font-lock-defaults) |
|
50699
fa4e7ecda348
(fancy-diary-display-mode): Bind "q" to `quit-window'
Sam Steingold <sds@gnu.org>
parents:
49737
diff
changeset
|
1769 '(fancy-diary-font-lock-keywords t)) |
|
fa4e7ecda348
(fancy-diary-display-mode): Bind "q" to `quit-window'
Sam Steingold <sds@gnu.org>
parents:
49737
diff
changeset
|
1770 (define-key (current-local-map) "q" 'quit-window)) |
|
48365
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1771 |
|
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1772 |
|
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1773 (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
|
1774 (list |
|
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1775 (cons |
|
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1776 (concat |
|
52117
e8a77526768b
(list-diary-entries): Adapt for new behaviour of `calendar-day-name'
Glenn Morris <rgm@gnu.org>
parents:
51640
diff
changeset
|
1777 (let ((dayname (diary-name-pattern calendar-day-name-array nil t)) |
|
e8a77526768b
(list-diary-entries): Adapt for new behaviour of `calendar-day-name'
Glenn Morris <rgm@gnu.org>
parents:
51640
diff
changeset
|
1778 (monthname (diary-name-pattern calendar-month-name-array nil 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
|
1779 (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
|
1780 (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
|
1781 (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
|
1782 (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
|
1783 "\\(\\(: .*\\)\\|\\(\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
|
1784 '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
|
1785 '("^.*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
|
1786 '("^.*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
|
1787 '("^.*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
|
1788 '("^\\(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
|
1789 '("^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
|
1790 '("^Parashat.*$" . font-lock-comment-face) |
|
53548
65fe9b0d6ac6
(diary-entry-time): Also accept time in the form XX[.XX][am/pm/AM/PM].
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52412
diff
changeset
|
1791 '("^[ \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\\)?\\)?" |
|
48365
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1792 . 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
|
1793 "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
|
1794 |
|
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1795 |
|
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1796 (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
|
1797 "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
|
1798 (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
|
1799 (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
|
1800 "?\\(" (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
|
1801 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
|
1802 (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
|
1803 (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
|
1804 (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
|
1805 (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
|
1806 (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
|
1807 (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
|
1808 t)) |
|
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1809 (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
|
1810 |
|
52117
e8a77526768b
(list-diary-entries): Adapt for new behaviour of `calendar-day-name'
Glenn Morris <rgm@gnu.org>
parents:
51640
diff
changeset
|
1811 (defun font-lock-diary-date-forms (month-array &optional symbol abbrev-array) |
|
e8a77526768b
(list-diary-entries): Adapt for new behaviour of `calendar-day-name'
Glenn Morris <rgm@gnu.org>
parents:
51640
diff
changeset
|
1812 "Create font-lock patterns for `diary-date-forms' using MONTH-ARRAY. |
|
48365
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1813 If given, optional SYMBOL must be a prefix to entries. |
|
52117
e8a77526768b
(list-diary-entries): Adapt for new behaviour of `calendar-day-name'
Glenn Morris <rgm@gnu.org>
parents:
51640
diff
changeset
|
1814 If optional ABBREV-ARRAY is present, the abbreviations constructed |
|
e8a77526768b
(list-diary-entries): Adapt for new behaviour of `calendar-day-name'
Glenn Morris <rgm@gnu.org>
parents:
51640
diff
changeset
|
1815 from this array by the function `calendar-abbrev-construct' are |
|
e8a77526768b
(list-diary-entries): Adapt for new behaviour of `calendar-day-name'
Glenn Morris <rgm@gnu.org>
parents:
51640
diff
changeset
|
1816 matched (with or without a final `.'), in addition to the full month |
|
e8a77526768b
(list-diary-entries): Adapt for new behaviour of `calendar-day-name'
Glenn Morris <rgm@gnu.org>
parents:
51640
diff
changeset
|
1817 names." |
|
e8a77526768b
(list-diary-entries): Adapt for new behaviour of `calendar-day-name'
Glenn Morris <rgm@gnu.org>
parents:
51640
diff
changeset
|
1818 (let ((dayname (diary-name-pattern calendar-day-name-array |
|
e8a77526768b
(list-diary-entries): Adapt for new behaviour of `calendar-day-name'
Glenn Morris <rgm@gnu.org>
parents:
51640
diff
changeset
|
1819 calendar-day-abbrev-array t)) |
|
e8a77526768b
(list-diary-entries): Adapt for new behaviour of `calendar-day-name'
Glenn Morris <rgm@gnu.org>
parents:
51640
diff
changeset
|
1820 (monthname (format "\\(%s\\|\\*\\)" |
|
e8a77526768b
(list-diary-entries): Adapt for new behaviour of `calendar-day-name'
Glenn Morris <rgm@gnu.org>
parents:
51640
diff
changeset
|
1821 (diary-name-pattern month-array abbrev-array))) |
|
51640
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
1822 (month "\\([0-9]+\\|\\*\\)") |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
1823 (day "\\([0-9]+\\|\\*\\)") |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
1824 (year "-?\\([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
|
1825 (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
|
1826 (cons |
|
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1827 (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
|
1828 (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
|
1829 (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
|
1830 ;; 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
|
1831 ;; 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
|
1832 (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
|
1833 (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
|
1834 x) |
|
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1835 "") |
|
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1836 ;; 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
|
1837 (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
|
1838 (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
|
1839 "\\)")) |
|
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1840 '(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
|
1841 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
|
1842 |
|
52117
e8a77526768b
(list-diary-entries): Adapt for new behaviour of `calendar-day-name'
Glenn Morris <rgm@gnu.org>
parents:
51640
diff
changeset
|
1843 (eval-when-compile (require 'cal-hebrew) |
|
e8a77526768b
(list-diary-entries): Adapt for new behaviour of `calendar-day-name'
Glenn Morris <rgm@gnu.org>
parents:
51640
diff
changeset
|
1844 (require 'cal-islam)) |
|
e8a77526768b
(list-diary-entries): Adapt for new behaviour of `calendar-day-name'
Glenn Morris <rgm@gnu.org>
parents:
51640
diff
changeset
|
1845 |
|
48365
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1846 (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
|
1847 (append |
|
52117
e8a77526768b
(list-diary-entries): Adapt for new behaviour of `calendar-day-name'
Glenn Morris <rgm@gnu.org>
parents:
51640
diff
changeset
|
1848 (font-lock-diary-date-forms calendar-month-name-array |
|
e8a77526768b
(list-diary-entries): Adapt for new behaviour of `calendar-day-name'
Glenn Morris <rgm@gnu.org>
parents:
51640
diff
changeset
|
1849 nil calendar-month-abbrev-array) |
|
51640
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
1850 (when (or (memq 'mark-hebrew-diary-entries |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
1851 nongregorian-diary-marking-hook) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
1852 (memq 'list-hebrew-diary-entries |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
1853 nongregorian-diary-listing-hook)) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
1854 (require 'cal-hebrew) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
1855 (font-lock-diary-date-forms |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
1856 calendar-hebrew-month-name-array-leap-year |
|
52117
e8a77526768b
(list-diary-entries): Adapt for new behaviour of `calendar-day-name'
Glenn Morris <rgm@gnu.org>
parents:
51640
diff
changeset
|
1857 hebrew-diary-entry-symbol)) |
|
51640
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
1858 (when (or (memq 'mark-islamic-diary-entries |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
1859 nongregorian-diary-marking-hook) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
1860 (memq 'list-islamic-diary-entries |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
1861 nongregorian-diary-listing-hook)) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
1862 (require 'cal-islam) |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
1863 (font-lock-diary-date-forms |
|
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
1864 calendar-islamic-month-name-array |
|
52117
e8a77526768b
(list-diary-entries): Adapt for new behaviour of `calendar-day-name'
Glenn Morris <rgm@gnu.org>
parents:
51640
diff
changeset
|
1865 islamic-diary-entry-symbol)) |
|
48365
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1866 (list |
|
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1867 (cons |
|
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1868 (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
|
1869 '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
|
1870 (cons |
|
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1871 (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
|
1872 "?\\(" (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
|
1873 '(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
|
1874 (cons |
|
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1875 (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
|
1876 '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
|
1877 (cons |
|
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1878 (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
|
1879 "?\\(" (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
|
1880 '(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
|
1881 (cons |
|
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1882 (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
|
1883 "?\\(" (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
|
1884 '(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
|
1885 '(font-lock-diary-sexps . font-lock-keyword-face) |
|
53548
65fe9b0d6ac6
(diary-entry-time): Also accept time in the form XX[.XX][am/pm/AM/PM].
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52412
diff
changeset
|
1886 '("[0-9]?[0-9]\\([:.]?[0-9][0-9]\\)?\\(am\\|pm\\|AM\\|PM\\)\\(-[0-9]?[0-9]\\([:.]?[0-9][0-9]\\)?\\(am\\|pm\\|AM\\|PM\\)\\)?" |
|
48365
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1887 . 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
|
1888 "Forms to highlight in diary-mode") |
|
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48421
diff
changeset
|
1889 |
|
48365
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
1890 |
| 55249 | 1891 ;; Following code from Dave Love <fx@gnu.org>. |
| 1892 ;; Import Outlook-format appointments from mail messages in Gnus or | |
| 1893 ;; Rmail using command `diary-from-outlook'. This, or the specialized | |
| 1894 ;; functions `diary-from-outlook-gnus' and `diary-from-outlook-rmail', | |
| 1895 ;; could be run from hooks to notice appointments automatically (in | |
| 1896 ;; which case they will prompt about adding to the diary). The | |
| 1897 ;; message formats recognized are customizable through | |
| 1898 ;; `diary-outlook-formats'. | |
| 1899 | |
| 1900 (defcustom diary-outlook-formats | |
| 1901 '( | |
| 1902 ;; When: 11 October 2001 12:00-14:00 (GMT) Greenwich Mean Time : Dublin, ... | |
| 1903 ;; [Current UK format? The timezone is meaningless. Sometimes the | |
| 1904 ;; Where is missing.] | |
| 1905 ("When: \\([0-9]+ [[:alpha:]]+ [0-9]+\\) \ | |
| 1906 \\([^ ]+\\) [^\n]+ | |
| 1907 \[^\n]+ | |
| 1908 \\(?:Where: \\([^\n]+\\)\n+\\)? | |
| 1909 \\*~\\*~\\*~\\*~\\*~\\*~\\*~\\*~\\*~\\*" | |
| 1910 . "\\1\n \\2 %s, \\3") | |
| 1911 ;; When: Tuesday, April 30, 2002 03:00 PM-03:30 PM (GMT) Greenwich Mean ... | |
| 1912 ;; [Old UK format?] | |
| 1913 ("^When: [[:alpha:]]+, \\([[:alpha:]]+\\) \\([0-9][0-9]*\\), \\([0-9]\\{4\\}\\) \ | |
| 1914 \\([^ ]+\\) [^\n]+ | |
| 1915 \[^\n]+ | |
| 1916 \\(?:Where: \\([^\n]+\\)\\)?\n+" | |
| 1917 . "\\2 \\1 \\3\n \\4 %s, \\5") | |
| 1918 ( | |
| 1919 ;; German format, apparently. | |
| 1920 "^Zeit: [^ ]+, +\\([0-9]+\\)\. +\\([[:upper:]][[:lower:]][[:lower:]]\\)[^ ]* +\\([0-9]+\\) +\\([^ ]+\\).*$" | |
| 1921 . "\\1 \\2 \\3\n \\4 %s")) | |
| 1922 "Alist of regexps matching message text and replacement text. | |
| 1923 | |
| 1924 The regexp must match the start of the message text containing an | |
| 1925 appointment, but need not include a leading `^'. If it matches the | |
| 1926 current message, a diary entry is made from the corresponding | |
| 1927 template. If the template is a string, it should be suitable for | |
| 1928 passing to `replace-match', and so will have occurrences of `\\D' to | |
| 1929 substitute the match for the Dth subexpression. It must also contain | |
| 1930 a single `%s' which will be replaced with the text of the message's | |
| 1931 Subject field. Any other `%' characters must be doubled, so that the | |
| 1932 template can be passed to `format'. | |
| 1933 | |
| 1934 If the template is actually a function, it is called with the message | |
| 1935 body text as argument, and may use `match-string' etc. to make a | |
| 1936 template following the rules above." | |
| 1937 :type '(alist :key-type (regexp :tag "Regexp matching time/place") | |
| 1938 :value-type (choice | |
| 1939 (string :tag "Template for entry") | |
| 1940 (function :tag "Unary function providing template"))) | |
| 1941 :version "21.4" | |
| 1942 :group 'diary) | |
| 1943 | |
| 1944 | |
| 1945 ;; Dynamically bound. | |
| 1946 (defvar body) | |
| 1947 (defvar subject) | |
| 1948 | |
| 1949 (defun diary-from-outlook-internal (&optional test-only) | |
| 1950 "Snarf a diary entry from a message assumed to be from MS Outlook. | |
| 1951 Assumes `body' is bound to a string comprising the body of the message and | |
| 1952 `subject' is bound to a string comprising its subject. | |
| 1953 Arg TEST-ONLY non-nil means return non-nil if and only if the | |
| 1954 message contains an appointment, don't make a diary entry." | |
| 1955 (catch 'finished | |
| 1956 (let (format-string) | |
| 1957 (dotimes (i (length diary-outlook-formats)) | |
| 1958 (when (eq 0 (string-match (car (nth i diary-outlook-formats)) | |
| 1959 body)) | |
| 1960 (unless test-only | |
| 1961 (setq format-string (cdr (nth i diary-outlook-formats))) | |
| 1962 (save-excursion | |
| 1963 (save-window-excursion | |
| 1964 ;; Fixme: References to optional fields in the format | |
| 1965 ;; are treated literally, not replaced by the empty | |
| 1966 ;; string. I think this is an Emacs bug. | |
| 1967 (make-diary-entry | |
| 1968 (format (replace-match (if (functionp format-string) | |
| 1969 (funcall format-string body) | |
| 1970 format-string) | |
| 1971 t nil (match-string 0 body)) | |
| 1972 subject)) | |
| 1973 (save-buffer)))) | |
| 1974 (throw 'finished t)))) | |
| 1975 nil)) | |
| 1976 | |
|
58101
e47a5c4e43ff
(diary-from-outlook, diary-from-outlook-gnus)
Glenn Morris <rgm@gnu.org>
parents:
58099
diff
changeset
|
1977 (defun diary-from-outlook (&optional noconfirm) |
| 55249 | 1978 "Maybe snarf diary entry from current Outlook-generated message. |
|
58099
0ff94b7bdea3
(diary-from-outlook, diary-from-outlook-gnus)
Glenn Morris <rgm@gnu.org>
parents:
57255
diff
changeset
|
1979 Currently knows about Gnus and Rmail modes. Unless the optional |
|
58101
e47a5c4e43ff
(diary-from-outlook, diary-from-outlook-gnus)
Glenn Morris <rgm@gnu.org>
parents:
58099
diff
changeset
|
1980 argument NOCONFIRM is non-nil (which is the case when this |
|
58099
0ff94b7bdea3
(diary-from-outlook, diary-from-outlook-gnus)
Glenn Morris <rgm@gnu.org>
parents:
57255
diff
changeset
|
1981 function is called interactively), then if an entry is found the |
|
0ff94b7bdea3
(diary-from-outlook, diary-from-outlook-gnus)
Glenn Morris <rgm@gnu.org>
parents:
57255
diff
changeset
|
1982 user is asked to confirm its addition." |
|
0ff94b7bdea3
(diary-from-outlook, diary-from-outlook-gnus)
Glenn Morris <rgm@gnu.org>
parents:
57255
diff
changeset
|
1983 (interactive "p") |
| 55249 | 1984 (let ((func (cond |
| 1985 ((eq major-mode 'rmail-mode) | |
| 1986 #'diary-from-outlook-rmail) | |
| 1987 ((memq major-mode '(gnus-summary-mode gnus-article-mode)) | |
| 1988 #'diary-from-outlook-gnus) | |
| 1989 (t (error "Don't know how to snarf in `%s'" major-mode))))) | |
|
58101
e47a5c4e43ff
(diary-from-outlook, diary-from-outlook-gnus)
Glenn Morris <rgm@gnu.org>
parents:
58099
diff
changeset
|
1990 (funcall func noconfirm))) |
| 55249 | 1991 |
| 1992 | |
| 1993 (defvar gnus-article-mime-handles) | |
| 1994 (defvar gnus-article-buffer) | |
| 1995 | |
| 1996 (autoload 'gnus-fetch-field "gnus-util") | |
| 1997 (autoload 'gnus-narrow-to-body "gnus") | |
| 1998 (autoload 'mm-get-part "mm-decode") | |
| 1999 | |
|
58101
e47a5c4e43ff
(diary-from-outlook, diary-from-outlook-gnus)
Glenn Morris <rgm@gnu.org>
parents:
58099
diff
changeset
|
2000 (defun diary-from-outlook-gnus (&optional noconfirm) |
| 55249 | 2001 "Maybe snarf diary entry from Outlook-generated message in Gnus. |
|
58101
e47a5c4e43ff
(diary-from-outlook, diary-from-outlook-gnus)
Glenn Morris <rgm@gnu.org>
parents:
58099
diff
changeset
|
2002 Unless the optional argument NOCONFIRM is non-nil (which is the case when |
|
58099
0ff94b7bdea3
(diary-from-outlook, diary-from-outlook-gnus)
Glenn Morris <rgm@gnu.org>
parents:
57255
diff
changeset
|
2003 this function is called interactively), then if an entry is found the |
|
0ff94b7bdea3
(diary-from-outlook, diary-from-outlook-gnus)
Glenn Morris <rgm@gnu.org>
parents:
57255
diff
changeset
|
2004 user is asked to confirm its addition. |
|
0ff94b7bdea3
(diary-from-outlook, diary-from-outlook-gnus)
Glenn Morris <rgm@gnu.org>
parents:
57255
diff
changeset
|
2005 Add this function to `gnus-article-prepare-hook' to notice appointments |
| 55249 | 2006 automatically." |
|
58099
0ff94b7bdea3
(diary-from-outlook, diary-from-outlook-gnus)
Glenn Morris <rgm@gnu.org>
parents:
57255
diff
changeset
|
2007 (interactive "p") |
| 55249 | 2008 (with-current-buffer gnus-article-buffer |
| 2009 (let ((subject (gnus-fetch-field "subject")) | |
| 2010 (body (if gnus-article-mime-handles | |
| 2011 ;; We're multipart. Don't get confused by part | |
| 2012 ;; buttons &c. Assume info is in first part. | |
| 2013 (mm-get-part (nth 1 gnus-article-mime-handles)) | |
| 2014 (save-restriction | |
| 2015 (gnus-narrow-to-body) | |
| 2016 (buffer-string))))) | |
| 2017 (when (diary-from-outlook-internal t) | |
|
58101
e47a5c4e43ff
(diary-from-outlook, diary-from-outlook-gnus)
Glenn Morris <rgm@gnu.org>
parents:
58099
diff
changeset
|
2018 (when (or noconfirm (y-or-n-p "Snarf diary entry? ")) |
| 55249 | 2019 (diary-from-outlook-internal) |
| 2020 (message "Diary entry added")))))) | |
| 2021 | |
| 2022 (custom-add-option 'gnus-article-prepare-hook 'diary-from-outlook-gnus) | |
| 2023 | |
| 2024 | |
| 2025 (defvar rmail-buffer) | |
| 2026 | |
|
58101
e47a5c4e43ff
(diary-from-outlook, diary-from-outlook-gnus)
Glenn Morris <rgm@gnu.org>
parents:
58099
diff
changeset
|
2027 (defun diary-from-outlook-rmail (&optional noconfirm) |
|
58099
0ff94b7bdea3
(diary-from-outlook, diary-from-outlook-gnus)
Glenn Morris <rgm@gnu.org>
parents:
57255
diff
changeset
|
2028 "Maybe snarf diary entry from Outlook-generated message in Rmail. |
|
58101
e47a5c4e43ff
(diary-from-outlook, diary-from-outlook-gnus)
Glenn Morris <rgm@gnu.org>
parents:
58099
diff
changeset
|
2029 Unless the optional argument NOCONFIRM is non-nil (which is the case when |
|
58099
0ff94b7bdea3
(diary-from-outlook, diary-from-outlook-gnus)
Glenn Morris <rgm@gnu.org>
parents:
57255
diff
changeset
|
2030 this function is called interactively), then if an entry is found the |
|
0ff94b7bdea3
(diary-from-outlook, diary-from-outlook-gnus)
Glenn Morris <rgm@gnu.org>
parents:
57255
diff
changeset
|
2031 user is asked to confirm its addition." |
|
0ff94b7bdea3
(diary-from-outlook, diary-from-outlook-gnus)
Glenn Morris <rgm@gnu.org>
parents:
57255
diff
changeset
|
2032 (interactive "p") |
| 55249 | 2033 (with-current-buffer rmail-buffer |
| 2034 (let ((subject (mail-fetch-field "subject")) | |
| 2035 (body (buffer-substring (save-excursion | |
| 2036 (rfc822-goto-eoh) | |
| 2037 (point)) | |
| 2038 (point-max)))) | |
| 2039 (when (diary-from-outlook-internal t) | |
|
58101
e47a5c4e43ff
(diary-from-outlook, diary-from-outlook-gnus)
Glenn Morris <rgm@gnu.org>
parents:
58099
diff
changeset
|
2040 (when (or noconfirm (y-or-n-p "Snarf diary entry? ")) |
| 55249 | 2041 (diary-from-outlook-internal) |
| 2042 (message "Diary entry added")))))) | |
| 2043 | |
| 2044 | |
| 13650 | 2045 (provide 'diary-lib) |
| 13053 | 2046 |
| 52401 | 2047 ;;; arch-tag: 22dd506e-2e33-410d-9ae1-095a0c1b2010 |
| 13650 | 2048 ;;; diary-lib.el ends here |
