Mercurial > emacs
annotate lisp/calendar/diary-lib.el @ 93492:2fe1b51b8771
(calendar-mode-map): Use calendar-mark-holidays rather than obsolete alias.
(mark-visible-calendar-date): Also use overlay for mark characters.
(calendar-unmark): Unmark by removing all overlays, rather than redrawing.
(calendar-starred-day): Remove.
(calendar-mode): Disable undo. Don't make calendar-starred-day local.
(calendar-cursor-to-date): No need for special star handling now using overlays.
(calendar-star-date): Use overlays.
author | Glenn Morris <rgm@gnu.org> |
---|---|
date | Tue, 01 Apr 2008 02:46:29 +0000 |
parents | 0d954ec4d752 |
children | ef849082f38b |
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 |
67465
a55ee709ec8d
Update copyright pending Emacs 22.
Glenn Morris <rgm@gnu.org>
parents:
66929
diff
changeset
|
3 ;; Copyright (C) 1989, 1990, 1992, 1993, 1994, 1995, 2001, 2002, 2003, |
79703 | 4 ;; 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
13053 | 5 |
6 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu> | |
65919
5c09efcfc1d9
Update maintainer email address.
Glenn Morris <rgm@gnu.org>
parents:
65875
diff
changeset
|
7 ;; Maintainer: Glenn Morris <rgm@gnu.org> |
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 | |
78216
93e11478c954
Switch license to GPLv3 or later.
Glenn Morris <rgm@gnu.org>
parents:
77293
diff
changeset
|
14 ;; the Free Software Foundation; either version 3, or (at your option) |
13053 | 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 |
64085 | 24 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
25 ;; Boston, MA 02110-1301, USA. | |
13053 | 26 |
27 ;;; Commentary: | |
28 | |
29 ;; This collection of functions implements the diary features as described | |
30 ;; in calendar.el. | |
31 | |
32 ;;; Code: | |
33 | |
34 (require 'calendar) | |
35 | |
92843
de680a2b3b3b
(diary-loaddefs): Load this rather than explicit autoloads.
Glenn Morris <rgm@gnu.org>
parents:
92696
diff
changeset
|
36 (eval-and-compile |
de680a2b3b3b
(diary-loaddefs): Load this rather than explicit autoloads.
Glenn Morris <rgm@gnu.org>
parents:
92696
diff
changeset
|
37 (load "diary-loaddefs" nil 'quiet)) |
de680a2b3b3b
(diary-loaddefs): Load this rather than explicit autoloads.
Glenn Morris <rgm@gnu.org>
parents:
92696
diff
changeset
|
38 |
92595 | 39 (defcustom diary-include-string "#include" |
40 "The string indicating inclusion of another file of diary entries. | |
41 See the documentation for the function `include-other-diary-files'." | |
42 :type 'string | |
43 :group 'diary) | |
44 | |
45 (defcustom diary-list-include-blanks nil | |
46 "If nil, do not include days with no diary entry in the list of diary entries. | |
47 Such days will then not be shown in the fancy diary buffer, even if they | |
48 are holidays." | |
49 :type 'boolean | |
50 :group 'diary) | |
51 | |
52 (defcustom diary-face 'diary | |
53 "Face name to use for diary entries." | |
54 :type 'face | |
55 :group 'diary) | |
56 (make-obsolete-variable 'diary-face "customize the face `diary' instead." | |
92859 | 57 "23.1") |
92595 | 58 |
93027
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
59 (defface diary-anniversary '((t :inherit font-lock-keyword-face)) |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
60 "Face used for anniversaries in the fancy diary display." |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
61 :version "22.1" |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
62 :group 'diary) |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
63 |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
64 (defface diary-time '((t :inherit font-lock-variable-name-face)) |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
65 "Face used for times of day in the diary." |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
66 :version "22.1" |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
67 :group 'diary) |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
68 |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
69 (defface diary-button '((((type pc) (class color)) |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
70 (:foreground "lightblue"))) |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
71 "Default face used for buttons." |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
72 :version "22.1" |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
73 :group 'diary) |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
74 ;; Backward-compatibility alias. FIXME make obsolete. |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
75 (put 'diary-button-face 'face-alias 'diary-button) |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
76 |
92696
f656dd57b318
(diary-face-attrs): Fix custom :type.
Glenn Morris <rgm@gnu.org>
parents:
92685
diff
changeset
|
77 ;; Face markup of calendar and diary displays: Any entry line that |
f656dd57b318
(diary-face-attrs): Fix custom :type.
Glenn Morris <rgm@gnu.org>
parents:
92685
diff
changeset
|
78 ;; ends with [foo:value] where foo is a face attribute (except :box |
f656dd57b318
(diary-face-attrs): Fix custom :type.
Glenn Morris <rgm@gnu.org>
parents:
92685
diff
changeset
|
79 ;; :stipple) or with [face:blah] tags, will have these values applied |
f656dd57b318
(diary-face-attrs): Fix custom :type.
Glenn Morris <rgm@gnu.org>
parents:
92685
diff
changeset
|
80 ;; to the calendar and fancy diary displays. These attributes "stack" |
f656dd57b318
(diary-face-attrs): Fix custom :type.
Glenn Morris <rgm@gnu.org>
parents:
92685
diff
changeset
|
81 ;; on calendar displays. File-wide attributes can be defined as |
f656dd57b318
(diary-face-attrs): Fix custom :type.
Glenn Morris <rgm@gnu.org>
parents:
92685
diff
changeset
|
82 ;; follows: the first line matching "^# [tag:value]" defines the value |
f656dd57b318
(diary-face-attrs): Fix custom :type.
Glenn Morris <rgm@gnu.org>
parents:
92685
diff
changeset
|
83 ;; for that particular tag. |
92595 | 84 (defcustom diary-face-attrs |
85 '((" *\\[foreground:\\([-a-z]+\\)\\]$" 1 :foreground string) | |
86 (" *\\[background:\\([-a-z]+\\)\\]$" 1 :background string) | |
93274
177806bc3b1b
(diary-face-attrs): Revert previous change to `weight' type. Fix
Glenn Morris <rgm@gnu.org>
parents:
93270
diff
changeset
|
87 (" *\\[width:\\([-a-z]+\\)\\]$" 1 :width symbol) |
177806bc3b1b
(diary-face-attrs): Revert previous change to `weight' type. Fix
Glenn Morris <rgm@gnu.org>
parents:
93270
diff
changeset
|
88 (" *\\[height:\\([.0-9]+\\)\\]$" 1 :height int) |
92595 | 89 (" *\\[weight:\\([-a-z]+\\)\\]$" 1 :weight symbol) |
90 (" *\\[slant:\\([-a-z]+\\)\\]$" 1 :slant symbol) | |
91 (" *\\[underline:\\([-a-z]+\\)\\]$" 1 :underline stringtnil) | |
92 (" *\\[overline:\\([-a-z]+\\)\\]$" 1 :overline stringtnil) | |
93 (" *\\[strike-through:\\([-a-z]+\\)\\]$" 1 :strike-through stringtnil) | |
94 (" *\\[inverse-video:\\([-a-z]+\\)\\]$" 1 :inverse-video tnil) | |
95 (" *\\[face:\\([-0-9a-z]+\\)\\]$" 1 :face string) | |
96 (" *\\[font:\\([-a-z0-9]+\\)\\]$" 1 :font string) | |
97 ;; Unsupported. | |
98 ;;; (" *\\[box:\\([-a-z]+\\)\\]$" 1 :box) | |
99 ;;; (" *\\[stipple:\\([-a-z]+\\)\\]$" 1 :stipple) | |
100 ) | |
92696
f656dd57b318
(diary-face-attrs): Fix custom :type.
Glenn Morris <rgm@gnu.org>
parents:
92685
diff
changeset
|
101 "Alist of (REGEXP SUBEXP ATTRIBUTE TYPE) elements. |
f656dd57b318
(diary-face-attrs): Fix custom :type.
Glenn Morris <rgm@gnu.org>
parents:
92685
diff
changeset
|
102 This is used by `diary-pull-attrs' to fontify certain diary |
f656dd57b318
(diary-face-attrs): Fix custom :type.
Glenn Morris <rgm@gnu.org>
parents:
92685
diff
changeset
|
103 elements. REGEXP is a regular expression to for, and SUBEXP is |
f656dd57b318
(diary-face-attrs): Fix custom :type.
Glenn Morris <rgm@gnu.org>
parents:
92685
diff
changeset
|
104 the numbered sub-expression to extract. `diary-glob-file-regexp-prefix' |
92973
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
105 is pre-pended to REGEXP for file-wide specifiers. ATTRIBUTE |
92696
f656dd57b318
(diary-face-attrs): Fix custom :type.
Glenn Morris <rgm@gnu.org>
parents:
92685
diff
changeset
|
106 specifies which face attribute (e.g. `:foreground') to modify, or |
f656dd57b318
(diary-face-attrs): Fix custom :type.
Glenn Morris <rgm@gnu.org>
parents:
92685
diff
changeset
|
107 that this is a face (`:face') to apply. TYPE is the type of |
f656dd57b318
(diary-face-attrs): Fix custom :type.
Glenn Morris <rgm@gnu.org>
parents:
92685
diff
changeset
|
108 attribute being applied. Available TYPES (see `diary-attrtype-convert') |
f656dd57b318
(diary-face-attrs): Fix custom :type.
Glenn Morris <rgm@gnu.org>
parents:
92685
diff
changeset
|
109 are: `string', `symbol', `int', `tnil',`stringtnil.'" |
f656dd57b318
(diary-face-attrs): Fix custom :type.
Glenn Morris <rgm@gnu.org>
parents:
92685
diff
changeset
|
110 :type '(repeat (list (string :tag "Regular expression") |
92859 | 111 (integer :tag "Sub-expression") |
112 (symbol :tag "Attribute (e.g. :foreground)") | |
113 (choice (const string :tag "A string") | |
114 (const symbol :tag "A symbol") | |
115 (const int :tag "An integer") | |
116 (const tnil :tag "`t' or `nil'") | |
117 (const stringtnil | |
118 :tag "A string, `t', or `nil'")))) | |
92696
f656dd57b318
(diary-face-attrs): Fix custom :type.
Glenn Morris <rgm@gnu.org>
parents:
92685
diff
changeset
|
119 :group 'diary) |
f656dd57b318
(diary-face-attrs): Fix custom :type.
Glenn Morris <rgm@gnu.org>
parents:
92685
diff
changeset
|
120 |
f656dd57b318
(diary-face-attrs): Fix custom :type.
Glenn Morris <rgm@gnu.org>
parents:
92685
diff
changeset
|
121 (defcustom diary-glob-file-regexp-prefix "^\\#" |
92973
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
122 "Regular expression pre-pended to `diary-face-attrs' for file-wide specifiers." |
92696
f656dd57b318
(diary-face-attrs): Fix custom :type.
Glenn Morris <rgm@gnu.org>
parents:
92685
diff
changeset
|
123 :type 'regexp |
92595 | 124 :group 'diary) |
125 | |
126 (defcustom diary-file-name-prefix nil | |
127 "Non-nil means prefix each diary entry with the name of the file defining it." | |
128 :type 'boolean | |
129 :group 'diary) | |
130 | |
131 (defcustom diary-file-name-prefix-function 'identity | |
132 "The function that will take a diary file name and return the desired prefix." | |
133 :type 'function | |
134 :group 'diary) | |
135 | |
136 (defcustom sexp-diary-entry-symbol "%%" | |
137 "The string used to indicate a sexp diary entry in `diary-file'. | |
138 See the documentation for the function `list-sexp-diary-entries'." | |
139 :type 'string | |
140 :group 'diary) | |
141 | |
142 (defcustom list-diary-entries-hook nil | |
143 "List of functions called after diary file is culled for relevant entries. | |
93270
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
144 You might wish to add `include-other-diary-files', in which case |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
145 you will probably also want to add `mark-included-diary-files' to |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
146 `mark-diary-entries-hook'. For example, you could use |
92595 | 147 |
92664
e7052a7b4ab1
(diary-list-entries, include-other-diary-files, mark-diary-entries)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92604
diff
changeset
|
148 (add-hook 'list-diary-entries-hook 'include-other-diary-files) |
e7052a7b4ab1
(diary-list-entries, include-other-diary-files, mark-diary-entries)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92604
diff
changeset
|
149 (add-hook 'list-diary-entries-hook 'sort-diary-entries) |
e7052a7b4ab1
(diary-list-entries, include-other-diary-files, mark-diary-entries)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92604
diff
changeset
|
150 (add-hook 'diary-display-hook 'fancy-diary-display) |
92595 | 151 |
152 in your `.emacs' file to cause the fancy diary buffer to be displayed with | |
153 diary entries from various included files, each day's entries sorted into | |
154 lexicographic order." | |
155 :type 'hook | |
156 :options '(include-other-diary-files sort-diary-entries) | |
157 :group 'diary) | |
158 | |
159 (defcustom mark-diary-entries-hook nil | |
160 "List of functions called after marking diary entries in the calendar. | |
93270
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
161 You might wish to add `mark-included-diary-files', in which case |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
162 you will probably also want to add `include-other-diary-files' to |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
163 `list-diary-entries-hook'." |
92595 | 164 :type 'hook |
165 :options '(mark-included-diary-files) | |
166 :group 'diary) | |
167 | |
168 (defcustom nongregorian-diary-listing-hook nil | |
169 "List of functions called for listing diary file and included files. | |
170 As the files are processed for diary entries, these functions are used | |
93027
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
171 to cull relevant entries. You can use any or all of |
92595 | 172 `list-hebrew-diary-entries', `list-islamic-diary-entries' and |
173 `diary-bahai-list-entries'. The documentation for these functions | |
174 describes the style of such diary entries." | |
175 :type 'hook | |
176 :options '(list-hebrew-diary-entries | |
92859 | 177 list-islamic-diary-entries |
178 diary-bahai-list-entries) | |
92595 | 179 :group 'diary) |
180 | |
181 (defcustom nongregorian-diary-marking-hook nil | |
182 "List of functions called for marking diary file and included files. | |
183 As the files are processed for diary entries, these functions are used | |
93027
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
184 to cull relevant entries. You can use any or all of |
92595 | 185 `mark-hebrew-diary-entries', `mark-islamic-diary-entries' and |
92675
141c5cc6c6fe
(nongregorian-diary-marking-hook, list-sexp-diary-entries): Doc fixes.
Glenn Morris <rgm@gnu.org>
parents:
92672
diff
changeset
|
186 `bahai-mark-diary-entries'. The documentation for these functions |
92595 | 187 describes the style of such diary entries." |
188 :type 'hook | |
189 :options '(mark-hebrew-diary-entries | |
92859 | 190 mark-islamic-diary-entries |
191 diary-bahai-mark-entries) | |
92595 | 192 :group 'diary) |
193 | |
194 (defcustom print-diary-entries-hook 'lpr-buffer | |
93331
1edfec53a698
(print-diary-entries-hook, diary-list-entries): Doc fixes.
Glenn Morris <rgm@gnu.org>
parents:
93284
diff
changeset
|
195 "Run by `print-diary-entries' after preparing a temporary diary buffer. |
1edfec53a698
(print-diary-entries-hook, diary-list-entries): Doc fixes.
Glenn Morris <rgm@gnu.org>
parents:
93284
diff
changeset
|
196 The buffer shows only the diary entries currently visible in the |
1edfec53a698
(print-diary-entries-hook, diary-list-entries): Doc fixes.
Glenn Morris <rgm@gnu.org>
parents:
93284
diff
changeset
|
197 diary buffer. The default just does the printing. Other uses |
1edfec53a698
(print-diary-entries-hook, diary-list-entries): Doc fixes.
Glenn Morris <rgm@gnu.org>
parents:
93284
diff
changeset
|
198 might include, for example, rearranging the lines into order by |
1edfec53a698
(print-diary-entries-hook, diary-list-entries): Doc fixes.
Glenn Morris <rgm@gnu.org>
parents:
93284
diff
changeset
|
199 day and time, saving the buffer instead of deleting it, or |
1edfec53a698
(print-diary-entries-hook, diary-list-entries): Doc fixes.
Glenn Morris <rgm@gnu.org>
parents:
93284
diff
changeset
|
200 changing the function used to do the printing." |
92595 | 201 :type 'hook |
202 :group 'diary) | |
203 | |
204 (defcustom diary-unknown-time -9999 | |
92696
f656dd57b318
(diary-face-attrs): Fix custom :type.
Glenn Morris <rgm@gnu.org>
parents:
92685
diff
changeset
|
205 "Value returned by `diary-entry-time' when no time is found. |
93331
1edfec53a698
(print-diary-entries-hook, diary-list-entries): Doc fixes.
Glenn Morris <rgm@gnu.org>
parents:
93284
diff
changeset
|
206 The default value -9999 causes entries with no recognizable time |
1edfec53a698
(print-diary-entries-hook, diary-list-entries): Doc fixes.
Glenn Morris <rgm@gnu.org>
parents:
93284
diff
changeset
|
207 to be placed before those with times; 9999 would place entries |
1edfec53a698
(print-diary-entries-hook, diary-list-entries): Doc fixes.
Glenn Morris <rgm@gnu.org>
parents:
93284
diff
changeset
|
208 with no recognizable time after those with times." |
92595 | 209 :type 'integer |
210 :group 'diary | |
211 :version "20.3") | |
212 | |
213 (defcustom diary-mail-addr | |
214 (if (boundp 'user-mail-address) user-mail-address "") | |
215 "Email address that `diary-mail-entries' will send email to." | |
216 :group 'diary | |
217 :type 'string | |
218 :version "20.3") | |
219 | |
220 (defcustom diary-mail-days 7 | |
221 "Default number of days for `diary-mail-entries' to check." | |
222 :group 'diary | |
223 :type 'integer | |
224 :version "20.3") | |
225 | |
226 (defcustom diary-remind-message | |
227 '("Reminder: Only " | |
92696
f656dd57b318
(diary-face-attrs): Fix custom :type.
Glenn Morris <rgm@gnu.org>
parents:
92685
diff
changeset
|
228 (if (zerop (% days 7)) |
92994
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
229 (format "%d week%s" (/ days 7) (if (= 7 days) "" "s")) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
230 (format "%d day%s" days (if (= 1 days) "" "s"))) |
92595 | 231 " until " |
232 diary-entry) | |
233 "Pseudo-pattern giving form of reminder messages in the fancy diary display. | |
234 | |
235 Used by the function `diary-remind', a pseudo-pattern is a list of | |
236 expressions that can involve the keywords `days' (a number), `date' (a list of | |
237 month, day, year), and `diary-entry' (a string)." | |
238 :type 'sexp | |
239 :group 'diary) | |
240 | |
93331
1edfec53a698
(print-diary-entries-hook, diary-list-entries): Doc fixes.
Glenn Morris <rgm@gnu.org>
parents:
93284
diff
changeset
|
241 (defcustom abbreviated-calendar-year t |
1edfec53a698
(print-diary-entries-hook, diary-list-entries): Doc fixes.
Glenn Morris <rgm@gnu.org>
parents:
93284
diff
changeset
|
242 "Interpret a two-digit year DD in a diary entry as either 19DD or 20DD. |
1edfec53a698
(print-diary-entries-hook, diary-list-entries): Doc fixes.
Glenn Morris <rgm@gnu.org>
parents:
93284
diff
changeset
|
243 This applies to the Gregorian, Hebrew, Islamic, and Baha'i calendars. |
1edfec53a698
(print-diary-entries-hook, diary-list-entries): Doc fixes.
Glenn Morris <rgm@gnu.org>
parents:
93284
diff
changeset
|
244 When the current century is added to a two-digit year, if the result |
1edfec53a698
(print-diary-entries-hook, diary-list-entries): Doc fixes.
Glenn Morris <rgm@gnu.org>
parents:
93284
diff
changeset
|
245 is more than 50 years in the future, the previous century is assumed. |
1edfec53a698
(print-diary-entries-hook, diary-list-entries): Doc fixes.
Glenn Morris <rgm@gnu.org>
parents:
93284
diff
changeset
|
246 If the result is more than 50 years in the past, the next century is assumed. |
1edfec53a698
(print-diary-entries-hook, diary-list-entries): Doc fixes.
Glenn Morris <rgm@gnu.org>
parents:
93284
diff
changeset
|
247 If this variable is nil, years must be written in full." |
1edfec53a698
(print-diary-entries-hook, diary-list-entries): Doc fixes.
Glenn Morris <rgm@gnu.org>
parents:
93284
diff
changeset
|
248 :type 'boolean |
1edfec53a698
(print-diary-entries-hook, diary-list-entries): Doc fixes.
Glenn Morris <rgm@gnu.org>
parents:
93284
diff
changeset
|
249 :group 'diary) |
1edfec53a698
(print-diary-entries-hook, diary-list-entries): Doc fixes.
Glenn Morris <rgm@gnu.org>
parents:
93284
diff
changeset
|
250 |
92595 | 251 (defcustom diary-outlook-formats |
252 '( | |
253 ;; When: 11 October 2001 12:00-14:00 (GMT) Greenwich Mean Time : Dublin, ... | |
254 ;; [Current UK format? The timezone is meaningless. Sometimes the | |
255 ;; Where is missing.] | |
256 ("When: \\([0-9]+ [[:alpha:]]+ [0-9]+\\) \ | |
257 \\([^ ]+\\) [^\n]+ | |
258 \[^\n]+ | |
259 \\(?:Where: \\([^\n]+\\)\n+\\)? | |
260 \\*~\\*~\\*~\\*~\\*~\\*~\\*~\\*~\\*~\\*" | |
261 . "\\1\n \\2 %s, \\3") | |
262 ;; When: Tuesday, April 30, 2002 03:00 PM-03:30 PM (GMT) Greenwich Mean ... | |
263 ;; [Old UK format?] | |
264 ("^When: [[:alpha:]]+, \\([[:alpha:]]+\\) \\([0-9][0-9]*\\), \\([0-9]\\{4\\}\\) \ | |
265 \\([^ ]+\\) [^\n]+ | |
266 \[^\n]+ | |
267 \\(?:Where: \\([^\n]+\\)\\)?\n+" | |
268 . "\\2 \\1 \\3\n \\4 %s, \\5") | |
269 ( | |
270 ;; German format, apparently. | |
271 "^Zeit: [^ ]+, +\\([0-9]+\\)\. +\\([[:upper:]][[:lower:]][[:lower:]]\\)[^ ]* +\\([0-9]+\\) +\\([^ ]+\\).*$" | |
272 . "\\1 \\2 \\3\n \\4 %s")) | |
273 "Alist of regexps matching message text and replacement text. | |
274 | |
275 The regexp must match the start of the message text containing an | |
276 appointment, but need not include a leading `^'. If it matches the | |
277 current message, a diary entry is made from the corresponding | |
278 template. If the template is a string, it should be suitable for | |
279 passing to `replace-match', and so will have occurrences of `\\D' to | |
280 substitute the match for the Dth subexpression. It must also contain | |
281 a single `%s' which will be replaced with the text of the message's | |
282 Subject field. Any other `%' characters must be doubled, so that the | |
283 template can be passed to `format'. | |
284 | |
285 If the template is actually a function, it is called with the message | |
286 body text as argument, and may use `match-string' etc. to make a | |
287 template following the rules above." | |
288 :type '(alist :key-type (regexp :tag "Regexp matching time/place") | |
92859 | 289 :value-type (choice |
290 (string :tag "Template for entry") | |
291 (function :tag | |
292 "Unary function providing template"))) | |
92595 | 293 :version "22.1" |
294 :group 'diary) | |
295 | |
93331
1edfec53a698
(print-diary-entries-hook, diary-list-entries): Doc fixes.
Glenn Morris <rgm@gnu.org>
parents:
93284
diff
changeset
|
296 (defvar diary-header-line-flag) |
1edfec53a698
(print-diary-entries-hook, diary-list-entries): Doc fixes.
Glenn Morris <rgm@gnu.org>
parents:
93284
diff
changeset
|
297 (defvar diary-header-line-format) |
93232
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
298 |
93270
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
299 (defun diary-set-header (symbol value) |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
300 "Set SYMBOL's value to VALUE, and redraw the diary header if necessary." |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
301 (let ((oldvalue (symbol-value symbol)) |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
302 (dbuff (and diary-file |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
303 (find-buffer-visiting |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
304 (substitute-in-file-name diary-file))))) |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
305 (custom-set-default symbol value) |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
306 (and dbuff |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
307 (not (equal value oldvalue)) |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
308 (with-current-buffer dbuff |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
309 (if (eq major-mode 'diary-mode) |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
310 (setq header-line-format (and diary-header-line-flag |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
311 diary-header-line-format))))))) |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
312 |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
313 ;; This can be removed once the kill/yank treatment of invisible text |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
314 ;; (see etc/TODO) is fixed. -- gm |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
315 (defcustom diary-header-line-flag t |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
316 "Non-nil means `simple-diary-display' will show a header line. |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
317 The format of the header is specified by `diary-header-line-format'." |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
318 :group 'diary |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
319 :type 'boolean |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
320 :initialize 'custom-initialize-default |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
321 :set 'diary-set-header |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
322 :version "22.1") |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
323 |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
324 (defvar diary-selective-display nil |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
325 "Internal diary variable; non-nil if some diary text is hidden.") |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
326 |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
327 (defcustom diary-header-line-format |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
328 '(:eval (calendar-string-spread |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
329 (list (if diary-selective-display |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
330 "Some text is hidden - press \"s\" in calendar \ |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
331 before edit/copy" |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
332 "Diary")) |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
333 ?\s (frame-width))) |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
334 "Format of the header line displayed by `simple-diary-display'. |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
335 Only used if `diary-header-line-flag' is non-nil." |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
336 :group 'diary |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
337 :type 'sexp |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
338 :initialize 'custom-initialize-default |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
339 :set 'diary-set-header |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
340 :version "22.1") |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
341 |
93232
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
342 ;; The first version of this also checked for diary-selective-display |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
343 ;; in the non-fancy case. This was an attempt to distinguish between |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
344 ;; displaying the diary and just visiting the diary file. However, |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
345 ;; when using fancy diary, calling diary when there are no entries to |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
346 ;; display does not create the fancy buffer, nor does it set |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
347 ;; diary-selective-display in the diary buffer. This means some |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
348 ;; customizations will not take effect, eg: |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
349 ;; http://lists.gnu.org/archive/html/emacs-pretest-bug/2007-03/msg00466.html |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
350 ;; So the check for diary-selective-display was dropped. This means the |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
351 ;; diary will be displayed if one customizes a diary variable while |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
352 ;; just visiting the diary-file. This is i) unlikely, and ii) no great loss. |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
353 ;;;###cal-autoload |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
354 (defun diary-live-p () |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
355 "Return non-nil if the diary is being displayed." |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
356 (or (get-buffer fancy-diary-buffer) |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
357 (and diary-file |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
358 (find-buffer-visiting (substitute-in-file-name diary-file))))) |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
359 |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
360 ;;;###cal-autoload |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
361 (defun diary-set-maybe-redraw (symbol value) |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
362 "Set SYMBOL's value to VALUE, and redraw the diary if necessary. |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
363 Redraws the diary if it is being displayed (note this is not the same as |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
364 just visiting the `diary-file'), and SYMBOL's value is to be changed." |
93270
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
365 (let ((oldvalue (symbol-value symbol))) |
93232
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
366 (custom-set-default symbol value) |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
367 (and (not (equal value oldvalue)) |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
368 (diary-live-p) |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
369 ;; Note this assumes diary was called without prefix arg. |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
370 (diary)))) |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
371 |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
372 (defcustom number-of-diary-entries 1 |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
373 "Specifies how many days of diary entries are to be displayed initially. |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
374 This variable affects the diary display when the command \\[diary] is used, |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
375 or if the value of the variable `view-diary-entries-initially' is non-nil. |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
376 For example, if the default value 1 is used, then only the current day's diary |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
377 entries will be displayed. If the value 2 is used, then both the current |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
378 day's and the next day's entries will be displayed. |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
379 |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
380 The value can also be a vector such as [0 2 2 2 2 4 1]; this value |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
381 says to display no diary entries on Sunday, the entries for |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
382 the current date and the day after on Monday through Thursday, |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
383 Friday through Monday's entries on Friday, and only Saturday's |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
384 entries on Saturday. |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
385 |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
386 This variable does not affect the diary display with the `d' command |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
387 from the calendar; in that case, the prefix argument controls the |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
388 number of days of diary entries displayed." |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
389 :type '(choice (integer :tag "Entries") |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
390 (vector :value [0 0 0 0 0 0 0] |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
391 (integer :tag "Sunday") |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
392 (integer :tag "Monday") |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
393 (integer :tag "Tuesday") |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
394 (integer :tag "Wednesday") |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
395 (integer :tag "Thursday") |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
396 (integer :tag "Friday") |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
397 (integer :tag "Saturday"))) |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
398 :initialize 'custom-initialize-default |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
399 :set 'diary-set-maybe-redraw |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
400 :group 'diary) |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
401 |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
402 ;;; More user options in calendar.el. |
92595 | 403 |
404 | |
51640
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
405 (defun diary-check-diary-file () |
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
406 "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
|
407 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
|
408 (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
|
409 (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
|
410 (if (file-readable-p d-file) |
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
411 d-file |
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
412 (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
|
413 (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
|
414 |
13053 | 415 ;;;###autoload |
416 (defun diary (&optional arg) | |
417 "Generate the diary window for ARG days starting with the current date. | |
418 If no argument is provided, the number of days of diary entries is governed | |
53557 | 419 by the variable `number-of-diary-entries'. A value of ARG less than 1 |
420 does nothing. This function is suitable for execution in a `.emacs' file." | |
13053 | 421 (interactive "P") |
51640
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
422 (diary-check-diary-file) |
92994
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
423 (diary-list-entries (calendar-current-date) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
424 (if arg (prefix-numeric-value arg)))) |
13053 | 425 |
92843
de680a2b3b3b
(diary-loaddefs): Load this rather than explicit autoloads.
Glenn Morris <rgm@gnu.org>
parents:
92696
diff
changeset
|
426 ;;;###cal-autoload |
65476
11058ae1650f
Use with-current-buffer, match-string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65108
diff
changeset
|
427 (defun diary-view-entries (&optional arg) |
13053 | 428 "Prepare and display a buffer with diary entries. |
429 Searches the file named in `diary-file' for entries that | |
430 match ARG days starting with the date indicated by the cursor position | |
431 in the displayed three-month calendar." | |
432 (interactive "p") | |
51640
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
433 (diary-check-diary-file) |
65476
11058ae1650f
Use with-current-buffer, match-string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65108
diff
changeset
|
434 (diary-list-entries (calendar-cursor-to-date t) arg)) |
13053 | 435 |
93232
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
436 (define-obsolete-function-alias 'view-diary-entries 'diary-view-entries) |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
437 |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
438 |
92843
de680a2b3b3b
(diary-loaddefs): Load this rather than explicit autoloads.
Glenn Morris <rgm@gnu.org>
parents:
92696
diff
changeset
|
439 ;;;###cal-autoload |
92994
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
440 (defun view-other-diary-entries (arg dfile) |
13053 | 441 "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
|
442 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
|
443 by the cursor position in the displayed three-month calendar. |
92994
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
444 DFILE specifies the file to use as the diary file." |
13053 | 445 (interactive |
59043
5ddb0b71254b
(view-other-diary-entries): Use current-prefix-arg in interactive spec.
Glenn Morris <rgm@gnu.org>
parents:
58101
diff
changeset
|
446 (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
|
447 (read-file-name "Enter diary file name: " default-directory nil t))) |
92994
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
448 (let ((diary-file dfile)) |
70183
2febbeb39125
(view-other-diary-entries): Refer to `diary-view-entries' rather than
Glenn Morris <rgm@gnu.org>
parents:
68721
diff
changeset
|
449 (diary-view-entries arg))) |
13053 | 450 |
65476
11058ae1650f
Use with-current-buffer, match-string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65108
diff
changeset
|
451 (defvar diary-syntax-table |
11058ae1650f
Use with-current-buffer, match-string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65108
diff
changeset
|
452 (let ((st (copy-syntax-table (standard-syntax-table)))) |
11058ae1650f
Use with-current-buffer, match-string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65108
diff
changeset
|
453 (modify-syntax-entry ?* "w" st) |
11058ae1650f
Use with-current-buffer, match-string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65108
diff
changeset
|
454 (modify-syntax-entry ?: "w" st) |
11058ae1650f
Use with-current-buffer, match-string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65108
diff
changeset
|
455 st) |
13053 | 456 "The syntax table used when parsing dates in the diary file. |
457 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
|
458 syntax of `*' and `:' changed to be word constituents.") |
13053 | 459 |
49737
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
460 (defun diary-attrtype-convert (attrvalue type) |
51640
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
461 "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
|
462 Valid TYPEs are: string, symbol, int, stringtnil, tnil." |
92696
f656dd57b318
(diary-face-attrs): Fix custom :type.
Glenn Morris <rgm@gnu.org>
parents:
92685
diff
changeset
|
463 (cond ((eq type 'string) attrvalue) |
93270
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
464 ((eq type 'symbol) (intern-soft attrvalue)) |
92859 | 465 ((eq type 'int) (string-to-number attrvalue)) |
466 ((eq type 'stringtnil) | |
467 (cond ((string-equal "t" attrvalue) t) | |
468 ((string-equal "nil" attrvalue) nil) | |
469 (t attrvalue))) | |
470 ((eq type 'tnil) (string-equal "t" attrvalue)))) | |
49737
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
471 |
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
472 (defun diary-pull-attrs (entry fileglobattrs) |
92696
f656dd57b318
(diary-face-attrs): Fix custom :type.
Glenn Morris <rgm@gnu.org>
parents:
92685
diff
changeset
|
473 "Search for matches for regexps from `diary-face-attrs'. |
f656dd57b318
(diary-face-attrs): Fix custom :type.
Glenn Morris <rgm@gnu.org>
parents:
92685
diff
changeset
|
474 If ENTRY is nil, searches from the start of the current buffer, and |
f656dd57b318
(diary-face-attrs): Fix custom :type.
Glenn Morris <rgm@gnu.org>
parents:
92685
diff
changeset
|
475 prepends all regexps with `diary-glob-file-regexp-prefix'. |
f656dd57b318
(diary-face-attrs): Fix custom :type.
Glenn Morris <rgm@gnu.org>
parents:
92685
diff
changeset
|
476 If ENTRY is a string, search for matches in that string, and remove them. |
f656dd57b318
(diary-face-attrs): Fix custom :type.
Glenn Morris <rgm@gnu.org>
parents:
92685
diff
changeset
|
477 Returns a list of ENTRY followed by (ATTRIBUTE VALUE) pairs. |
f656dd57b318
(diary-face-attrs): Fix custom :type.
Glenn Morris <rgm@gnu.org>
parents:
92685
diff
changeset
|
478 When ENTRY is non-nil, FILEGLOBATTRS forms the start of the (ATTRIBUTE VALUE) |
f656dd57b318
(diary-face-attrs): Fix custom :type.
Glenn Morris <rgm@gnu.org>
parents:
92685
diff
changeset
|
479 pairs." |
f656dd57b318
(diary-face-attrs): Fix custom :type.
Glenn Morris <rgm@gnu.org>
parents:
92685
diff
changeset
|
480 (let (regexp regnum attrname attrname attrvalue type ret-attr) |
f656dd57b318
(diary-face-attrs): Fix custom :type.
Glenn Morris <rgm@gnu.org>
parents:
92685
diff
changeset
|
481 (if (null entry) |
92859 | 482 (save-excursion |
483 (dolist (attr diary-face-attrs) | |
484 ;; FIXME inefficient searching. | |
485 (goto-char (point-min)) | |
486 (setq regexp (concat diary-glob-file-regexp-prefix (car attr)) | |
487 regnum (cadr attr) | |
488 attrname (nth 2 attr) | |
489 type (nth 3 attr) | |
490 attrvalue (if (re-search-forward regexp nil t) | |
491 (match-string-no-properties regnum))) | |
492 (and attrvalue | |
493 (setq attrvalue (diary-attrtype-convert attrvalue type)) | |
494 (setq ret-attr (append ret-attr | |
495 (list attrname attrvalue)))))) | |
92696
f656dd57b318
(diary-face-attrs): Fix custom :type.
Glenn Morris <rgm@gnu.org>
parents:
92685
diff
changeset
|
496 (setq ret-attr fileglobattrs) |
f656dd57b318
(diary-face-attrs): Fix custom :type.
Glenn Morris <rgm@gnu.org>
parents:
92685
diff
changeset
|
497 (dolist (attr diary-face-attrs) |
92859 | 498 (setq regexp (car attr) |
499 regnum (cadr attr) | |
500 attrname (nth 2 attr) | |
501 type (nth 3 attr) | |
502 attrvalue nil) | |
93331
1edfec53a698
(print-diary-entries-hook, diary-list-entries): Doc fixes.
Glenn Morris <rgm@gnu.org>
parents:
93284
diff
changeset
|
503 ;; If multiple matches, replace all, use the last (which may |
1edfec53a698
(print-diary-entries-hook, diary-list-entries): Doc fixes.
Glenn Morris <rgm@gnu.org>
parents:
93284
diff
changeset
|
504 ;; be the first instance in the line, if the regexp is |
1edfec53a698
(print-diary-entries-hook, diary-list-entries): Doc fixes.
Glenn Morris <rgm@gnu.org>
parents:
93284
diff
changeset
|
505 ;; anchored with $). |
1edfec53a698
(print-diary-entries-hook, diary-list-entries): Doc fixes.
Glenn Morris <rgm@gnu.org>
parents:
93284
diff
changeset
|
506 (while (string-match regexp entry) |
1edfec53a698
(print-diary-entries-hook, diary-list-entries): Doc fixes.
Glenn Morris <rgm@gnu.org>
parents:
93284
diff
changeset
|
507 (setq attrvalue (match-string-no-properties regnum entry) |
1edfec53a698
(print-diary-entries-hook, diary-list-entries): Doc fixes.
Glenn Morris <rgm@gnu.org>
parents:
93284
diff
changeset
|
508 entry (replace-match "" t t entry))) |
92859 | 509 (and attrvalue |
510 (setq attrvalue (diary-attrtype-convert attrvalue type)) | |
511 (setq ret-attr (append ret-attr (list attrname attrvalue)))))) | |
92696
f656dd57b318
(diary-face-attrs): Fix custom :type.
Glenn Morris <rgm@gnu.org>
parents:
92685
diff
changeset
|
512 (list entry ret-attr))) |
50699
fa4e7ecda348
(fancy-diary-display-mode): Bind "q" to `quit-window'
Sam Steingold <sds@gnu.org>
parents:
49737
diff
changeset
|
513 |
65476
11058ae1650f
Use with-current-buffer, match-string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65108
diff
changeset
|
514 |
70728 | 515 |
516 (defvar diary-modify-entry-list-string-function nil | |
517 "Function applied to entry string before putting it into the entries list. | |
518 Can be used by programs integrating a diary list into other buffers (e.g. | |
519 org.el and planner.el) to modify the string or add properties to it. | |
520 The function takes a string argument and must return a string.") | |
521 | |
92859 | 522 (defvar diary-entries-list) ; bound in diary-list-entries |
92696
f656dd57b318
(diary-face-attrs): Fix custom :type.
Glenn Morris <rgm@gnu.org>
parents:
92685
diff
changeset
|
523 |
70728 | 524 (defun add-to-diary-list (date string specifier &optional marker |
525 globcolor literal) | |
526 "Add an entry to `diary-entries-list'. | |
527 Do nothing if DATE or STRING is nil. DATE is the (MONTH DAY | |
528 YEAR) for which the entry applies; STRING is the text of the | |
529 entry as it will appear in the diary (i.e. with any format | |
70729
9a90863c52b1
(add-to-diary-list): Fix typo in previous doc fix.
Glenn Morris <rgm@gnu.org>
parents:
70728
diff
changeset
|
530 strings such as \"%d\" expanded); SPECIFIER is the date part of |
70728 | 531 the entry as it appears in the diary-file; LITERAL is the entry |
70729
9a90863c52b1
(add-to-diary-list): Fix typo in previous doc fix.
Glenn Morris <rgm@gnu.org>
parents:
70728
diff
changeset
|
532 as it appears in the diary-file (i.e. before expansion). If |
70728 | 533 LITERAL is nil, it is taken to be the same as STRING. |
534 | |
535 The entry is added to the list as (DATE STRING SPECIFIER LOCATOR | |
536 GLOBCOLOR), where LOCATOR has the form (MARKER FILENAME LITERAL), | |
537 FILENAME being the file containing the diary entry." | |
538 (when (and date string) | |
539 (if diary-file-name-prefix | |
540 (let ((prefix (funcall diary-file-name-prefix-function | |
541 (buffer-file-name)))) | |
92696
f656dd57b318
(diary-face-attrs): Fix custom :type.
Glenn Morris <rgm@gnu.org>
parents:
92685
diff
changeset
|
542 (or (string-equal prefix "") |
70728 | 543 (setq string (format "[%s] %s" prefix string))))) |
544 (and diary-modify-entry-list-string-function | |
92859 | 545 (setq string (funcall diary-modify-entry-list-string-function |
546 string))) | |
70728 | 547 (setq diary-entries-list |
548 (append diary-entries-list | |
549 (list (list date string specifier | |
550 (list marker (buffer-file-name) literal) | |
551 globcolor)))))) | |
552 | |
92994
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
553 (defun diary-list-entries-2 (date mark globattr list-only |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
554 &optional months symbol) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
555 "Internal subroutine of `diary-list-entries'. |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
556 Find diary entries applying to DATE, by searching from point-min for |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
557 each element of `diary-date-forms'. MARK indicates an entry is non-marking. |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
558 GLOBATTR is the list of global file attributes. If LIST-ONLY is |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
559 non-nil, don't change the buffer, only return a list of entries. |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
560 Optional array MONTHS replaces `calendar-month-name-array', and |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
561 means months cannot be abbreviated. Optional string SYMBOL marks diary |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
562 entries of the desired type. Returns non-nil if any entries were found." |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
563 (let* ((month (extract-calendar-month date)) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
564 (day (extract-calendar-day date)) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
565 (year (extract-calendar-year date)) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
566 (dayname (format "%s\\|%s\\.?" (calendar-day-name date) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
567 (calendar-day-name date 'abbrev))) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
568 (calendar-month-name-array (or months calendar-month-name-array)) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
569 (monthname (format "\\*\\|%s%s" (calendar-month-name month) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
570 (if months "" |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
571 (format "\\|%s\\.?" |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
572 (calendar-month-name month 'abbrev))))) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
573 (month (format "\\*\\|0*%d" month)) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
574 (day (format "\\*\\|0*%d" day)) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
575 (year (format "\\*\\|0*%d%s" year |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
576 (if abbreviated-calendar-year |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
577 (format "\\|%02d" (% year 100)) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
578 ""))) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
579 (case-fold-search t) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
580 entry-found) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
581 (dolist (date-form diary-date-forms) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
582 (let ((backup (when (eq (car date-form) 'backup) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
583 (setq date-form (cdr date-form)) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
584 t)) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
585 ;; date-form uses day etc as set above. |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
586 (regexp (format "^%s?%s\\(%s\\)" (regexp-quote mark) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
587 (if symbol (regexp-quote symbol) "") |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
588 (mapconcat 'eval date-form "\\)\\(?:"))) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
589 entry-start date-start temp) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
590 (goto-char (point-min)) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
591 (while (re-search-forward regexp nil t) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
592 (if backup (re-search-backward "\\<" nil t)) |
93280
e4f021df35fd
(list-sexp-diary-entries): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
93276
diff
changeset
|
593 ;; regexp moves us past the end of date, onto the next line. |
e4f021df35fd
(list-sexp-diary-entries): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
93276
diff
changeset
|
594 ;; Trailing whitespace after date not allowed (see diary-file). |
92994
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
595 (if (and (bolp) (not (looking-at "[ \t]"))) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
596 ;; Diary entry that consists only of date. |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
597 (backward-char 1) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
598 ;; Found a nonempty diary entry--make it |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
599 ;; visible and add it to the list. |
93331
1edfec53a698
(print-diary-entries-hook, diary-list-entries): Doc fixes.
Glenn Morris <rgm@gnu.org>
parents:
93284
diff
changeset
|
600 (setq date-start (line-end-position 0)) |
92994
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
601 ;; Actual entry starts on the next-line? |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
602 (if (looking-at "[ \t]*\n[ \t]") (forward-line 1)) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
603 (setq entry-found t |
93331
1edfec53a698
(print-diary-entries-hook, diary-list-entries): Doc fixes.
Glenn Morris <rgm@gnu.org>
parents:
93284
diff
changeset
|
604 entry-start (point)) |
92994
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
605 (forward-line 1) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
606 (while (looking-at "[ \t]") ; continued entry |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
607 (forward-line 1)) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
608 (unless (and (eobp) (not (bolp))) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
609 (backward-char 1)) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
610 (unless list-only |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
611 (remove-overlays date-start (point) 'invisible 'diary)) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
612 (setq temp (diary-pull-attrs |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
613 (buffer-substring-no-properties |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
614 entry-start (point)) globattr)) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
615 (add-to-diary-list |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
616 date (car temp) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
617 (buffer-substring-no-properties (1+ date-start) (1- entry-start)) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
618 (copy-marker entry-start) (cadr temp)))))) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
619 entry-found)) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
620 |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
621 (defvar original-date) ; from diary-list-entries |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
622 (defvar file-glob-attrs) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
623 (defvar list-only) |
93375
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
624 (defvar number) |
92994
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
625 |
92973
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
626 (defun diary-list-entries-1 (months symbol absfunc) |
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
627 "List diary entries of a certain type. |
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
628 MONTHS is an array of month names. SYMBOL marks diary entries of the type |
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
629 in question. ABSFUNC is a function that converts absolute dates to dates |
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
630 of the appropriate type." |
92994
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
631 (let ((gdate original-date)) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
632 (dotimes (idummy number) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
633 (diary-list-entries-2 |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
634 (funcall absfunc (calendar-absolute-from-gregorian gdate)) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
635 diary-nonmarking-symbol file-glob-attrs list-only months symbol) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
636 (setq gdate |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
637 (calendar-gregorian-from-absolute |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
638 (1+ (calendar-absolute-from-gregorian gdate)))))) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
639 (goto-char (point-min))) |
92973
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
640 |
93027
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
641 ;; FIXME non-greg and list hooks run same number of times? |
65476
11058ae1650f
Use with-current-buffer, match-string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65108
diff
changeset
|
642 (define-obsolete-function-alias 'list-diary-entries 'diary-list-entries) |
65875
8c8c651e39cc
Use overlays rather than selective-display.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65619
diff
changeset
|
643 (defun diary-list-entries (date number &optional list-only) |
65476
11058ae1650f
Use with-current-buffer, match-string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65108
diff
changeset
|
644 "Create and display a buffer containing the relevant lines in `diary-file'. |
13053 | 645 The arguments are DATE and NUMBER; the entries selected are those |
646 for NUMBER days starting with date DATE. The other entries are hidden | |
92973
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
647 using overlays. If NUMBER is less than 1, this function does nothing. |
13053 | 648 |
649 Returns a list of all relevant diary entries found, if any, in order by date. | |
65875
8c8c651e39cc
Use overlays rather than selective-display.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65619
diff
changeset
|
650 The list entries have the form ((MONTH DAY YEAR) STRING SPECIFIER) where |
8c8c651e39cc
Use overlays rather than selective-display.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65619
diff
changeset
|
651 \(MONTH DAY YEAR) is the date of the entry, STRING is the entry text, and |
8c8c651e39cc
Use overlays rather than selective-display.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65619
diff
changeset
|
652 SPECIFIER is the applicability. If the variable `diary-list-include-blanks' |
92973
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
653 is non-nil, this list includes a dummy diary entry consisting of the empty |
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
654 string for a date with no diary entries. |
13053 | 655 |
93331
1edfec53a698
(print-diary-entries-hook, diary-list-entries): Doc fixes.
Glenn Morris <rgm@gnu.org>
parents:
93284
diff
changeset
|
656 After the list is prepared, the following hooks are run: |
13053 | 657 |
93331
1edfec53a698
(print-diary-entries-hook, diary-list-entries): Doc fixes.
Glenn Morris <rgm@gnu.org>
parents:
93284
diff
changeset
|
658 `nongregorian-diary-listing-hook' can cull dates from the diary |
1edfec53a698
(print-diary-entries-hook, diary-list-entries): Doc fixes.
Glenn Morris <rgm@gnu.org>
parents:
93284
diff
changeset
|
659 and each included file, for example to process Islamic diary |
1edfec53a698
(print-diary-entries-hook, diary-list-entries): Doc fixes.
Glenn Morris <rgm@gnu.org>
parents:
93284
diff
changeset
|
660 entries. Applied to *each* file. |
13053 | 661 |
93331
1edfec53a698
(print-diary-entries-hook, diary-list-entries): Doc fixes.
Glenn Morris <rgm@gnu.org>
parents:
93284
diff
changeset
|
662 `list-diary-entries-hook' adds or manipulates diary entries from |
1edfec53a698
(print-diary-entries-hook, diary-list-entries): Doc fixes.
Glenn Morris <rgm@gnu.org>
parents:
93284
diff
changeset
|
663 external sources. Used, for example, to include diary entries |
1edfec53a698
(print-diary-entries-hook, diary-list-entries): Doc fixes.
Glenn Morris <rgm@gnu.org>
parents:
93284
diff
changeset
|
664 from other files or to sort the diary entries. Invoked *once* |
1edfec53a698
(print-diary-entries-hook, diary-list-entries): Doc fixes.
Glenn Morris <rgm@gnu.org>
parents:
93284
diff
changeset
|
665 only, before the display hook is run. |
13053 | 666 |
93331
1edfec53a698
(print-diary-entries-hook, diary-list-entries): Doc fixes.
Glenn Morris <rgm@gnu.org>
parents:
93284
diff
changeset
|
667 `diary-display-hook' does the actual display of information. If nil, |
1edfec53a698
(print-diary-entries-hook, diary-list-entries): Doc fixes.
Glenn Morris <rgm@gnu.org>
parents:
93284
diff
changeset
|
668 `simple-diary-display' is used. Use `add-hook' to use |
1edfec53a698
(print-diary-entries-hook, diary-list-entries): Doc fixes.
Glenn Morris <rgm@gnu.org>
parents:
93284
diff
changeset
|
669 `fancy-diary-display', if desired, or `ignore' for no display. |
13053 | 670 |
93331
1edfec53a698
(print-diary-entries-hook, diary-list-entries): Doc fixes.
Glenn Morris <rgm@gnu.org>
parents:
93284
diff
changeset
|
671 `diary-hook' is run last. This is used e.g. by `appt-check'. |
65875
8c8c651e39cc
Use overlays rather than selective-display.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65619
diff
changeset
|
672 |
92683
95412a4235fc
(diary-list-entries): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
92675
diff
changeset
|
673 Functions called by these hooks may use the variables ORIGINAL-DATE |
95412a4235fc
(diary-list-entries): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
92675
diff
changeset
|
674 and NUMBER, which are the arguments with which this function was called. |
95412a4235fc
(diary-list-entries): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
92675
diff
changeset
|
675 Note that hook functions should _not_ use DATE, but ORIGINAL-DATE. |
92685
387ed7be028f
(diary-list-entries): Fix typo in previous doc fix.
Glenn Morris <rgm@gnu.org>
parents:
92683
diff
changeset
|
676 \(Sexp diary entries may use DATE - see `list-sexp-diary-entries'.) |
92675
141c5cc6c6fe
(nongregorian-diary-marking-hook, list-sexp-diary-entries): Doc fixes.
Glenn Morris <rgm@gnu.org>
parents:
92672
diff
changeset
|
677 |
65875
8c8c651e39cc
Use overlays rather than selective-display.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65619
diff
changeset
|
678 If LIST-ONLY is non-nil don't modify or display the buffer, only return a list." |
65476
11058ae1650f
Use with-current-buffer, match-string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65108
diff
changeset
|
679 (unless number |
11058ae1650f
Use with-current-buffer, match-string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65108
diff
changeset
|
680 (setq number (if (vectorp number-of-diary-entries) |
11058ae1650f
Use with-current-buffer, match-string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65108
diff
changeset
|
681 (aref number-of-diary-entries (calendar-day-of-week date)) |
11058ae1650f
Use with-current-buffer, match-string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65108
diff
changeset
|
682 number-of-diary-entries))) |
53557 | 683 (when (> number 0) |
92859 | 684 (let ((original-date date) ; save for possible use in the hooks |
53557 | 685 diary-entries-list |
686 file-glob-attrs | |
687 (date-string (calendar-date-string date)) | |
688 (d-file (substitute-in-file-name diary-file))) | |
689 (message "Preparing diary...") | |
690 (save-excursion | |
691 (let ((diary-buffer (find-buffer-visiting d-file))) | |
692 (if (not diary-buffer) | |
693 (set-buffer (find-file-noselect d-file t)) | |
694 (set-buffer diary-buffer) | |
695 (or (verify-visited-file-modtime diary-buffer) | |
696 (revert-buffer t t)))) | |
65875
8c8c651e39cc
Use overlays rather than selective-display.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65619
diff
changeset
|
697 ;; Setup things like the header-line-format and invisibility-spec. |
77292
c15c7123019d
(diary-header-line-format): Add a custom :set function.
Glenn Morris <rgm@gnu.org>
parents:
77279
diff
changeset
|
698 (if (eq major-mode default-major-mode) |
c15c7123019d
(diary-header-line-format): Add a custom :set function.
Glenn Morris <rgm@gnu.org>
parents:
77279
diff
changeset
|
699 (diary-mode) |
c15c7123019d
(diary-header-line-format): Add a custom :set function.
Glenn Morris <rgm@gnu.org>
parents:
77279
diff
changeset
|
700 ;; This kludge is to make customizations to |
c15c7123019d
(diary-header-line-format): Add a custom :set function.
Glenn Morris <rgm@gnu.org>
parents:
77279
diff
changeset
|
701 ;; diary-header-line-flag after diary has been displayed |
c15c7123019d
(diary-header-line-format): Add a custom :set function.
Glenn Morris <rgm@gnu.org>
parents:
77279
diff
changeset
|
702 ;; take effect. Unconditionally calling (diary-mode) |
c15c7123019d
(diary-header-line-format): Add a custom :set function.
Glenn Morris <rgm@gnu.org>
parents:
77279
diff
changeset
|
703 ;; clobbers file local variables. |
c15c7123019d
(diary-header-line-format): Add a custom :set function.
Glenn Morris <rgm@gnu.org>
parents:
77279
diff
changeset
|
704 ;; http://lists.gnu.org/archive/html/emacs-pretest-bug/2007-03/msg00363.html |
c15c7123019d
(diary-header-line-format): Add a custom :set function.
Glenn Morris <rgm@gnu.org>
parents:
77279
diff
changeset
|
705 ;; http://lists.gnu.org/archive/html/emacs-pretest-bug/2007-04/msg00404.html |
77293
e262afb73c6e
Improve previous fix by only setting header-line-format in diary-mode.
Glenn Morris <rgm@gnu.org>
parents:
77292
diff
changeset
|
706 (if (eq major-mode 'diary-mode) |
e262afb73c6e
Improve previous fix by only setting header-line-format in diary-mode.
Glenn Morris <rgm@gnu.org>
parents:
77292
diff
changeset
|
707 (setq header-line-format (and diary-header-line-flag |
e262afb73c6e
Improve previous fix by only setting header-line-format in diary-mode.
Glenn Morris <rgm@gnu.org>
parents:
77292
diff
changeset
|
708 diary-header-line-format)))) |
57255 | 709 ;; d-s-p is passed to the diary display function. |
710 (let ((diary-saved-point (point))) | |
711 (save-excursion | |
93027
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
712 (setq file-glob-attrs (cadr (diary-pull-attrs nil ""))) |
65476
11058ae1650f
Use with-current-buffer, match-string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65108
diff
changeset
|
713 (with-syntax-table diary-syntax-table |
92994
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
714 (goto-char (point-min)) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
715 (unless list-only |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
716 (let ((ol (make-overlay (point-min) (point-max) nil t nil))) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
717 (set (make-local-variable 'diary-selective-display) t) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
718 (overlay-put ol 'invisible 'diary) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
719 (overlay-put ol 'evaporate t))) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
720 (dotimes (idummy number) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
721 (let ((sexp-found (list-sexp-diary-entries date)) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
722 (entry-found (diary-list-entries-2 |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
723 date diary-nonmarking-symbol |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
724 file-glob-attrs list-only))) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
725 (if diary-list-include-blanks |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
726 (or sexp-found entry-found |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
727 (add-to-diary-list date "" "" "" ""))) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
728 (setq date |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
729 (calendar-gregorian-from-absolute |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
730 (1+ (calendar-absolute-from-gregorian date))))))) |
57255 | 731 (goto-char (point-min)) |
732 (run-hooks 'nongregorian-diary-listing-hook | |
733 'list-diary-entries-hook) | |
65875
8c8c651e39cc
Use overlays rather than selective-display.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65619
diff
changeset
|
734 (unless list-only |
8c8c651e39cc
Use overlays rather than selective-display.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65619
diff
changeset
|
735 (if diary-display-hook |
92862 | 736 (run-hooks 'diary-display-hook) |
737 (simple-diary-display))) | |
57255 | 738 (run-hooks 'diary-hook) |
739 diary-entries-list)))))) | |
13053 | 740 |
65476
11058ae1650f
Use with-current-buffer, match-string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65108
diff
changeset
|
741 (defun diary-unhide-everything () |
92696
f656dd57b318
(diary-face-attrs): Fix custom :type.
Glenn Morris <rgm@gnu.org>
parents:
92685
diff
changeset
|
742 "Show all invisible text in the diary." |
65875
8c8c651e39cc
Use overlays rather than selective-display.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65619
diff
changeset
|
743 (kill-local-variable 'diary-selective-display) |
8c8c651e39cc
Use overlays rather than selective-display.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65619
diff
changeset
|
744 (remove-overlays (point-min) (point-max) 'invisible 'diary) |
65476
11058ae1650f
Use with-current-buffer, match-string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65108
diff
changeset
|
745 (kill-local-variable 'mode-line-format)) |
11058ae1650f
Use with-current-buffer, match-string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65108
diff
changeset
|
746 |
92859 | 747 (defvar original-date) ; bound in diary-list-entries |
92696
f656dd57b318
(diary-face-attrs): Fix custom :type.
Glenn Morris <rgm@gnu.org>
parents:
92685
diff
changeset
|
748 (defvar number) |
f656dd57b318
(diary-face-attrs): Fix custom :type.
Glenn Morris <rgm@gnu.org>
parents:
92685
diff
changeset
|
749 |
13053 | 750 (defun include-other-diary-files () |
92696
f656dd57b318
(diary-face-attrs): Fix custom :type.
Glenn Morris <rgm@gnu.org>
parents:
92685
diff
changeset
|
751 "Include the diary entries from other diary files with those of `diary-file'. |
93270
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
752 This function is suitable for use with `list-diary-entries-hook'; |
13053 | 753 it enables you to use shared diary files together with your own. |
92696
f656dd57b318
(diary-face-attrs): Fix custom :type.
Glenn Morris <rgm@gnu.org>
parents:
92685
diff
changeset
|
754 The files included are specified in the `diary-file' by lines of this form: |
13053 | 755 #include \"filename\" |
756 This is recursive; that is, #include directives in diary files thus included | |
757 are obeyed. You can change the `#include' to some other string by | |
758 changing the variable `diary-include-string'." | |
759 (goto-char (point-min)) | |
760 (while (re-search-forward | |
92973
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
761 (format "^%s \"\\([^\"]*\\)\"" (regexp-quote diary-include-string)) |
13053 | 762 nil t) |
92683
95412a4235fc
(diary-list-entries): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
92675
diff
changeset
|
763 (let ((diary-file (substitute-in-file-name |
92859 | 764 (match-string-no-properties 1))) |
765 (diary-list-include-blanks nil) | |
766 (list-diary-entries-hook 'include-other-diary-files) | |
767 (diary-display-hook 'ignore) | |
768 (diary-hook nil)) | |
13053 | 769 (if (file-exists-p diary-file) |
770 (if (file-readable-p diary-file) | |
771 (unwind-protect | |
772 (setq diary-entries-list | |
773 (append diary-entries-list | |
70635
dcac2668b45d
(include-other-diary-files, diary-mail-entries): Refer to
Glenn Morris <rgm@gnu.org>
parents:
70183
diff
changeset
|
774 (diary-list-entries original-date number))) |
65476
11058ae1650f
Use with-current-buffer, match-string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65108
diff
changeset
|
775 (with-current-buffer (find-buffer-visiting diary-file) |
11058ae1650f
Use with-current-buffer, match-string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65108
diff
changeset
|
776 (diary-unhide-everything))) |
13053 | 777 (beep) |
778 (message "Can't read included diary file %s" diary-file) | |
779 (sleep-for 2)) | |
780 (beep) | |
781 (message "Can't find included diary file %s" diary-file) | |
782 (sleep-for 2)))) | |
92859 | 783 (goto-char (point-min))) |
13053 | 784 |
93270
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
785 (defvar date-string) ; bound in diary-list-entries |
92696
f656dd57b318
(diary-face-attrs): Fix custom :type.
Glenn Morris <rgm@gnu.org>
parents:
92685
diff
changeset
|
786 |
93270
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
787 (defun diary-display-no-entries () |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
788 "Common subroutine of `simple-diary-display' and `fancy-diary-display'. |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
789 Handles the case where there are no diary entries. |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
790 Returns a cons (NOENTRIES . HOLIDAY-STRING)." |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
791 (let* ((holiday-list (if holidays-in-diary-buffer |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
792 (calendar-check-holidays original-date))) |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
793 (hol-string (format "%s%s%s" |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
794 date-string |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
795 (if holiday-list ": " "") |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
796 (mapconcat 'identity holiday-list "; "))) |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
797 (msg (format "No diary entries for %s" hol-string)) |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
798 ;; Empty list, or single item with no text. |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
799 ;; FIXME multiple items with no text? |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
800 (noentries (or (not diary-entries-list) |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
801 (and (not (cdr diary-entries-list)) |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
802 (string-equal "" (cadr |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
803 (car diary-entries-list))))))) |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
804 ;; Inconsistency: whether or not the holidays are displayed in a |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
805 ;; separate buffer depends on if there are diary entries. |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
806 (when noentries |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
807 (if (or (< (length msg) (frame-width)) |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
808 (not holiday-list)) |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
809 (message "%s" msg) |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
810 ;; holiday-list which is too wide for a message gets a buffer. |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
811 (calendar-in-read-only-buffer holiday-buffer |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
812 (calendar-set-mode-line (format "Holidays for %s" date-string)) |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
813 (insert (mapconcat 'identity holiday-list "\n"))) |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
814 (message "No diary entries for %s" date-string))) |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
815 (cons noentries hol-string))) |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
816 |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
817 |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
818 (defvar diary-saved-point) ; bound in diary-list-entries |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
819 |
13053 | 820 (defun simple-diary-display () |
821 "Display the diary buffer if there are any relevant entries or holidays." | |
93270
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
822 ;; If selected window is dedicated (to the calendar), need a new one |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
823 ;; to display the diary. |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
824 (let* ((pop-up-frames (or pop-up-frames |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
825 (window-dedicated-p (selected-window)))) |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
826 (dbuff (find-buffer-visiting (substitute-in-file-name diary-file))) |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
827 (empty (diary-display-no-entries))) |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
828 ;; This may be too wide, but when simple diary is used there is |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
829 ;; nowhere else for the holidays to go. Also, it is documented in |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
830 ;; holidays-in-diary-buffer that the holidays go in the mode-line. |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
831 ;; FIXME however if there are no diary entries a separate buffer |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
832 ;; is displayed - this is inconsistent. |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
833 (with-current-buffer dbuff |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
834 (calendar-set-mode-line (format "Diary for %s" (cdr empty)))) |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
835 (unless (car empty) ; no entries |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
836 (with-current-buffer dbuff |
57255 | 837 (let ((window (display-buffer (current-buffer)))) |
92696
f656dd57b318
(diary-face-attrs): Fix custom :type.
Glenn Morris <rgm@gnu.org>
parents:
92685
diff
changeset
|
838 ;; d-s-p is passed from diary-list-entries. |
57255 | 839 (set-window-point window diary-saved-point) |
840 (set-window-start window (point-min)))) | |
13053 | 841 (message "Preparing diary...done")))) |
842 | |
48365
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
843 (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
|
844 'action #'diary-goto-entry |
63222
cd220f7e47e7
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-386
Miles Bader <miles@gnu.org>
parents:
62925
diff
changeset
|
845 'face 'diary-button) |
48365
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
846 |
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
847 (defun diary-goto-entry (button) |
92973
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
848 "Jump to the diary entry for the BUTTON at point." |
70728 | 849 (let* ((locator (button-get button 'locator)) |
850 (marker (car locator)) | |
851 markbuf file) | |
852 ;; If marker pointing to diary location is valid, use that. | |
853 (if (and marker (setq markbuf (marker-buffer marker))) | |
854 (progn | |
855 (pop-to-buffer markbuf) | |
856 (goto-char (marker-position marker))) | |
857 ;; Marker is invalid (eg buffer has been killed). | |
858 (or (and (setq file (cadr locator)) | |
859 (file-exists-p file) | |
860 (find-file-other-window file) | |
861 (progn | |
862 (when (eq major-mode default-major-mode) (diary-mode)) | |
863 (goto-char (point-min)) | |
864 (if (re-search-forward (format "%s.*\\(%s\\)" | |
865 (regexp-quote (nth 2 locator)) | |
866 (regexp-quote (nth 3 locator))) | |
867 nil t) | |
868 (goto-char (match-beginning 1))))) | |
869 (message "Unable to locate this diary entry"))))) | |
48365
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
870 |
13053 | 871 (defun fancy-diary-display () |
872 "Prepare a diary buffer with relevant entries in a fancy, noneditable form. | |
93270
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
873 To use this function, add it to `diary-display-hook'." |
92696
f656dd57b318
(diary-face-attrs): Fix custom :type.
Glenn Morris <rgm@gnu.org>
parents:
92685
diff
changeset
|
874 ;; Turn off selective-display in the diary file's buffer. |
f656dd57b318
(diary-face-attrs): Fix custom :type.
Glenn Morris <rgm@gnu.org>
parents:
92685
diff
changeset
|
875 (with-current-buffer |
65476
11058ae1650f
Use with-current-buffer, match-string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65108
diff
changeset
|
876 (find-buffer-visiting (substitute-in-file-name diary-file)) |
11058ae1650f
Use with-current-buffer, match-string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65108
diff
changeset
|
877 (diary-unhide-everything)) |
93270
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
878 (unless (car (diary-display-no-entries)) ; no entries |
92696
f656dd57b318
(diary-face-attrs): Fix custom :type.
Glenn Morris <rgm@gnu.org>
parents:
92685
diff
changeset
|
879 ;; Prepare the fancy diary buffer. |
93027
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
880 (calendar-in-read-only-buffer fancy-diary-buffer |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
881 (calendar-set-mode-line "Diary Entries") |
93270
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
882 (let ((holiday-list-last-month 1) |
13053 | 883 (holiday-list-last-year 1) |
93270
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
884 (date (list 0 0 0)) |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
885 holiday-list) |
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
886 (dolist (entry diary-entries-list) |
92973
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
887 (unless (calendar-date-equal date (car entry)) |
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
888 (setq date (car entry)) |
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
889 (and holidays-in-diary-buffer |
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
890 (calendar-date-compare |
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
891 (list (list holiday-list-last-month |
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
892 (calendar-last-day-of-month |
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
893 holiday-list-last-month |
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
894 holiday-list-last-year) |
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
895 holiday-list-last-year)) |
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
896 (list date)) |
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
897 ;; We need to get the holidays for the next 3 months. |
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
898 (setq holiday-list-last-month |
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
899 (extract-calendar-month date) |
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
900 holiday-list-last-year |
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
901 (extract-calendar-year date)) |
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
902 (progn |
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
903 (increment-calendar-month |
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
904 holiday-list-last-month holiday-list-last-year 1) |
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
905 t) |
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
906 (setq holiday-list |
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
907 (let ((displayed-month holiday-list-last-month) |
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
908 (displayed-year holiday-list-last-year)) |
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
909 (calendar-holiday-list))) |
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
910 (increment-calendar-month |
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
911 holiday-list-last-month holiday-list-last-year 1)) |
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
912 (let (date-holiday-list) |
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
913 ;; Make a list of all holidays for date. |
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
914 (dolist (h holiday-list) |
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
915 (if (calendar-date-equal date (car h)) |
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
916 (setq date-holiday-list (append date-holiday-list |
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
917 (cdr h))))) |
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
918 (insert (if (bobp) "" ?\n) (calendar-date-string date)) |
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
919 (if date-holiday-list (insert ": ")) |
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
920 (let ((l (current-column)) |
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
921 (longest 0)) |
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
922 (insert (mapconcat (lambda (x) |
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
923 (if (< longest (length x)) |
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
924 (setq longest (length x))) |
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
925 x) |
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
926 date-holiday-list |
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
927 (concat "\n" (make-string l ? )))) |
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
928 (insert ?\n (make-string (+ l longest) ?=) ?\n)))) |
92859 | 929 (let ((this-entry (cadr entry)) |
930 this-loc) | |
931 (unless (zerop (length this-entry)) | |
932 (if (setq this-loc (nth 3 entry)) | |
933 (insert-button (concat this-entry "\n") | |
934 ;; (MARKER FILENAME SPECIFIER LITERAL) | |
935 'locator (list (car this-loc) | |
936 (cadr this-loc) | |
937 (nth 2 entry) | |
938 (or (nth 2 this-loc) | |
939 (nth 1 entry))) | |
940 :type 'diary-entry) | |
941 (insert this-entry ?\n)) | |
942 (save-excursion | |
943 (let* ((marks (nth 4 entry)) | |
944 (faceinfo marks) | |
945 temp-face) | |
946 (when marks | |
947 (setq temp-face (make-symbol | |
948 (apply | |
949 'concat "temp-face-" | |
950 (mapcar (lambda (sym) | |
951 (if (stringp sym) | |
952 sym | |
953 (symbol-name sym))) | |
954 marks)))) | |
955 (make-face temp-face) | |
956 ;; Remove :face info from the marks, | |
957 ;; copy the face info into temp-face | |
958 (while (setq faceinfo (memq :face faceinfo)) | |
959 (copy-face (read (nth 1 faceinfo)) temp-face) | |
960 (setcar faceinfo nil) | |
961 (setcar (cdr faceinfo) nil)) | |
962 (setq marks (delq nil marks)) | |
963 ;; Apply the font aspects. | |
964 (apply 'set-face-attribute temp-face nil marks) | |
965 (search-backward this-entry) | |
966 (overlay-put | |
967 (make-overlay (match-beginning 0) (match-end 0)) | |
968 'face temp-face)))))))) | |
48365
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
969 (fancy-diary-display-mode) |
54537 | 970 (calendar-set-mode-line date-string) |
13053 | 971 (message "Preparing diary...done")))) |
972 | |
93027
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
973 ;; FIXME modernize? |
13053 | 974 (defun print-diary-entries () |
975 "Print a hard copy of the diary display. | |
976 | |
977 If the simple diary display is being used, prepare a temp buffer with the | |
978 visible lines of the diary buffer, add a heading line composed from the mode | |
979 line, print the temp buffer, and destroy it. | |
980 | |
981 If the fancy diary display is being used, just print the buffer. | |
982 | |
983 The hooks given by the variable `print-diary-entries-hook' are called to do | |
984 the actual printing." | |
985 (interactive) | |
986 (if (bufferp (get-buffer fancy-diary-buffer)) | |
65875
8c8c651e39cc
Use overlays rather than selective-display.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65619
diff
changeset
|
987 (with-current-buffer (get-buffer fancy-diary-buffer) |
13053 | 988 (run-hooks 'print-diary-entries-hook)) |
989 (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
|
990 (find-buffer-visiting (substitute-in-file-name diary-file)))) |
13053 | 991 (if diary-buffer |
93027
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
992 ;; Name affects printing? |
65875
8c8c651e39cc
Use overlays rather than selective-display.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65619
diff
changeset
|
993 (let ((temp-buffer (get-buffer-create " *Printable Diary Entries*")) |
93027
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
994 heading) |
65875
8c8c651e39cc
Use overlays rather than selective-display.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65619
diff
changeset
|
995 (with-current-buffer diary-buffer |
13053 | 996 (setq heading |
997 (if (not (stringp mode-line-format)) | |
998 "All Diary Entries" | |
999 (string-match "^-*\\([^-].*[^-]\\)-*$" mode-line-format) | |
65875
8c8c651e39cc
Use overlays rather than selective-display.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65619
diff
changeset
|
1000 (match-string 1 mode-line-format))) |
8c8c651e39cc
Use overlays rather than selective-display.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65619
diff
changeset
|
1001 (let ((start (point-min)) |
8c8c651e39cc
Use overlays rather than selective-display.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65619
diff
changeset
|
1002 end) |
8c8c651e39cc
Use overlays rather than selective-display.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65619
diff
changeset
|
1003 (while |
8c8c651e39cc
Use overlays rather than selective-display.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65619
diff
changeset
|
1004 (progn |
8c8c651e39cc
Use overlays rather than selective-display.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65619
diff
changeset
|
1005 (setq end (next-single-char-property-change |
8c8c651e39cc
Use overlays rather than selective-display.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65619
diff
changeset
|
1006 start 'invisible)) |
92994
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1007 (unless (get-char-property start 'invisible) |
65875
8c8c651e39cc
Use overlays rather than selective-display.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65619
diff
changeset
|
1008 (with-current-buffer temp-buffer |
8c8c651e39cc
Use overlays rather than selective-display.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65619
diff
changeset
|
1009 (insert-buffer-substring diary-buffer |
8c8c651e39cc
Use overlays rather than selective-display.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65619
diff
changeset
|
1010 start (or end (point-max))))) |
8c8c651e39cc
Use overlays rather than selective-display.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65619
diff
changeset
|
1011 (setq start end) |
8c8c651e39cc
Use overlays rather than selective-display.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65619
diff
changeset
|
1012 (and end (< end (point-max)))))) |
13053 | 1013 (set-buffer temp-buffer) |
1014 (goto-char (point-min)) | |
1015 (insert heading "\n" | |
1016 (make-string (length heading) ?=) "\n") | |
1017 (run-hooks 'print-diary-entries-hook) | |
1018 (kill-buffer temp-buffer))) | |
1019 (error "You don't have a diary buffer!"))))) | |
1020 | |
65476
11058ae1650f
Use with-current-buffer, match-string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65108
diff
changeset
|
1021 (define-obsolete-function-alias 'show-all-diary-entries 'diary-show-all-entries) |
92843
de680a2b3b3b
(diary-loaddefs): Load this rather than explicit autoloads.
Glenn Morris <rgm@gnu.org>
parents:
92696
diff
changeset
|
1022 ;;;###cal-autoload |
65476
11058ae1650f
Use with-current-buffer, match-string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65108
diff
changeset
|
1023 (defun diary-show-all-entries () |
13053 | 1024 "Show all of the diary entries in the diary file. |
1025 This function gets rid of the selective display of the diary file so that | |
1026 all entries, not just some, are visible. If there is no diary buffer, one | |
1027 is created." | |
1028 (interactive) | |
53557 | 1029 (let ((d-file (diary-check-diary-file)) |
93331
1edfec53a698
(print-diary-entries-hook, diary-list-entries): Doc fixes.
Glenn Morris <rgm@gnu.org>
parents:
93284
diff
changeset
|
1030 (pop-up-frames (or pop-up-frames |
1edfec53a698
(print-diary-entries-hook, diary-list-entries): Doc fixes.
Glenn Morris <rgm@gnu.org>
parents:
93284
diff
changeset
|
1031 (window-dedicated-p (selected-window))))) |
65476
11058ae1650f
Use with-current-buffer, match-string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65108
diff
changeset
|
1032 (with-current-buffer (or (find-buffer-visiting d-file) |
11058ae1650f
Use with-current-buffer, match-string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65108
diff
changeset
|
1033 (find-file-noselect d-file t)) |
66869
cfc510b6c9e6
(diary-list-entries, diary-show-all-entries)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66429
diff
changeset
|
1034 (when (eq major-mode default-major-mode) (diary-mode)) |
65509
56d6dbdf0600
(diary-show-all-entries): Fix last change,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65476
diff
changeset
|
1035 (diary-unhide-everything) |
56d6dbdf0600
(diary-show-all-entries): Fix last change,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65476
diff
changeset
|
1036 (display-buffer (current-buffer))))) |
20345
69818ee01344
(diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
20269
diff
changeset
|
1037 |
21957
a74e1cee89bf
(diary-mail-entries): Add autoload cookie.
Richard M. Stallman <rms@gnu.org>
parents:
21893
diff
changeset
|
1038 ;;;###autoload |
20345
69818ee01344
(diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
20269
diff
changeset
|
1039 (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
|
1040 "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
|
1041 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
|
1042 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
|
1043 |
93284
1a0fa935a13b
(diary-mail-entries): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
93280
diff
changeset
|
1044 Here is an example of a script to call `diary-mail-entries', |
1a0fa935a13b
(diary-mail-entries): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
93280
diff
changeset
|
1045 suitable for regular scheduling using cron (or at). Note that |
1a0fa935a13b
(diary-mail-entries): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
93280
diff
changeset
|
1046 since `emacs -script' does not load your `.emacs' file, you |
1a0fa935a13b
(diary-mail-entries): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
93280
diff
changeset
|
1047 should ensure that all relevant variables are set. |
1a0fa935a13b
(diary-mail-entries): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
93280
diff
changeset
|
1048 |
1a0fa935a13b
(diary-mail-entries): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
93280
diff
changeset
|
1049 #!/usr/bin/emacs -script |
1a0fa935a13b
(diary-mail-entries): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
93280
diff
changeset
|
1050 ;; diary-rem.el - run the Emacs diary-reminder |
20345
69818ee01344
(diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
20269
diff
changeset
|
1051 |
93284
1a0fa935a13b
(diary-mail-entries): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
93280
diff
changeset
|
1052 \(setq diary-mail-days 3 |
1a0fa935a13b
(diary-mail-entries): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
93280
diff
changeset
|
1053 diary-file \"/path/to/diary.file\" |
93375
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1054 calendar-date-style 'european |
93284
1a0fa935a13b
(diary-mail-entries): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
93280
diff
changeset
|
1055 diary-mail-addr \"user@host.name\") |
20345
69818ee01344
(diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
20269
diff
changeset
|
1056 |
93284
1a0fa935a13b
(diary-mail-entries): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
93280
diff
changeset
|
1057 \(diary-mail-entries) |
1a0fa935a13b
(diary-mail-entries): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
93280
diff
changeset
|
1058 |
1a0fa935a13b
(diary-mail-entries): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
93280
diff
changeset
|
1059 # diary-rem.el ends here |
1a0fa935a13b
(diary-mail-entries): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
93280
diff
changeset
|
1060 " |
35500
38b437f4134e
(diary-float): Fix case of MONTH
Gerd Moellmann <gerd@gnu.org>
parents:
34036
diff
changeset
|
1061 (interactive "P") |
51640
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
1062 (if (string-equal diary-mail-addr "") |
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
1063 (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
|
1064 (let ((diary-display-hook 'fancy-diary-display)) |
70635
dcac2668b45d
(include-other-diary-files, diary-mail-entries): Refer to
Glenn Morris <rgm@gnu.org>
parents:
70183
diff
changeset
|
1065 (diary-list-entries (calendar-current-date) (or ndays diary-mail-days))) |
51640
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
1066 (compose-mail diary-mail-addr |
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
1067 (concat "Diary entries generated " |
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
1068 (calendar-date-string (calendar-current-date)))) |
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
1069 (insert |
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
1070 (if (get-buffer fancy-diary-buffer) |
65476
11058ae1650f
Use with-current-buffer, match-string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65108
diff
changeset
|
1071 (with-current-buffer fancy-diary-buffer (buffer-string)) |
51640
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
1072 "No entries found")) |
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
1073 (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
|
1074 |
52117
e8a77526768b
(list-diary-entries): Adapt for new behaviour of `calendar-day-name'
Glenn Morris <rgm@gnu.org>
parents:
51640
diff
changeset
|
1075 (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
|
1076 "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
|
1077 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
|
1078 `calendar-abbrev-construct' is used to construct abbreviations from the |
92696
f656dd57b318
(diary-face-attrs): Fix custom :type.
Glenn Morris <rgm@gnu.org>
parents:
92685
diff
changeset
|
1079 two supplied arrays. The returned regexp will then also match these |
52117
e8a77526768b
(list-diary-entries): Adapt for new behaviour of `calendar-day-name'
Glenn Morris <rgm@gnu.org>
parents:
51640
diff
changeset
|
1080 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
|
1081 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
|
1082 (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
|
1083 (if abbrev-array |
e8a77526768b
(list-diary-entries): Adapt for new behaviour of `calendar-day-name'
Glenn Morris <rgm@gnu.org>
parents:
51640
diff
changeset
|
1084 (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
|
1085 string-array)) |
e8a77526768b
(list-diary-entries): Adapt for new behaviour of `calendar-day-name'
Glenn Morris <rgm@gnu.org>
parents:
51640
diff
changeset
|
1086 (if abbrev-array |
e8a77526768b
(list-diary-entries): Adapt for new behaviour of `calendar-day-name'
Glenn Morris <rgm@gnu.org>
parents:
51640
diff
changeset
|
1087 (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
|
1088 string-array |
e8a77526768b
(list-diary-entries): Adapt for new behaviour of `calendar-day-name'
Glenn Morris <rgm@gnu.org>
parents:
51640
diff
changeset
|
1089 'period)) |
e8a77526768b
(list-diary-entries): Adapt for new behaviour of `calendar-day-name'
Glenn Morris <rgm@gnu.org>
parents:
51640
diff
changeset
|
1090 nil) |
e8a77526768b
(list-diary-entries): Adapt for new behaviour of `calendar-day-name'
Glenn Morris <rgm@gnu.org>
parents:
51640
diff
changeset
|
1091 paren)) |
13053 | 1092 |
1093 (defvar marking-diary-entries nil | |
1094 "True during the marking of diary entries, nil otherwise.") | |
1095 | |
1096 (defvar marking-diary-entry nil | |
1097 "True during the marking of diary entries, if current entry is marking.") | |
1098 | |
92994
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1099 ;; file-glob-attrs bound in mark-diary-entries. |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1100 (defun diary-mark-entries-1 (markfunc &optional months symbol absfunc) |
92973
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
1101 "Mark diary entries of a certain type. |
92994
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1102 MARKFUNC is a function that marks entries of the appropriate type |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1103 matching a given date pattern. MONTHS is an array of month names. |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1104 SYMBOL marks diary entries of the type in question. ABSFUNC is a |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1105 function that converts absolute dates to dates of the appropriate type. " |
92973
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
1106 (let ((dayname (diary-name-pattern calendar-day-name-array |
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
1107 calendar-day-abbrev-array)) |
92994
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1108 (monthname (format "%s\\|\\*" |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1109 (if months |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1110 (diary-name-pattern months) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1111 (diary-name-pattern calendar-month-name-array |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1112 calendar-month-abbrev-array)))) |
92973
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
1113 (month "[0-9]+\\|\\*") |
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
1114 (day "[0-9]+\\|\\*") |
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
1115 (year "[0-9]+\\|\\*") |
92994
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1116 (case-fold-search t) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1117 marks) |
92973
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
1118 (dolist (date-form diary-date-forms) |
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
1119 (if (eq (car date-form) 'backup) ; ignore 'backup directive |
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
1120 (setq date-form (cdr date-form))) |
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
1121 (let* ((l (length date-form)) |
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
1122 (d-name-pos (- l (length (memq 'dayname date-form)))) |
93276
487270d1d4da
(diary-mark-entries-1): Fix position offsets in non-gregorian case.
Glenn Morris <rgm@gnu.org>
parents:
93274
diff
changeset
|
1123 (d-name-pos (if (/= l d-name-pos) (1+ d-name-pos))) |
92973
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
1124 (m-name-pos (- l (length (memq 'monthname date-form)))) |
93276
487270d1d4da
(diary-mark-entries-1): Fix position offsets in non-gregorian case.
Glenn Morris <rgm@gnu.org>
parents:
93274
diff
changeset
|
1125 (m-name-pos (if (/= l m-name-pos) (1+ m-name-pos))) |
92973
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
1126 (d-pos (- l (length (memq 'day date-form)))) |
93276
487270d1d4da
(diary-mark-entries-1): Fix position offsets in non-gregorian case.
Glenn Morris <rgm@gnu.org>
parents:
93274
diff
changeset
|
1127 (d-pos (if (/= l d-pos) (1+ d-pos))) |
92973
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
1128 (m-pos (- l (length (memq 'month date-form)))) |
93276
487270d1d4da
(diary-mark-entries-1): Fix position offsets in non-gregorian case.
Glenn Morris <rgm@gnu.org>
parents:
93274
diff
changeset
|
1129 (m-pos (if (/= l m-pos) (1+ m-pos))) |
92973
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
1130 (y-pos (- l (length (memq 'year date-form)))) |
93276
487270d1d4da
(diary-mark-entries-1): Fix position offsets in non-gregorian case.
Glenn Morris <rgm@gnu.org>
parents:
93274
diff
changeset
|
1131 (y-pos (if (/= l y-pos) (1+ y-pos))) |
92994
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1132 (regexp (format "^%s\\(%s\\)" |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1133 (if symbol (regexp-quote symbol) "") |
92973
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
1134 (mapconcat 'eval date-form "\\)\\(")))) |
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
1135 (goto-char (point-min)) |
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
1136 (while (re-search-forward regexp nil t) |
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
1137 (let* ((dd-name |
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
1138 (if d-name-pos |
92994
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1139 (match-string-no-properties d-name-pos))) |
92973
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
1140 (mm-name |
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
1141 (if m-name-pos |
92994
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1142 (match-string-no-properties m-name-pos))) |
92973
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
1143 (mm (string-to-number |
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
1144 (if m-pos |
92994
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1145 (match-string-no-properties m-pos) |
92973
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
1146 ""))) |
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
1147 (dd (string-to-number |
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
1148 (if d-pos |
92994
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1149 (match-string-no-properties d-pos) |
92973
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
1150 ""))) |
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
1151 (y-str (if y-pos |
92994
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1152 (match-string-no-properties y-pos))) |
92973
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
1153 (yy (if (not y-str) |
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
1154 0 |
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
1155 (if (and (= (length y-str) 2) |
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
1156 abbreviated-calendar-year) |
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
1157 (let* ((current-y |
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
1158 (extract-calendar-year |
92994
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1159 (if absfunc |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1160 (funcall |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1161 absfunc |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1162 (calendar-absolute-from-gregorian |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1163 (calendar-current-date))) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1164 (calendar-current-date)))) |
92973
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
1165 (y (+ (string-to-number y-str) |
93331
1edfec53a698
(print-diary-entries-hook, diary-list-entries): Doc fixes.
Glenn Morris <rgm@gnu.org>
parents:
93284
diff
changeset
|
1166 ;; Current century, eg 2000. |
1edfec53a698
(print-diary-entries-hook, diary-list-entries): Doc fixes.
Glenn Morris <rgm@gnu.org>
parents:
93284
diff
changeset
|
1167 (* 100 (/ current-y 100)))) |
1edfec53a698
(print-diary-entries-hook, diary-list-entries): Doc fixes.
Glenn Morris <rgm@gnu.org>
parents:
93284
diff
changeset
|
1168 (offset (- y current-y))) |
1edfec53a698
(print-diary-entries-hook, diary-list-entries): Doc fixes.
Glenn Morris <rgm@gnu.org>
parents:
93284
diff
changeset
|
1169 ;; Add 2-digit year to current century. |
1edfec53a698
(print-diary-entries-hook, diary-list-entries): Doc fixes.
Glenn Morris <rgm@gnu.org>
parents:
93284
diff
changeset
|
1170 ;; If more than 50 years in the future, |
1edfec53a698
(print-diary-entries-hook, diary-list-entries): Doc fixes.
Glenn Morris <rgm@gnu.org>
parents:
93284
diff
changeset
|
1171 ;; assume last century. If more than 50 |
1edfec53a698
(print-diary-entries-hook, diary-list-entries): Doc fixes.
Glenn Morris <rgm@gnu.org>
parents:
93284
diff
changeset
|
1172 ;; years in the past, assume next century. |
1edfec53a698
(print-diary-entries-hook, diary-list-entries): Doc fixes.
Glenn Morris <rgm@gnu.org>
parents:
93284
diff
changeset
|
1173 (if (> offset 50) |
92973
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
1174 (- y 100) |
93331
1edfec53a698
(print-diary-entries-hook, diary-list-entries): Doc fixes.
Glenn Morris <rgm@gnu.org>
parents:
93284
diff
changeset
|
1175 (if (< offset -50) |
92973
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
1176 (+ y 100) |
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
1177 y))) |
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
1178 (string-to-number y-str))))) |
92994
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1179 (setq marks (cadr (diary-pull-attrs |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1180 (buffer-substring-no-properties |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1181 (point) (line-end-position)) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1182 file-glob-attrs))) |
92973
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
1183 (if dd-name |
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
1184 (mark-calendar-days-named |
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
1185 (cdr (assoc-string dd-name |
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
1186 (calendar-make-alist |
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
1187 calendar-day-name-array |
92994
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1188 0 nil calendar-day-abbrev-array) t)) marks) |
92973
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
1189 (if mm-name |
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
1190 (setq mm |
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
1191 (if (string-equal mm-name "*") 0 |
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
1192 (cdr (assoc-string |
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
1193 mm-name |
92994
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1194 (if months (calendar-make-alist months) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1195 (calendar-make-alist |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1196 calendar-month-name-array |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1197 1 nil calendar-month-abbrev-array)) t))))) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1198 (funcall markfunc mm dd yy marks)))))))) |
92973
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
1199 |
92843
de680a2b3b3b
(diary-loaddefs): Load this rather than explicit autoloads.
Glenn Morris <rgm@gnu.org>
parents:
92696
diff
changeset
|
1200 ;;;###cal-autoload |
60650
5294e5833aef
(mark-diary-entries): Use new optional argument REDRAW rather than
Glenn Morris <rgm@gnu.org>
parents:
60567
diff
changeset
|
1201 (defun mark-diary-entries (&optional redraw) |
13053 | 1202 "Mark days in the calendar window that have diary entries. |
60650
5294e5833aef
(mark-diary-entries): Use new optional argument REDRAW rather than
Glenn Morris <rgm@gnu.org>
parents:
60567
diff
changeset
|
1203 Each entry in the diary file visible in the calendar window is |
5294e5833aef
(mark-diary-entries): Use new optional argument REDRAW rather than
Glenn Morris <rgm@gnu.org>
parents:
60567
diff
changeset
|
1204 marked. After the entries are marked, the hooks |
5294e5833aef
(mark-diary-entries): Use new optional argument REDRAW rather than
Glenn Morris <rgm@gnu.org>
parents:
60567
diff
changeset
|
1205 `nongregorian-diary-marking-hook' and `mark-diary-entries-hook' |
5294e5833aef
(mark-diary-entries): Use new optional argument REDRAW rather than
Glenn Morris <rgm@gnu.org>
parents:
60567
diff
changeset
|
1206 are run. If the optional argument REDRAW is non-nil (which is |
5294e5833aef
(mark-diary-entries): Use new optional argument REDRAW rather than
Glenn Morris <rgm@gnu.org>
parents:
60567
diff
changeset
|
1207 the case interactively, for example) then any existing diary |
65476
11058ae1650f
Use with-current-buffer, match-string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65108
diff
changeset
|
1208 marks are first removed. This is intended to deal with deleted |
60650
5294e5833aef
(mark-diary-entries): Use new optional argument REDRAW rather than
Glenn Morris <rgm@gnu.org>
parents:
60567
diff
changeset
|
1209 diary entries." |
5294e5833aef
(mark-diary-entries): Use new optional argument REDRAW rather than
Glenn Morris <rgm@gnu.org>
parents:
60567
diff
changeset
|
1210 (interactive "p") |
5294e5833aef
(mark-diary-entries): Use new optional argument REDRAW rather than
Glenn Morris <rgm@gnu.org>
parents:
60567
diff
changeset
|
1211 ;; To remove any deleted diary entries. Do not redraw when: |
5294e5833aef
(mark-diary-entries): Use new optional argument REDRAW rather than
Glenn Morris <rgm@gnu.org>
parents:
60567
diff
changeset
|
1212 ;; i) processing #include diary files (else only get the marks from |
5294e5833aef
(mark-diary-entries): Use new optional argument REDRAW rather than
Glenn Morris <rgm@gnu.org>
parents:
60567
diff
changeset
|
1213 ;; the last #include file processed). |
5294e5833aef
(mark-diary-entries): Use new optional argument REDRAW rather than
Glenn Morris <rgm@gnu.org>
parents:
60567
diff
changeset
|
1214 ;; ii) called via calendar-redraw (since calendar has already been |
5294e5833aef
(mark-diary-entries): Use new optional argument REDRAW rather than
Glenn Morris <rgm@gnu.org>
parents:
60567
diff
changeset
|
1215 ;; erased). |
5294e5833aef
(mark-diary-entries): Use new optional argument REDRAW rather than
Glenn Morris <rgm@gnu.org>
parents:
60567
diff
changeset
|
1216 ;; Use of REDRAW handles both of these cases. |
5294e5833aef
(mark-diary-entries): Use new optional argument REDRAW rather than
Glenn Morris <rgm@gnu.org>
parents:
60567
diff
changeset
|
1217 (when (and redraw mark-diary-entries-in-calendar) |
60321
efcf9ada3122
(mark-diary-entries): Remove any old marks first.
Glenn Morris <rgm@gnu.org>
parents:
60298
diff
changeset
|
1218 (setq mark-diary-entries-in-calendar nil) |
efcf9ada3122
(mark-diary-entries): Remove any old marks first.
Glenn Morris <rgm@gnu.org>
parents:
60298
diff
changeset
|
1219 (redraw-calendar)) |
51640
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
1220 (let ((marking-diary-entries t) |
92994
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1221 file-glob-attrs) |
65619
e09cff91900a
(mark-diary-entries): Revert last change.
Romain Francoise <romain@orebokech.com>
parents:
65597
diff
changeset
|
1222 (with-current-buffer (find-file-noselect (diary-check-diary-file) t) |
e09cff91900a
(mark-diary-entries): Revert last change.
Romain Francoise <romain@orebokech.com>
parents:
65597
diff
changeset
|
1223 (save-excursion |
66869
cfc510b6c9e6
(diary-list-entries, diary-show-all-entries)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66429
diff
changeset
|
1224 (when (eq major-mode default-major-mode) (diary-mode)) |
65552
2f26d67eea8d
(mark-diary-entries): Don't move point. Use with-syntax-table and dolist.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65509
diff
changeset
|
1225 (setq mark-diary-entries-in-calendar t) |
2f26d67eea8d
(mark-diary-entries): Don't move point. Use with-syntax-table and dolist.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65509
diff
changeset
|
1226 (message "Marking diary entries...") |
2f26d67eea8d
(mark-diary-entries): Don't move point. Use with-syntax-table and dolist.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65509
diff
changeset
|
1227 (setq file-glob-attrs (nth 1 (diary-pull-attrs nil '()))) |
2f26d67eea8d
(mark-diary-entries): Don't move point. Use with-syntax-table and dolist.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65509
diff
changeset
|
1228 (with-syntax-table diary-syntax-table |
92994
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1229 (diary-mark-entries-1 'mark-calendar-date-pattern) |
65552
2f26d67eea8d
(mark-diary-entries): Don't move point. Use with-syntax-table and dolist.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65509
diff
changeset
|
1230 (mark-sexp-diary-entries) |
2f26d67eea8d
(mark-diary-entries): Don't move point. Use with-syntax-table and dolist.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65509
diff
changeset
|
1231 (run-hooks 'nongregorian-diary-marking-hook |
2f26d67eea8d
(mark-diary-entries): Don't move point. Use with-syntax-table and dolist.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65509
diff
changeset
|
1232 'mark-diary-entries-hook)) |
51640
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
1233 (message "Marking diary entries...done"))))) |
13053 | 1234 |
93232
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
1235 |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
1236 (defun diary-sexp-entry (sexp entry date) |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
1237 "Process a SEXP diary ENTRY for DATE." |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
1238 (let ((result (if calendar-debug-sexp |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
1239 (let ((stack-trace-on-error t)) |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
1240 (eval (car (read-from-string sexp)))) |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
1241 (condition-case nil |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
1242 (eval (car (read-from-string sexp))) |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
1243 (error |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
1244 (beep) |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
1245 (message "Bad sexp at line %d in %s: %s" |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
1246 (count-lines (point-min) (point)) |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
1247 diary-file sexp) |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
1248 (sleep-for 2)))))) |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
1249 (cond ((stringp result) result) |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
1250 ((and (consp result) |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
1251 (stringp (cdr result))) result) |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
1252 (result entry) |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
1253 (t nil)))) |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
1254 |
92859 | 1255 (defvar displayed-year) ; bound in generate-calendar |
92696
f656dd57b318
(diary-face-attrs): Fix custom :type.
Glenn Morris <rgm@gnu.org>
parents:
92685
diff
changeset
|
1256 (defvar displayed-month) |
f656dd57b318
(diary-face-attrs): Fix custom :type.
Glenn Morris <rgm@gnu.org>
parents:
92685
diff
changeset
|
1257 |
13053 | 1258 (defun mark-sexp-diary-entries () |
1259 "Mark days in the calendar window that have sexp diary entries. | |
1260 Each entry in the diary file (or included files) visible in the calendar window | |
1261 is marked. See the documentation for the function `list-sexp-diary-entries'." | |
1262 (let* ((sexp-mark (regexp-quote sexp-diary-entry-symbol)) | |
92994
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1263 (s-entry (format "^\\(%s(\\)\\|\\(%s%s(diary-remind\\)" sexp-mark |
13053 | 1264 (regexp-quote diary-nonmarking-symbol) |
92994
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1265 sexp-mark)) |
51640
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
1266 (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
|
1267 m y first-date last-date mark file-glob-attrs) |
65476
11058ae1650f
Use with-current-buffer, match-string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65108
diff
changeset
|
1268 (with-current-buffer calendar-buffer |
92994
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1269 (setq m displayed-month |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1270 y displayed-year)) |
13053 | 1271 (increment-calendar-month m y -1) |
1272 (setq first-date | |
1273 (calendar-absolute-from-gregorian (list m 1 y))) | |
1274 (increment-calendar-month m y 2) | |
1275 (setq last-date | |
1276 (calendar-absolute-from-gregorian | |
1277 (list m (calendar-last-day-of-month m y) y))) | |
1278 (goto-char (point-min)) | |
1279 (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
|
1280 (setq marking-diary-entry (char-equal (preceding-char) ?\()) |
13053 | 1281 (re-search-backward "(") |
1282 (let ((sexp-start (point)) | |
93331
1edfec53a698
(print-diary-entries-hook, diary-list-entries): Doc fixes.
Glenn Morris <rgm@gnu.org>
parents:
93284
diff
changeset
|
1283 sexp entry entry-start) |
13053 | 1284 (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
|
1285 (setq sexp (buffer-substring-no-properties sexp-start (point))) |
13053 | 1286 (forward-char 1) |
92664
e7052a7b4ab1
(diary-list-entries, include-other-diary-files, mark-diary-entries)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92604
diff
changeset
|
1287 (if (and (bolp) (not (looking-at "[ \t]"))) |
92859 | 1288 ;; Diary entry consists only of the sexp. |
92696
f656dd57b318
(diary-face-attrs): Fix custom :type.
Glenn Morris <rgm@gnu.org>
parents:
92685
diff
changeset
|
1289 (progn |
13053 | 1290 (backward-char 1) |
1291 (setq entry "")) | |
1292 (setq entry-start (point)) | |
92696
f656dd57b318
(diary-face-attrs): Fix custom :type.
Glenn Morris <rgm@gnu.org>
parents:
92685
diff
changeset
|
1293 ;; Find end of entry. |
92664
e7052a7b4ab1
(diary-list-entries, include-other-diary-files, mark-diary-entries)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92604
diff
changeset
|
1294 (forward-line 1) |
e7052a7b4ab1
(diary-list-entries, include-other-diary-files, mark-diary-entries)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92604
diff
changeset
|
1295 (while (looking-at "[ \t]") |
e7052a7b4ab1
(diary-list-entries, include-other-diary-files, mark-diary-entries)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92604
diff
changeset
|
1296 (forward-line 1)) |
e7052a7b4ab1
(diary-list-entries, include-other-diary-files, mark-diary-entries)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92604
diff
changeset
|
1297 (if (bolp) (backward-char 1)) |
e7052a7b4ab1
(diary-list-entries, include-other-diary-files, mark-diary-entries)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92604
diff
changeset
|
1298 (setq entry (buffer-substring-no-properties entry-start (point)))) |
13053 | 1299 (calendar-for-loop date from first-date to last-date do |
92994
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1300 (when (setq mark (diary-sexp-entry |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1301 sexp entry |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1302 (calendar-gregorian-from-absolute date))) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1303 (mark-visible-calendar-date |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1304 (calendar-gregorian-from-absolute date) |
93331
1edfec53a698
(print-diary-entries-hook, diary-list-entries): Doc fixes.
Glenn Morris <rgm@gnu.org>
parents:
93284
diff
changeset
|
1305 (or (cadr (diary-pull-attrs entry file-glob-attrs)) |
1edfec53a698
(print-diary-entries-hook, diary-list-entries): Doc fixes.
Glenn Morris <rgm@gnu.org>
parents:
93284
diff
changeset
|
1306 (if (consp mark) (car mark)))))))))) |
13053 | 1307 |
1308 (defun mark-included-diary-files () | |
1309 "Mark the diary entries from other diary files with those of the diary file. | |
93270
639cd5027418
(diary-face-attrs): Fix type of `width'.
Glenn Morris <rgm@gnu.org>
parents:
93232
diff
changeset
|
1310 This function is suitable for use with `mark-diary-entries-hook'; it enables |
13053 | 1311 you to use shared diary files together with your own. The files included are |
92696
f656dd57b318
(diary-face-attrs): Fix custom :type.
Glenn Morris <rgm@gnu.org>
parents:
92685
diff
changeset
|
1312 specified in the `diary-file' by lines of this form: |
13053 | 1313 #include \"filename\" |
1314 This is recursive; that is, #include directives in diary files thus included | |
1315 are obeyed. You can change the `#include' to some other string by | |
1316 changing the variable `diary-include-string'." | |
1317 (goto-char (point-min)) | |
1318 (while (re-search-forward | |
92973
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
1319 (format "^%s \"\\([^\"]*\\)\"" (regexp-quote diary-include-string)) |
13053 | 1320 nil t) |
62901
555a704ce217
(mark-included-diary-files): Only kill included diary buffer if it was
Glenn Morris <rgm@gnu.org>
parents:
62402
diff
changeset
|
1321 (let* ((diary-file (substitute-in-file-name |
65476
11058ae1650f
Use with-current-buffer, match-string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65108
diff
changeset
|
1322 (match-string-no-properties 1))) |
62901
555a704ce217
(mark-included-diary-files): Only kill included diary buffer if it was
Glenn Morris <rgm@gnu.org>
parents:
62402
diff
changeset
|
1323 (mark-diary-entries-hook 'mark-included-diary-files) |
555a704ce217
(mark-included-diary-files): Only kill included diary buffer if it was
Glenn Morris <rgm@gnu.org>
parents:
62402
diff
changeset
|
1324 (dbuff (find-buffer-visiting diary-file))) |
13053 | 1325 (if (file-exists-p diary-file) |
1326 (if (file-readable-p diary-file) | |
1327 (progn | |
1328 (mark-diary-entries) | |
62901
555a704ce217
(mark-included-diary-files): Only kill included diary buffer if it was
Glenn Morris <rgm@gnu.org>
parents:
62402
diff
changeset
|
1329 (unless dbuff |
555a704ce217
(mark-included-diary-files): Only kill included diary buffer if it was
Glenn Morris <rgm@gnu.org>
parents:
62402
diff
changeset
|
1330 (kill-buffer (find-buffer-visiting diary-file)))) |
13053 | 1331 (beep) |
1332 (message "Can't read included diary file %s" diary-file) | |
1333 (sleep-for 2)) | |
1334 (beep) | |
1335 (message "Can't find included diary file %s" diary-file) | |
1336 (sleep-for 2)))) | |
1337 (goto-char (point-min))) | |
1338 | |
49737
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
1339 (defun mark-calendar-days-named (dayname &optional color) |
13053 | 1340 "Mark all dates in the calendar window that are day DAYNAME of the week. |
92696
f656dd57b318
(diary-face-attrs): Fix custom :type.
Glenn Morris <rgm@gnu.org>
parents:
92685
diff
changeset
|
1341 0 means all Sundays, 1 means all Mondays, and so on. |
f656dd57b318
(diary-face-attrs): Fix custom :type.
Glenn Morris <rgm@gnu.org>
parents:
92685
diff
changeset
|
1342 Optional argument COLOR is passed to `mark-visible-calendar-date' as MARK." |
65476
11058ae1650f
Use with-current-buffer, match-string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65108
diff
changeset
|
1343 (with-current-buffer calendar-buffer |
13053 | 1344 (let ((prev-month displayed-month) |
1345 (prev-year displayed-year) | |
1346 (succ-month displayed-month) | |
1347 (succ-year displayed-year) | |
1348 (last-day) | |
1349 (day)) | |
1350 (increment-calendar-month succ-month succ-year 1) | |
1351 (increment-calendar-month prev-month prev-year -1) | |
1352 (setq day (calendar-absolute-from-gregorian | |
92696
f656dd57b318
(diary-face-attrs): Fix custom :type.
Glenn Morris <rgm@gnu.org>
parents:
92685
diff
changeset
|
1353 (calendar-nth-named-day 1 dayname prev-month prev-year)) |
92859 | 1354 last-day (calendar-absolute-from-gregorian |
92862 | 1355 (calendar-nth-named-day -1 dayname succ-month succ-year))) |
13053 | 1356 (while (<= day last-day) |
92696
f656dd57b318
(diary-face-attrs): Fix custom :type.
Glenn Morris <rgm@gnu.org>
parents:
92685
diff
changeset
|
1357 (mark-visible-calendar-date (calendar-gregorian-from-absolute day) |
92859 | 1358 color) |
13053 | 1359 (setq day (+ day 7)))))) |
1360 | |
93027
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
1361 (defun mark-calendar-month (month year p-month p-day p-year &optional color) |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
1362 "Mark dates in the MONTH/YEAR that conform to pattern P-MONTH/P-DAY/P-YEAR. |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
1363 A value of 0 in any position of the pattern is a wildcard. |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
1364 Optional argument COLOR is passed to `mark-visible-calendar-date' as MARK." |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
1365 (if (or (and (= month p-month) |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
1366 (or (zerop p-year) (= year p-year))) |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
1367 (and (zerop p-month) |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
1368 (or (zerop p-year) (= year p-year)))) |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
1369 (if (zerop p-day) |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
1370 (dotimes (i (calendar-last-day-of-month month year)) |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
1371 (mark-visible-calendar-date (list month (1+ i) year) color)) |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
1372 (mark-visible-calendar-date (list month p-day year) color)))) |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
1373 |
49737
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
1374 (defun mark-calendar-date-pattern (month day year &optional color) |
13053 | 1375 "Mark all dates in the calendar window that conform to MONTH/DAY/YEAR. |
92994
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1376 A value of 0 in any position is a wildcard. Optional argument COLOR is |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1377 passed to `mark-visible-calendar-date' as MARK." |
65476
11058ae1650f
Use with-current-buffer, match-string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65108
diff
changeset
|
1378 (with-current-buffer calendar-buffer |
13053 | 1379 (let ((m displayed-month) |
1380 (y displayed-year)) | |
1381 (increment-calendar-month m y -1) | |
82085
85f6cb7c9558
(diary-list-entries, (mark-calendar-date-pattern): Use `dotimes'
Glenn Morris <rgm@gnu.org>
parents:
77293
diff
changeset
|
1382 (dotimes (idummy 3) |
85f6cb7c9558
(diary-list-entries, (mark-calendar-date-pattern): Use `dotimes'
Glenn Morris <rgm@gnu.org>
parents:
77293
diff
changeset
|
1383 (mark-calendar-month m y month day year color) |
85f6cb7c9558
(diary-list-entries, (mark-calendar-date-pattern): Use `dotimes'
Glenn Morris <rgm@gnu.org>
parents:
77293
diff
changeset
|
1384 (increment-calendar-month m y 1))))) |
13053 | 1385 |
1386 | |
92994
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1387 ;; Bahai, Hebrew, Islamic. |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1388 (defun calendar-mark-complex (month day year fromabs &optional color) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1389 "Mark dates in the calendar conforming to MONTH DAY YEAR of some system. |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1390 The function FROMABS converts absolute dates to the appropriate date system. |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1391 Optional argument COLOR is passed to `mark-visible-calendar-date' as MARK." |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1392 ;; Not one of the simple cases--check all visible dates for match. |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1393 ;; Actually, the following code takes care of ALL of the cases, but |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1394 ;; it's much too slow to be used for the simple (common) cases. |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1395 (let ((m displayed-month) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1396 (y displayed-year) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1397 first-date last-date) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1398 (increment-calendar-month m y -1) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1399 (setq first-date (calendar-absolute-from-gregorian (list m 1 y))) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1400 (increment-calendar-month m y 2) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1401 (setq last-date (calendar-absolute-from-gregorian |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1402 (list m (calendar-last-day-of-month m y) y))) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1403 (calendar-for-loop date from first-date to last-date do |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1404 (let* ((i-date (funcall fromabs date)) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1405 (i-month (extract-calendar-month i-date)) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1406 (i-day (extract-calendar-day i-date)) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1407 (i-year (extract-calendar-year i-date))) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1408 (and (or (zerop month) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1409 (= month i-month)) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1410 (or (zerop day) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1411 (= day i-day)) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1412 (or (zerop year) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1413 (= year i-year)) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1414 (mark-visible-calendar-date |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1415 (calendar-gregorian-from-absolute date) color)))))) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1416 |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1417 ;; Bahai, Islamic. |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1418 (defun calendar-mark-1 (month day year fromabs toabs &optional color) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1419 "Mark dates in the calendar conforming to MONTH DAY YEAR of some system. |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1420 The function FROMABS converts absolute dates to the appropriate date system. |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1421 The function TOABDS carries out the inverse operation. Optional argument |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1422 COLOR is passed to `mark-visible-calendar-date' as MARK." |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1423 (save-excursion |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1424 (set-buffer calendar-buffer) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1425 (if (and (not (zerop month)) (not (zerop day))) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1426 (if (not (zerop year)) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1427 ;; Fully specified date. |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1428 (let ((date (calendar-gregorian-from-absolute |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1429 (funcall toabs (list month day year))))) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1430 (if (calendar-date-is-visible-p date) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1431 (mark-visible-calendar-date date color))) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1432 ;; Month and day in any year--this taken from the holiday stuff. |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1433 (let* ((i-date (funcall fromabs |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1434 (calendar-absolute-from-gregorian |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1435 (list displayed-month 15 displayed-year)))) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1436 (m (extract-calendar-month i-date)) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1437 (y (extract-calendar-year i-date)) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1438 date) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1439 (unless (< m 1) ; calendar doesn't apply |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1440 (increment-calendar-month m y (- 10 month)) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1441 (if (> m 7) ; date might be visible |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1442 (let ((date (calendar-gregorian-from-absolute |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1443 (funcall toabs (list month day y))))) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1444 (if (calendar-date-is-visible-p date) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1445 (mark-visible-calendar-date date color))))))) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1446 (calendar-mark-complex month day year |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1447 'calendar-bahai-from-absolute color)))) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1448 |
13053 | 1449 |
1450 (defun diary-entry-time (s) | |
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
1451 "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
|
1452 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
|
1453 |
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
|
1454 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
|
1455 The recognized forms are XXXX, X:XX, or XX:XX (military time), and XXam, |
53557 | 1456 XXAM, XXpm, XXPM, XX:XXam, XX:XXAM XX:XXpm, or XX:XXPM. A period (.) can |
1457 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
|
1458 (let ((case-fold-search nil)) |
92859 | 1459 (cond ((string-match ; military time |
1460 "\\`[ \t\n]*\\([0-9]?[0-9]\\)[:.]?\\([0-9][0-9]\\)\\(\\>\\|[^ap]\\)" | |
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
|
1461 s) |
92859 | 1462 (+ (* 100 (string-to-number (match-string 1 s))) |
1463 (string-to-number (match-string 2 s)))) | |
1464 ((string-match ; hour only (XXam or XXpm) | |
1465 "\\`[ \t\n]*\\([0-9]?[0-9]\\)\\([ap]\\)m\\>" s) | |
1466 (+ (* 100 (% (string-to-number (match-string 1 s)) 12)) | |
1467 (if (equal ?a (downcase (aref s (match-beginning 2)))) | |
1468 0 1200))) | |
92862 | 1469 ((string-match ; hour and minute (XX:XXam or XX:XXpm) |
92859 | 1470 "\\`[ \t\n]*\\([0-9]?[0-9]\\)[:.]\\([0-9][0-9]\\)\\([ap]\\)m\\>" s) |
1471 (+ (* 100 (% (string-to-number (match-string 1 s)) 12)) | |
1472 (string-to-number (match-string 2 s)) | |
1473 (if (equal ?a (downcase (aref s (match-beginning 3)))) | |
1474 0 1200))) | |
1475 (t diary-unknown-time)))) ; unrecognizable | |
34036
c2a8edb5b5ec
(diary-entry-time): Anchor pattern correctly
Gerd Moellmann <gerd@gnu.org>
parents:
32415
diff
changeset
|
1476 |
93027
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
1477 (defun diary-entry-compare (e1 e2) |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
1478 "Return t if E1 is earlier than E2." |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
1479 (or (calendar-date-compare e1 e2) |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
1480 (and (calendar-date-equal (car e1) (car e2)) |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
1481 (let* ((ts1 (cadr e1)) (t1 (diary-entry-time ts1)) |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
1482 (ts2 (cadr e2)) (t2 (diary-entry-time ts2))) |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
1483 (or (< t1 t2) |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
1484 (and (= t1 t2) |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
1485 (string-lessp ts1 ts2))))))) |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
1486 |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
1487 (defun sort-diary-entries () |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
1488 "Sort the list of diary entries by time of day." |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
1489 (setq diary-entries-list (sort diary-entries-list 'diary-entry-compare))) |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
1490 |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
1491 |
13053 | 1492 (defun list-sexp-diary-entries (date) |
1493 "Add sexp entries for DATE from the diary file to `diary-entries-list'. | |
93280
e4f021df35fd
(list-sexp-diary-entries): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
93276
diff
changeset
|
1494 Also, make them visible in the diary. Returns t if any entries are found. |
13053 | 1495 |
93280
e4f021df35fd
(list-sexp-diary-entries): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
93276
diff
changeset
|
1496 Sexp diary entries must be prefaced by a `sexp-diary-entry-symbol' |
e4f021df35fd
(list-sexp-diary-entries): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
93276
diff
changeset
|
1497 \(normally `%%'). The form of a sexp diary entry is |
13053 | 1498 |
1499 %%(SEXP) ENTRY | |
1500 | |
93280
e4f021df35fd
(list-sexp-diary-entries): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
93276
diff
changeset
|
1501 Both ENTRY and DATE are available when the SEXP is evaluated. If |
e4f021df35fd
(list-sexp-diary-entries): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
93276
diff
changeset
|
1502 the SEXP returns nil, the diary entry does not apply. If it |
e4f021df35fd
(list-sexp-diary-entries): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
93276
diff
changeset
|
1503 returns a non-nil value, ENTRY will be taken to apply to DATE; if |
e4f021df35fd
(list-sexp-diary-entries): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
93276
diff
changeset
|
1504 the value is a string, that string will be the diary entry in the |
e4f021df35fd
(list-sexp-diary-entries): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
93276
diff
changeset
|
1505 fancy diary display. |
13053 | 1506 |
93280
e4f021df35fd
(list-sexp-diary-entries): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
93276
diff
changeset
|
1507 For example, the following diary entry will apply to the 21st of |
e4f021df35fd
(list-sexp-diary-entries): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
93276
diff
changeset
|
1508 the month if it is a weekday and the Friday before if the 21st is |
e4f021df35fd
(list-sexp-diary-entries): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
93276
diff
changeset
|
1509 on a weekend: |
13053 | 1510 |
1511 &%%(let ((dayname (calendar-day-of-week date)) | |
1512 (day (extract-calendar-day date))) | |
1513 (or | |
1514 (and (= day 21) (memq dayname '(1 2 3 4 5))) | |
1515 (and (memq day '(19 20)) (= dayname 5))) | |
1516 ) UIUC pay checks deposited | |
1517 | |
93280
e4f021df35fd
(list-sexp-diary-entries): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
93276
diff
changeset
|
1518 A number of built-in functions are available for this type of |
e4f021df35fd
(list-sexp-diary-entries): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
93276
diff
changeset
|
1519 diary entry. In the following, the optional parameter MARK |
e4f021df35fd
(list-sexp-diary-entries): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
93276
diff
changeset
|
1520 specifies a face or single-character string to use when |
93375
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1521 highlighting the day in the calendar. For those functions that |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1522 take MONTH, DAY, and YEAR as arguments, the order of the input |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1523 parameters changes according to `calendar-date-style' (e.g. to |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1524 DAY MONTH YEAR in the European style). |
13053 | 1525 |
93280
e4f021df35fd
(list-sexp-diary-entries): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
93276
diff
changeset
|
1526 %%(diary-date MONTH DAY YEAR &optional MARK) text |
93375
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1527 Entry applies if date is MONTH, DAY, YEAR. DAY, MONTH, and YEAR can |
93280
e4f021df35fd
(list-sexp-diary-entries): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
93276
diff
changeset
|
1528 be a list of integers, `t' (meaning all values), or an integer. |
13053 | 1529 |
93280
e4f021df35fd
(list-sexp-diary-entries): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
93276
diff
changeset
|
1530 %%(diary-float MONTH DAYNAME N &optional DAY MARK) text |
e4f021df35fd
(list-sexp-diary-entries): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
93276
diff
changeset
|
1531 Entry will appear on the Nth DAYNAME of MONTH (0 being Sunday, |
e4f021df35fd
(list-sexp-diary-entries): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
93276
diff
changeset
|
1532 1 Monday, etc; if N is negative it counts backward from the end |
e4f021df35fd
(list-sexp-diary-entries): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
93276
diff
changeset
|
1533 of the month. MONTH can be a list of months, a single month, or `t' |
e4f021df35fd
(list-sexp-diary-entries): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
93276
diff
changeset
|
1534 to specify all months. Optional DAY means the Nth DAYNAME of MONTH |
e4f021df35fd
(list-sexp-diary-entries): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
93276
diff
changeset
|
1535 on or after/before DAY. DAY defaults to 1 if N>0 and the last day of |
e4f021df35fd
(list-sexp-diary-entries): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
93276
diff
changeset
|
1536 the month if N<0. |
13053 | 1537 |
93280
e4f021df35fd
(list-sexp-diary-entries): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
93276
diff
changeset
|
1538 %%(diary-block M1 D1 Y1 M2 D2 Y2 &optional MARK) text |
e4f021df35fd
(list-sexp-diary-entries): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
93276
diff
changeset
|
1539 Entry will appear on dates between M1/D1/Y1 and M2/D2/Y2, |
93375
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1540 inclusive. |
13053 | 1541 |
93280
e4f021df35fd
(list-sexp-diary-entries): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
93276
diff
changeset
|
1542 %%(diary-anniversary MONTH DAY YEAR &optional MARK) text |
93375
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1543 Entry will appear on anniversary dates of MONTH DAY, YEAR. |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1544 Text can contain `%d' or `%d%s'; `%d' will be replaced by the |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1545 number of years since the MONTH DAY, YEAR, and `%s' by the |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1546 ordinal ending of that number (i.e. `st', `nd', `rd' or `th', |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1547 as appropriate). The anniversary of February 29 is |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1548 considered to be March 1 in a non-leap year. |
13053 | 1549 |
93280
e4f021df35fd
(list-sexp-diary-entries): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
93276
diff
changeset
|
1550 %%(diary-cyclic N MONTH DAY YEAR &optional MARK) text |
93375
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1551 Entry will appear every N days, starting MONTH DAY, YEAR. |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1552 Text can contain `%d' or `%d%s'; `%d' will be replaced by the |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1553 number of repetitions since the MONTH DAY, YEAR and `%s' by |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1554 the ordinal ending of that number (i.e. `st', `nd', `rd' or |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1555 `th', as appropriate). |
13053 | 1556 |
93280
e4f021df35fd
(list-sexp-diary-entries): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
93276
diff
changeset
|
1557 %%(diary-remind SEXP DAYS &optional MARKING) text |
e4f021df35fd
(list-sexp-diary-entries): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
93276
diff
changeset
|
1558 Entry is a reminder for diary sexp SEXP. DAYS is either a |
e4f021df35fd
(list-sexp-diary-entries): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
93276
diff
changeset
|
1559 single number or a list of numbers indicating the number(s) |
e4f021df35fd
(list-sexp-diary-entries): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
93276
diff
changeset
|
1560 of days before the event that the warning(s) should occur. If |
e4f021df35fd
(list-sexp-diary-entries): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
93276
diff
changeset
|
1561 the current date is (one of) DAYS before the event indicated |
e4f021df35fd
(list-sexp-diary-entries): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
93276
diff
changeset
|
1562 by EXPR, then a suitable message (as specified by |
e4f021df35fd
(list-sexp-diary-entries): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
93276
diff
changeset
|
1563 `diary-remind-message') appears. In addition to the |
e4f021df35fd
(list-sexp-diary-entries): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
93276
diff
changeset
|
1564 reminders beforehand, the diary entry also appears on the |
e4f021df35fd
(list-sexp-diary-entries): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
93276
diff
changeset
|
1565 date itself. If optional MARKING is non-nil then the |
e4f021df35fd
(list-sexp-diary-entries): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
93276
diff
changeset
|
1566 *reminders* are marked on the calendar. Marking of reminders |
e4f021df35fd
(list-sexp-diary-entries): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
93276
diff
changeset
|
1567 is independent of whether the entry *itself* is a marking or |
e4f021df35fd
(list-sexp-diary-entries): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
93276
diff
changeset
|
1568 non-marking one. |
13053 | 1569 |
93280
e4f021df35fd
(list-sexp-diary-entries): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
93276
diff
changeset
|
1570 %%(diary-yahrzeit MONTH DAY YEAR) text |
e4f021df35fd
(list-sexp-diary-entries): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
93276
diff
changeset
|
1571 Text is assumed to be the name of the person; the date is the |
e4f021df35fd
(list-sexp-diary-entries): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
93276
diff
changeset
|
1572 date of death on the *civil* calendar. The diary entry will |
e4f021df35fd
(list-sexp-diary-entries): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
93276
diff
changeset
|
1573 appear on the proper Hebrew-date anniversary and on the day |
93375
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1574 before. |
13053 | 1575 |
93280
e4f021df35fd
(list-sexp-diary-entries): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
93276
diff
changeset
|
1576 All the remaining functions do not accept any text, and so only |
e4f021df35fd
(list-sexp-diary-entries): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
93276
diff
changeset
|
1577 make sense with `fancy-diary-display'. Most produce output every day. |
13053 | 1578 |
93280
e4f021df35fd
(list-sexp-diary-entries): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
93276
diff
changeset
|
1579 `diary-day-of-year' - day of year and number of days remaining |
e4f021df35fd
(list-sexp-diary-entries): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
93276
diff
changeset
|
1580 `diary-iso-date' - ISO commercial date |
e4f021df35fd
(list-sexp-diary-entries): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
93276
diff
changeset
|
1581 `diary-astro-day-number' - astronomical (Julian) day number |
e4f021df35fd
(list-sexp-diary-entries): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
93276
diff
changeset
|
1582 `diary-sunrise-sunset' - local times of sunrise and sunset |
13053 | 1583 |
93280
e4f021df35fd
(list-sexp-diary-entries): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
93276
diff
changeset
|
1584 These functions give the date in alternative calendrical systems: |
e4f021df35fd
(list-sexp-diary-entries): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
93276
diff
changeset
|
1585 |
e4f021df35fd
(list-sexp-diary-entries): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
93276
diff
changeset
|
1586 `diary-bahai-date', `diary-chinese-date', `diary-coptic-date', |
e4f021df35fd
(list-sexp-diary-entries): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
93276
diff
changeset
|
1587 `diary-ethiopic-date', `diary-french-date', `diary-hebrew-date', |
e4f021df35fd
(list-sexp-diary-entries): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
93276
diff
changeset
|
1588 `diary-islamic-date', `diary-julian-date', `diary-mayan-date', |
e4f021df35fd
(list-sexp-diary-entries): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
93276
diff
changeset
|
1589 `diary-persian-date' |
13053 | 1590 |
93280
e4f021df35fd
(list-sexp-diary-entries): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
93276
diff
changeset
|
1591 Theses functions only produce output on certain dates: |
13053 | 1592 |
93280
e4f021df35fd
(list-sexp-diary-entries): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
93276
diff
changeset
|
1593 `diary-phases-of-moon' - phases of moon (on the appropriate days) |
e4f021df35fd
(list-sexp-diary-entries): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
93276
diff
changeset
|
1594 `diary-omer' - Omer count, within 50 days after Passover |
e4f021df35fd
(list-sexp-diary-entries): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
93276
diff
changeset
|
1595 `diary-parasha' - weekly parasha, every Saturday |
e4f021df35fd
(list-sexp-diary-entries): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
93276
diff
changeset
|
1596 `diary-rosh-hodesh' - Rosh Hodesh, or the day or Saturday before |
e4f021df35fd
(list-sexp-diary-entries): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
93276
diff
changeset
|
1597 `diary-sabbath-candles' - local time of candle lighting, on Fridays |
13053 | 1598 |
1599 | |
93280
e4f021df35fd
(list-sexp-diary-entries): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
93276
diff
changeset
|
1600 Marking these entries is *extremely* time consuming, so it is |
e4f021df35fd
(list-sexp-diary-entries): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
93276
diff
changeset
|
1601 best if they are non-marking." |
92994
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1602 (let ((s-entry (format "^%s?%s(" (regexp-quote diary-nonmarking-symbol) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
1603 (regexp-quote sexp-diary-entry-symbol))) |
51640
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
1604 entry-found file-glob-attrs marks) |
13053 | 1605 (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
|
1606 (save-excursion |
a8a5fd61aada
(diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents:
49598
diff
changeset
|
1607 (setq file-glob-attrs (nth 1 (diary-pull-attrs nil '())))) |
13053 | 1608 (while (re-search-forward s-entry nil t) |
1609 (backward-char 1) | |
1610 (let ((sexp-start (point)) | |
51640
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
1611 sexp entry specifier entry-start line-start) |
13053 | 1612 (forward-sexp) |
93232
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
1613 (setq sexp (buffer-substring-no-properties sexp-start (point)) |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
1614 line-start (line-end-position 0) |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
1615 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
|
1616 (buffer-substring-no-properties (1+ line-start) (point)) |
70728 | 1617 entry-start (1+ line-start)) |
13053 | 1618 (forward-char 1) |
92664
e7052a7b4ab1
(diary-list-entries, include-other-diary-files, mark-diary-entries)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92604
diff
changeset
|
1619 (if (and (bolp) (not (looking-at "[ \t]"))) |
92859 | 1620 ;; Diary entry consists only of the sexp. |
92696
f656dd57b318
(diary-face-attrs): Fix custom :type.
Glenn Morris <rgm@gnu.org>
parents:
92685
diff
changeset
|
1621 (progn |
13053 | 1622 (backward-char 1) |
1623 (setq entry "")) | |
1624 (setq entry-start (point)) | |
92664
e7052a7b4ab1
(diary-list-entries, include-other-diary-files, mark-diary-entries)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92604
diff
changeset
|
1625 (forward-line 1) |
e7052a7b4ab1
(diary-list-entries, include-other-diary-files, mark-diary-entries)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92604
diff
changeset
|
1626 (while (looking-at "[ \t]") |
e7052a7b4ab1
(diary-list-entries, include-other-diary-files, mark-diary-entries)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92604
diff
changeset
|
1627 (forward-line 1)) |
13053 | 1628 (backward-char 1) |
92664
e7052a7b4ab1
(diary-list-entries, include-other-diary-files, mark-diary-entries)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92604
diff
changeset
|
1629 (setq entry (buffer-substring-no-properties entry-start (point)))) |
50904
44fe653dccdb
(diary-pull-attrs): Make `ret-attr', `attr' local.
Glenn Morris <rgm@gnu.org>
parents:
50699
diff
changeset
|
1630 (let ((diary-entry (diary-sexp-entry sexp entry date)) |
70728 | 1631 temp literal) |
1632 (setq literal entry ; before evaluation | |
1633 entry (if (consp diary-entry) | |
1634 (cdr diary-entry) | |
1635 diary-entry)) | |
92973
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
1636 (when diary-entry |
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
1637 (remove-overlays line-start (point) 'invisible 'diary) |
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
1638 (if (< 0 (length entry)) |
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
1639 (setq temp (diary-pull-attrs entry file-glob-attrs) |
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
1640 entry (nth 0 temp) |
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
1641 marks (nth 1 temp)))) |
70728 | 1642 (add-to-diary-list date |
1643 entry | |
1644 specifier | |
92973
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
1645 (if entry-start (copy-marker entry-start)) |
70728 | 1646 marks |
1647 literal) | |
1648 (setq entry-found (or entry-found diary-entry))))) | |
13053 | 1649 entry-found)) |
1650 | |
93232
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
1651 |
93375
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1652 (defun diary-make-date (a b c) |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1653 "Convert A B C into the internal calendar date form. |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1654 The expected order of the inputs depends on `calendar-date-style', |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1655 e.g. in the European case, A = day, B = month, C = year. Returns |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1656 a list\(MONTH DAY YEAR), i.e. the American style, which is the |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1657 form used internally by the calendar and diary." |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1658 (cond ((eq calendar-date-style 'iso) ; YMD |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1659 (list b c a)) |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1660 ((eq calendar-date-style 'european) ; DMY |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1661 (list b a c)) |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1662 (t (list a b c)))) |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1663 |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1664 |
93232
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
1665 ;;; Sexp diary functions. |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
1666 |
92696
f656dd57b318
(diary-face-attrs): Fix custom :type.
Glenn Morris <rgm@gnu.org>
parents:
92685
diff
changeset
|
1667 (defvar date) |
92672
6f28457f84ac
(entry): Declare for compiler part-way through.
Glenn Morris <rgm@gnu.org>
parents:
92664
diff
changeset
|
1668 (defvar entry) |
6f28457f84ac
(entry): Declare for compiler part-way through.
Glenn Morris <rgm@gnu.org>
parents:
92664
diff
changeset
|
1669 |
6f28457f84ac
(entry): Declare for compiler part-way through.
Glenn Morris <rgm@gnu.org>
parents:
92664
diff
changeset
|
1670 ;; To be called from diary-sexp-entry, where DATE, ENTRY are bound. |
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
1671 (defun diary-date (month day year &optional mark) |
13053 | 1672 "Specific date(s) diary entry. |
93375
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1673 Entry applies if date is MONTH, DAY, YEAR. Each parameter can be |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1674 a list of integers, `t' (meaning all values), or an integer. The |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1675 order of the input parameters changes according to `calendar-date-style' |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1676 \(e.g. to DAY MONTH YEAR in the European style). |
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
1677 |
46826
e020f18c490a
(diary-mail-entries): Use `compose-mail'
Sam Steingold <sds@gnu.org>
parents:
46620
diff
changeset
|
1678 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
|
1679 use when highlighting the day in the calendar." |
93375
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1680 (let* ((ddate (diary-make-date month day year)) |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1681 (dd (extract-calendar-day ddate)) |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1682 (mm (extract-calendar-month ddate)) |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1683 (yy (extract-calendar-year ddate)) |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1684 (m (extract-calendar-month date)) |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1685 (y (extract-calendar-year date)) |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1686 (d (extract-calendar-day date))) |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1687 (and |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1688 (or (and (listp dd) (memq d dd)) |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1689 (equal d dd) |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1690 (eq dd t)) |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1691 (or (and (listp mm) (memq m mm)) |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1692 (equal m mm) |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1693 (eq mm t)) |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1694 (or (and (listp yy) (memq y yy)) |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1695 (equal y yy) |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1696 (eq yy t)) |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1697 (cons mark entry)))) |
13053 | 1698 |
92672
6f28457f84ac
(entry): Declare for compiler part-way through.
Glenn Morris <rgm@gnu.org>
parents:
92664
diff
changeset
|
1699 ;; To be called from diary-sexp-entry, where DATE, ENTRY are bound. |
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
1700 (defun diary-block (m1 d1 y1 m2 d2 y2 &optional mark) |
13053 | 1701 "Block diary entry. |
93375
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1702 Entry applies if date is between, or on one of, two dates. The |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1703 order of the input parameters changes according to |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1704 `calendar-date-style' (e.g. to D1, M1, Y1, D2, M2, Y2 in the European style). |
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
1705 |
46826
e020f18c490a
(diary-mail-entries): Use `compose-mail'
Sam Steingold <sds@gnu.org>
parents:
46620
diff
changeset
|
1706 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
|
1707 use when highlighting the day in the calendar." |
13053 | 1708 (let ((date1 (calendar-absolute-from-gregorian |
93375
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1709 (diary-make-date m1 d1 y1))) |
13053 | 1710 (date2 (calendar-absolute-from-gregorian |
93375
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1711 (diary-make-date m2 d2 y2))) |
13053 | 1712 (d (calendar-absolute-from-gregorian date))) |
93375
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1713 (and (<= date1 d) (<= d date2) |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1714 (cons mark entry)))) |
13053 | 1715 |
92672
6f28457f84ac
(entry): Declare for compiler part-way through.
Glenn Morris <rgm@gnu.org>
parents:
92664
diff
changeset
|
1716 ;; To be called from diary-sexp-entry, where DATE, ENTRY are bound. |
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
1717 (defun diary-float (month dayname n &optional day mark) |
13053 | 1718 "Floating diary entry--entry applies if date is the nth dayname of month. |
92973
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
1719 Parameters are MONTH, DAYNAME, N. MONTH can be a list of months, an integer, |
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
1720 or `t' (meaning all months). If N is negative, count backward from the end |
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
1721 of the month. |
17892
b3514551f08d
(diary-float): Rewritten to fix bug when base date
Richard M. Stallman <rms@gnu.org>
parents:
17626
diff
changeset
|
1722 |
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
1723 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
|
1724 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
|
1725 highlighting the day in the calendar." |
92859 | 1726 ;; This is messy because the diary entry may apply, but the date on which it |
1727 ;; is based can be in a different month/year. For example, asking for the | |
1728 ;; first Monday after December 30. For large values of |n| the problem is | |
1729 ;; more grotesque. | |
17892
b3514551f08d
(diary-float): Rewritten to fix bug when base date
Richard M. Stallman <rms@gnu.org>
parents:
17626
diff
changeset
|
1730 (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
|
1731 (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
|
1732 (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
|
1733 (y (extract-calendar-year date)) |
92859 | 1734 ;; Last (n>0) or first (n<0) possible base date for entry. |
92696
f656dd57b318
(diary-face-attrs): Fix custom :type.
Glenn Morris <rgm@gnu.org>
parents:
92685
diff
changeset
|
1735 (limit |
17892
b3514551f08d
(diary-float): Rewritten to fix bug when base date
Richard M. Stallman <rms@gnu.org>
parents:
17626
diff
changeset
|
1736 (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
|
1737 (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
|
1738 (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
|
1739 (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
|
1740 (first (calendar-gregorian-from-absolute first-abs)) |
92696
f656dd57b318
(diary-face-attrs): Fix custom :type.
Glenn Morris <rgm@gnu.org>
parents:
92685
diff
changeset
|
1741 ;; m1, d1 is first possible base date. |
17892
b3514551f08d
(diary-float): Rewritten to fix bug when base date
Richard M. Stallman <rms@gnu.org>
parents:
17626
diff
changeset
|
1742 (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
|
1743 (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
|
1744 (y1 (extract-calendar-year first)) |
92696
f656dd57b318
(diary-face-attrs): Fix custom :type.
Glenn Morris <rgm@gnu.org>
parents:
92685
diff
changeset
|
1745 ;; m2, d2 is last possible base date. |
17892
b3514551f08d
(diary-float): Rewritten to fix bug when base date
Richard M. Stallman <rms@gnu.org>
parents:
17626
diff
changeset
|
1746 (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
|
1747 (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
|
1748 (y2 (extract-calendar-year last))) |
92859 | 1749 (if (or (and (= m1 m2) ; only possible base dates in one month |
1750 (or (eq month t) | |
1751 (if (listp month) | |
35500
38b437f4134e
(diary-float): Fix case of MONTH
Gerd Moellmann <gerd@gnu.org>
parents:
34036
diff
changeset
|
1752 (memq m1 month) |
92859 | 1753 (= m1 month))) |
1754 (let ((d (or day (if (> n 0) | |
1755 1 | |
1756 (calendar-last-day-of-month m1 y1))))) | |
1757 (and (<= d1 d) (<= d d2)))) | |
1758 ;; Only possible base dates straddle two months. | |
1759 (and (or (< y1 y2) | |
1760 (and (= y1 y2) (< m1 m2))) | |
1761 (or | |
1762 ;; m1, d1 works as a base date. | |
1763 (and | |
1764 (or (eq month t) | |
1765 (if (listp month) | |
35500
38b437f4134e
(diary-float): Fix case of MONTH
Gerd Moellmann <gerd@gnu.org>
parents:
34036
diff
changeset
|
1766 (memq m1 month) |
92859 | 1767 (= m1 month))) |
1768 (<= d1 (or day (if (> n 0) | |
1769 1 | |
1770 (calendar-last-day-of-month m1 y1))))) | |
1771 ;; m2, d2 works as a base date. | |
1772 (and (or (eq month t) | |
1773 (if (listp month) | |
35500
38b437f4134e
(diary-float): Fix case of MONTH
Gerd Moellmann <gerd@gnu.org>
parents:
34036
diff
changeset
|
1774 (memq m2 month) |
92859 | 1775 (= m2 month))) |
1776 (<= (or day (if (> n 0) | |
1777 1 | |
1778 (calendar-last-day-of-month m2 y2))) | |
1779 d2))))) | |
1780 (cons mark entry))))) | |
13053 | 1781 |
93027
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
1782 (defun diary-ordinal-suffix (n) |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
1783 "Ordinal suffix for N. (That is, `st', `nd', `rd', or `th', as appropriate.)" |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
1784 (if (or (memq (% n 100) '(11 12 13)) |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
1785 (< 3 (% n 10))) |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
1786 "th" |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
1787 (aref ["th" "st" "nd" "rd"] (% n 10)))) |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
1788 |
92672
6f28457f84ac
(entry): Declare for compiler part-way through.
Glenn Morris <rgm@gnu.org>
parents:
92664
diff
changeset
|
1789 ;; To be called from diary-sexp-entry, where DATE, ENTRY are bound. |
65875
8c8c651e39cc
Use overlays rather than selective-display.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65619
diff
changeset
|
1790 (defun diary-anniversary (month day &optional year mark) |
13053 | 1791 "Anniversary diary entry. |
93375
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1792 Entry applies if date is the anniversary of MONTH, DAY, YEAR. |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1793 The order of the input parameters changes according to |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1794 `calendar-date-style' (e.g. to DAY MONTH YEAR in the European style). |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1795 |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1796 The diary entry can contain `%d' or `%d%s'; the %d will be |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1797 replaced by the number of years since the MONTH, DAY, YEAR, and the |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1798 %s will be replaced by the ordinal ending of that number (that |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1799 is, `st', `nd', `rd' or `th', as appropriate. The anniversary of |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1800 February 29 is considered to be March 1 in non-leap years. |
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
1801 |
93375
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1802 An optional parameter MARK specifies a face or single-character |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1803 string to use when highlighting the day in the calendar." |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1804 (let* ((ddate (diary-make-date month day year)) |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1805 (dd (extract-calendar-day ddate)) |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1806 (mm (extract-calendar-month ddate)) |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1807 (yy (extract-calendar-year ddate)) |
13053 | 1808 (y (extract-calendar-year date)) |
93375
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1809 (diff (if yy (- y yy) 100))) |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1810 (and (= mm 2) (= dd 29) (not (calendar-leap-year-p y)) |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1811 (setq mm 3 |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1812 dd 1)) |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1813 (and (> diff 0) (calendar-date-equal (list mm dd y) date) |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1814 (cons mark (format entry diff (diary-ordinal-suffix diff)))))) |
13053 | 1815 |
92672
6f28457f84ac
(entry): Declare for compiler part-way through.
Glenn Morris <rgm@gnu.org>
parents:
92664
diff
changeset
|
1816 ;; To be called from diary-sexp-entry, where DATE, ENTRY are bound. |
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
1817 (defun diary-cyclic (n month day year &optional mark) |
13053 | 1818 "Cycle diary entry--entry applies every N days starting at MONTH, DAY, YEAR. |
93375
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1819 The order of the input parameters changes according to |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1820 `calendar-date-style' (e.g. to N DAY MONTH YEAR in the European |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1821 style). ENTRY can contain `%d' or `%d%s'; the %d will be |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1822 replaced by the number of repetitions since the MONTH DAY YEAR, |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1823 and %s by the ordinal ending of that number (that is, `st', `nd', |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1824 `rd' or `th', as appropriate. |
46620
f367f20901c0
(mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents:
44732
diff
changeset
|
1825 |
93375
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1826 An optional parameter MARK specifies a face or single-character |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1827 string to use when highlighting the day in the calendar." |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1828 (let* ((diff (- (calendar-absolute-from-gregorian date) |
13053 | 1829 (calendar-absolute-from-gregorian |
93375
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1830 (diary-make-date month day year)))) |
13053 | 1831 (cycle (/ diff n))) |
93375
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1832 (and (>= diff 0) (zerop (% diff n)) |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1833 (cons mark (format entry cycle (diary-ordinal-suffix cycle)))))) |
13053 | 1834 |
1835 (defun diary-day-of-year () | |
1836 "Day of year and number of days remaining in the year of date diary entry." | |
1837 (calendar-day-of-year-string date)) | |
1838 | |
1839 (defun diary-remind (sexp days &optional marking) | |
1840 "Provide a reminder of a diary entry. | |
1841 SEXP is a diary-sexp. DAYS is either a single number or a list of numbers | |
1842 indicating the number(s) of days before the event that the warning(s) should | |
1843 occur on. If the current date is (one of) DAYS before the event indicated by | |
1844 SEXP, then a suitable message (as specified by `diary-remind-message' is | |
1845 returned. | |
1846 | |
24684
cca41b0e7ae7
(diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents:
24192
diff
changeset
|
1847 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
|
1848 date itself. |
cca41b0e7ae7
(diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents:
24192
diff
changeset
|
1849 |
92696
f656dd57b318
(diary-face-attrs): Fix custom :type.
Glenn Morris <rgm@gnu.org>
parents:
92685
diff
changeset
|
1850 A `diary-nonmarking-symbol' at the beginning of the line of the `diary-remind' |
24684
cca41b0e7ae7
(diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents:
24192
diff
changeset
|
1851 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
|
1852 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
|
1853 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
|
1854 marked on the calendar." |
cca41b0e7ae7
(diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents:
24192
diff
changeset
|
1855 (let ((diary-entry (eval sexp))) |
cca41b0e7ae7
(diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents:
24192
diff
changeset
|
1856 (cond |
92696
f656dd57b318
(diary-face-attrs): Fix custom :type.
Glenn Morris <rgm@gnu.org>
parents:
92685
diff
changeset
|
1857 ;; Diary entry applies on date. |
24684
cca41b0e7ae7
(diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents:
24192
diff
changeset
|
1858 ((and diary-entry |
cca41b0e7ae7
(diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents:
24192
diff
changeset
|
1859 (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
|
1860 diary-entry) |
92696
f656dd57b318
(diary-face-attrs): Fix custom :type.
Glenn Morris <rgm@gnu.org>
parents:
92685
diff
changeset
|
1861 ;; Diary entry may apply to `days' before date. |
24684
cca41b0e7ae7
(diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents:
24192
diff
changeset
|
1862 ((and (integerp days) |
92859 | 1863 (not diary-entry) ; diary entry does not apply to date |
24684
cca41b0e7ae7
(diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents:
24192
diff
changeset
|
1864 (or (not marking-diary-entries) marking)) |
cca41b0e7ae7
(diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents:
24192
diff
changeset
|
1865 (let ((date (calendar-gregorian-from-absolute |
cca41b0e7ae7
(diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents:
24192
diff
changeset
|
1866 (+ (calendar-absolute-from-gregorian date) days)))) |
60298
6f85d024a41d
(diary-remind): Discard any mark portion from diary-entry. Reported
Glenn Morris <rgm@gnu.org>
parents:
59996
diff
changeset
|
1867 (when (setq diary-entry (eval sexp)) ; re-evaluate with adjusted date |
6f85d024a41d
(diary-remind): Discard any mark portion from diary-entry. Reported
Glenn Morris <rgm@gnu.org>
parents:
59996
diff
changeset
|
1868 ;; Discard any mark portion from diary-anniversary, etc. |
6f85d024a41d
(diary-remind): Discard any mark portion from diary-entry. Reported
Glenn Morris <rgm@gnu.org>
parents:
59996
diff
changeset
|
1869 (if (consp diary-entry) (setq diary-entry (cdr diary-entry))) |
6f85d024a41d
(diary-remind): Discard any mark portion from diary-entry. Reported
Glenn Morris <rgm@gnu.org>
parents:
59996
diff
changeset
|
1870 (mapconcat 'eval diary-remind-message "")))) |
92696
f656dd57b318
(diary-face-attrs): Fix custom :type.
Glenn Morris <rgm@gnu.org>
parents:
92685
diff
changeset
|
1871 ;; Diary entry may apply to one of a list of days before date. |
24684
cca41b0e7ae7
(diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents:
24192
diff
changeset
|
1872 ((and (listp days) days) |
cca41b0e7ae7
(diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents:
24192
diff
changeset
|
1873 (or (diary-remind sexp (car days) marking) |
cca41b0e7ae7
(diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents:
24192
diff
changeset
|
1874 (diary-remind sexp (cdr days) marking)))))) |
13053 | 1875 |
93232
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
1876 |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
1877 ;;; Diary insertion functions. |
60321
efcf9ada3122
(mark-diary-entries): Remove any old marks first.
Glenn Morris <rgm@gnu.org>
parents:
60298
diff
changeset
|
1878 |
92843
de680a2b3b3b
(diary-loaddefs): Load this rather than explicit autoloads.
Glenn Morris <rgm@gnu.org>
parents:
92696
diff
changeset
|
1879 ;;;###cal-autoload |
13053 | 1880 (defun make-diary-entry (string &optional nonmarking file) |
1881 "Insert a diary entry STRING which may be NONMARKING in FILE. | |
60321
efcf9ada3122
(mark-diary-entries): Remove any old marks first.
Glenn Morris <rgm@gnu.org>
parents:
60298
diff
changeset
|
1882 If omitted, NONMARKING defaults to nil and FILE defaults to |
65875
8c8c651e39cc
Use overlays rather than selective-display.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65619
diff
changeset
|
1883 `diary-file'." |
93331
1edfec53a698
(print-diary-entries-hook, diary-list-entries): Doc fixes.
Glenn Morris <rgm@gnu.org>
parents:
93284
diff
changeset
|
1884 (let ((pop-up-frames (or pop-up-frames |
1edfec53a698
(print-diary-entries-hook, diary-list-entries): Doc fixes.
Glenn Morris <rgm@gnu.org>
parents:
93284
diff
changeset
|
1885 (window-dedicated-p (selected-window))))) |
52319
c701edc37ab5
(simple-diary-display, make-diary-entry): Allow the diary to pop up a
Glenn Morris <rgm@gnu.org>
parents:
52117
diff
changeset
|
1886 (find-file-other-window (substitute-in-file-name (or file diary-file)))) |
66869
cfc510b6c9e6
(diary-list-entries, diary-show-all-entries)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66429
diff
changeset
|
1887 (when (eq major-mode default-major-mode) (diary-mode)) |
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
|
1888 (widen) |
65476
11058ae1650f
Use with-current-buffer, match-string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65108
diff
changeset
|
1889 (diary-unhide-everything) |
13053 | 1890 (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
|
1891 (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
|
1892 (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
|
1893 (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
|
1894 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
|
1895 (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
|
1896 (insert "\n") |
65476
11058ae1650f
Use with-current-buffer, match-string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65108
diff
changeset
|
1897 (forward-line -1)) |
13053 | 1898 (insert |
1899 (if (bolp) "" "\n") | |
1900 (if nonmarking diary-nonmarking-symbol "") | |
1901 string " ")) | |
1902 | |
92843
de680a2b3b3b
(diary-loaddefs): Load this rather than explicit autoloads.
Glenn Morris <rgm@gnu.org>
parents:
92696
diff
changeset
|
1903 ;;;###cal-autoload |
13053 | 1904 (defun insert-diary-entry (arg) |
1905 "Insert a diary entry for the date indicated by point. | |
92696
f656dd57b318
(diary-face-attrs): Fix custom :type.
Glenn Morris <rgm@gnu.org>
parents:
92685
diff
changeset
|
1906 Prefix argument ARG makes the entry nonmarking." |
13053 | 1907 (interactive "P") |
1908 (make-diary-entry (calendar-date-string (calendar-cursor-to-date t) t t) | |
1909 arg)) | |
1910 | |
92843
de680a2b3b3b
(diary-loaddefs): Load this rather than explicit autoloads.
Glenn Morris <rgm@gnu.org>
parents:
92696
diff
changeset
|
1911 ;;;###cal-autoload |
13053 | 1912 (defun insert-weekly-diary-entry (arg) |
1913 "Insert a weekly diary entry for the day of the week indicated by point. | |
92696
f656dd57b318
(diary-face-attrs): Fix custom :type.
Glenn Morris <rgm@gnu.org>
parents:
92685
diff
changeset
|
1914 Prefix argument ARG makes the entry nonmarking." |
13053 | 1915 (interactive "P") |
1916 (make-diary-entry (calendar-day-name (calendar-cursor-to-date t)) | |
1917 arg)) | |
1918 | |
93375
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1919 (defun diary-date-display-form (&optional type) |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1920 "Return value for `calendar-date-display-form' using `calendar-date-style.' |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1921 Optional symbol TYPE is either `monthly' or `yearly'." |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1922 (cond ((eq type 'monthly) (cond ((eq calendar-date-style 'iso) |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1923 '((format "*-*-%.2d" |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1924 (string-to-number day)))) |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1925 ((eq calendar-date-style 'european) |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1926 '(day " * ")) |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1927 (t '("* " day )))) |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1928 ((eq type 'yearly) (cond ((eq calendar-date-style 'iso) |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1929 '((format "*-%.2d-%.2d" |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1930 (string-to-number month) |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1931 (string-to-number day)))) |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1932 ((eq calendar-date-style 'european) |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1933 '(day " " monthname)) |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1934 (t '(monthname " " day)))) |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1935 ;; Iso cannot contain "-", because this form used eg by |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1936 ;; insert-anniversary-diary-entry. |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1937 (t (cond ((eq calendar-date-style 'iso) |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1938 '((format "%s %.2d %.2d" year |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1939 (string-to-number month) (string-to-number day)))) |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1940 ((eq calendar-date-style 'european) |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1941 '(day " " month " " year)) |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1942 (t '(month " " day " " year)))))) |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1943 |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1944 (defun diary-insert-entry-1 (&optional type nomark months symbol absfunc) |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1945 "Subroutine to insert a diary entry related to the date at point. |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1946 TYPE is the type of entry (`monthly' or `yearly'). NOMARK |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1947 non-nil means make the entry non-marking. Array MONTHS is used |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1948 in place of `calendar-month-name-array'. String SYMBOL marks the |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1949 type of diary entry. Function ABSFUNC converts absolute dates to |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1950 dates of the appropriate type." |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1951 (let ((calendar-date-display-form (if type |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1952 (diary-date-display-form type) |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1953 calendar-date-display-form)) |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1954 (calendar-month-name-array (or months calendar-month-name-array)) |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1955 (date (calendar-cursor-to-date t))) |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1956 (make-diary-entry |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1957 (format "%s%s" (or symbol "") |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1958 (calendar-date-string |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1959 (if absfunc |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1960 (funcall absfunc (calendar-absolute-from-gregorian date)) |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1961 date) |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1962 (not absfunc) |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1963 (not type))) |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1964 nomark))) |
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1965 |
92843
de680a2b3b3b
(diary-loaddefs): Load this rather than explicit autoloads.
Glenn Morris <rgm@gnu.org>
parents:
92696
diff
changeset
|
1966 ;;;###cal-autoload |
13053 | 1967 (defun insert-monthly-diary-entry (arg) |
1968 "Insert a monthly diary entry for the day of the month indicated by point. | |
92696
f656dd57b318
(diary-face-attrs): Fix custom :type.
Glenn Morris <rgm@gnu.org>
parents:
92685
diff
changeset
|
1969 Prefix argument ARG makes the entry nonmarking." |
13053 | 1970 (interactive "P") |
93375
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1971 (diary-insert-entry-1 'monthly arg)) |
13053 | 1972 |
92843
de680a2b3b3b
(diary-loaddefs): Load this rather than explicit autoloads.
Glenn Morris <rgm@gnu.org>
parents:
92696
diff
changeset
|
1973 ;;;###cal-autoload |
13053 | 1974 (defun insert-yearly-diary-entry (arg) |
1975 "Insert an annual diary entry for the day of the year indicated by point. | |
92696
f656dd57b318
(diary-face-attrs): Fix custom :type.
Glenn Morris <rgm@gnu.org>
parents:
92685
diff
changeset
|
1976 Prefix argument ARG makes the entry nonmarking." |
13053 | 1977 (interactive "P") |
93375
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1978 (diary-insert-entry-1 'yearly arg)) |
13053 | 1979 |
92843
de680a2b3b3b
(diary-loaddefs): Load this rather than explicit autoloads.
Glenn Morris <rgm@gnu.org>
parents:
92696
diff
changeset
|
1980 ;;;###cal-autoload |
13053 | 1981 (defun insert-anniversary-diary-entry (arg) |
1982 "Insert an anniversary diary entry for the date given by point. | |
92696
f656dd57b318
(diary-face-attrs): Fix custom :type.
Glenn Morris <rgm@gnu.org>
parents:
92685
diff
changeset
|
1983 Prefix argument ARG makes the entry nonmarking." |
13053 | 1984 (interactive "P") |
93375
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1985 (let ((calendar-date-display-form (diary-date-display-form))) |
13053 | 1986 (make-diary-entry |
1987 (format "%s(diary-anniversary %s)" | |
1988 sexp-diary-entry-symbol | |
1989 (calendar-date-string (calendar-cursor-to-date t) nil t)) | |
1990 arg))) | |
1991 | |
92843
de680a2b3b3b
(diary-loaddefs): Load this rather than explicit autoloads.
Glenn Morris <rgm@gnu.org>
parents:
92696
diff
changeset
|
1992 ;;;###cal-autoload |
13053 | 1993 (defun insert-block-diary-entry (arg) |
1994 "Insert a block diary entry for the days between the point and marked date. | |
92696
f656dd57b318
(diary-face-attrs): Fix custom :type.
Glenn Morris <rgm@gnu.org>
parents:
92685
diff
changeset
|
1995 Prefix argument ARG makes the entry nonmarking." |
13053 | 1996 (interactive "P") |
93375
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
1997 (let ((calendar-date-display-form (diary-date-display-form)) |
92862 | 1998 (cursor (calendar-cursor-to-date t)) |
1999 (mark (or (car calendar-mark-ring) | |
2000 (error "No mark set in this buffer"))) | |
2001 start end) | |
13053 | 2002 (if (< (calendar-absolute-from-gregorian mark) |
2003 (calendar-absolute-from-gregorian cursor)) | |
2004 (setq start mark | |
2005 end cursor) | |
2006 (setq start cursor | |
92862 | 2007 end mark)) |
13053 | 2008 (make-diary-entry |
2009 (format "%s(diary-block %s %s)" | |
92862 | 2010 sexp-diary-entry-symbol |
2011 (calendar-date-string start nil t) | |
2012 (calendar-date-string end nil t)) | |
13053 | 2013 arg))) |
2014 | |
92843
de680a2b3b3b
(diary-loaddefs): Load this rather than explicit autoloads.
Glenn Morris <rgm@gnu.org>
parents:
92696
diff
changeset
|
2015 ;;;###cal-autoload |
13053 | 2016 (defun insert-cyclic-diary-entry (arg) |
2017 "Insert a cyclic diary entry starting at the date given by point. | |
92696
f656dd57b318
(diary-face-attrs): Fix custom :type.
Glenn Morris <rgm@gnu.org>
parents:
92685
diff
changeset
|
2018 Prefix argument ARG makes the entry nonmarking." |
13053 | 2019 (interactive "P") |
93375
0d954ec4d752
(number): Move declaration where needed.
Glenn Morris <rgm@gnu.org>
parents:
93331
diff
changeset
|
2020 (let ((calendar-date-display-form (diary-date-display-form))) |
13053 | 2021 (make-diary-entry |
2022 (format "%s(diary-cyclic %d %s)" | |
2023 sexp-diary-entry-symbol | |
2024 (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
|
2025 (lambda (x) (> x 0))) |
13053 | 2026 (calendar-date-string (calendar-cursor-to-date t) nil t)) |
2027 arg))) | |
2028 | |
93027
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2029 ;;; Diary mode. |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2030 |
93232
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
2031 (defun diary-redraw-calendar () |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
2032 "If `calendar-buffer' is live and diary entries are marked, redraw it." |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
2033 (and mark-diary-entries-in-calendar |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
2034 (save-excursion |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
2035 (redraw-calendar))) |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
2036 ;; Return value suitable for `write-contents-functions'. |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
2037 nil) |
32f5a7f03231
Some re-ordering so that defcustoms are at start, functions defined
Glenn Morris <rgm@gnu.org>
parents:
93027
diff
changeset
|
2038 |
65476
11058ae1650f
Use with-current-buffer, match-string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65108
diff
changeset
|
2039 (defvar diary-mode-map |
11058ae1650f
Use with-current-buffer, match-string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65108
diff
changeset
|
2040 (let ((map (make-sparse-keymap))) |
11058ae1650f
Use with-current-buffer, match-string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65108
diff
changeset
|
2041 (define-key map "\C-c\C-s" 'diary-show-all-entries) |
11058ae1650f
Use with-current-buffer, match-string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65108
diff
changeset
|
2042 (define-key map "\C-c\C-q" 'quit-window) |
11058ae1650f
Use with-current-buffer, match-string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65108
diff
changeset
|
2043 map) |
11058ae1650f
Use with-current-buffer, match-string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65108
diff
changeset
|
2044 "Keymap for `diary-mode'.") |
11058ae1650f
Use with-current-buffer, match-string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65108
diff
changeset
|
2045 |
11058ae1650f
Use with-current-buffer, match-string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65108
diff
changeset
|
2046 (defun diary-font-lock-sexps (limit) |
92696
f656dd57b318
(diary-face-attrs): Fix custom :type.
Glenn Morris <rgm@gnu.org>
parents:
92685
diff
changeset
|
2047 "Recognize sexp diary entry up to LIMIT for font-locking." |
48365
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
2048 (if (re-search-forward |
92994
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
2049 (format "^%s?\\(%s\\)" (regexp-quote diary-nonmarking-symbol) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
2050 (regexp-quote sexp-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
|
2051 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
|
2052 (condition-case nil |
92859 | 2053 (save-restriction |
2054 (narrow-to-region (point-min) limit) | |
2055 (let ((start (point))) | |
2056 (forward-sexp 1) | |
2057 (store-match-data (list start (point))) | |
2058 t)) | |
2059 (error 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
|
2060 |
65476
11058ae1650f
Use with-current-buffer, match-string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65108
diff
changeset
|
2061 (defun diary-font-lock-date-forms (month-array &optional symbol abbrev-array) |
52117
e8a77526768b
(list-diary-entries): Adapt for new behaviour of `calendar-day-name'
Glenn Morris <rgm@gnu.org>
parents:
51640
diff
changeset
|
2062 "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
|
2063 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
|
2064 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
|
2065 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
|
2066 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
|
2067 names." |
e8a77526768b
(list-diary-entries): Adapt for new behaviour of `calendar-day-name'
Glenn Morris <rgm@gnu.org>
parents:
51640
diff
changeset
|
2068 (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
|
2069 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
|
2070 (monthname (format "\\(%s\\|\\*\\)" |
e8a77526768b
(list-diary-entries): Adapt for new behaviour of `calendar-day-name'
Glenn Morris <rgm@gnu.org>
parents:
51640
diff
changeset
|
2071 (diary-name-pattern month-array abbrev-array))) |
51640
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
2072 (month "\\([0-9]+\\|\\*\\)") |
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
2073 (day "\\([0-9]+\\|\\*\\)") |
6732b4ce8c04
(diary-check-diary-file): New function.
Glenn Morris <rgm@gnu.org>
parents:
50908
diff
changeset
|
2074 (year "-?\\([0-9]+\\|\\*\\)")) |
65476
11058ae1650f
Use with-current-buffer, match-string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65108
diff
changeset
|
2075 (mapcar (lambda (x) |
92862 | 2076 (cons |
2077 (concat "^" (regexp-quote diary-nonmarking-symbol) "?" | |
2078 (if symbol (regexp-quote symbol) "") "\\(" | |
2079 (mapconcat 'eval | |
2080 ;; If backup, omit first item (backup) | |
2081 ;; and last item (not part of date). | |
2082 (if (equal (car x) 'backup) | |
65476
11058ae1650f
Use with-current-buffer, match-string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65108
diff
changeset
|
2083 (nreverse (cdr (reverse (cdr x)))) |
92862 | 2084 x) |
2085 "") | |
2086 ;; With backup, last item is not part of date. | |
2087 (if (equal (car x) 'backup) | |
2088 (concat "\\)" (eval (car (reverse x)))) | |
2089 "\\)")) | |
2090 '(1 diary-face))) | |
48365
25f62a7a6efc
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
48312
diff
changeset
|
2091 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
|
2092 |
92994
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
2093 (defmacro diary-font-lock-keywords-1 (markfunc listfunc feature months symbol) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
2094 "Subroutine of the function `diary-font-lock-keywords'. |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
2095 If MARKFUNC is a member of `nongregorian-diary-marking-hook', or |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
2096 LISTFUNC of `nongregorian-diary-listing-hook', then require FEATURE |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
2097 and return a font-lock pattern matching array of MONTHS and marking SYMBOL." |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
2098 `(when (or (memq ',markfunc nongregorian-diary-marking-hook) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
2099 (memq ',listfunc nongregorian-diary-listing-hook)) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
2100 (require ',feature) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
2101 (diary-font-lock-date-forms ,months ,symbol))) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
2102 |
93027
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2103 (defconst diary-time-regexp |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2104 ;; Accepted formats: 10:00 10.00 10h00 10h 10am 10:00am 10.00am |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2105 ;; Use of "." as a separator annoyingly matches numbers, eg "123.45". |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2106 ;; Hence often prefix this with "\\(^\\|\\s-\\)." |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2107 (concat "[0-9]?[0-9]\\([AaPp][mM]\\|\\(" |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2108 "[Hh]\\([0-9][0-9]\\)?\\|[:.][0-9][0-9]" |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2109 "\\)\\([AaPp][Mm]\\)?\\)") |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2110 "Regular expression matching a time of day.") |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2111 |
92595 | 2112 (defvar calendar-hebrew-month-name-array-leap-year) |
2113 (defvar calendar-islamic-month-name-array) | |
2114 (defvar calendar-bahai-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
|
2115 |
92843
de680a2b3b3b
(diary-loaddefs): Load this rather than explicit autoloads.
Glenn Morris <rgm@gnu.org>
parents:
92696
diff
changeset
|
2116 ;;;###cal-autoload |
77043
694008dfe9c9
(diary-set-maybe-redraw): Move definition before first use.
Glenn Morris <rgm@gnu.org>
parents:
76754
diff
changeset
|
2117 (defun diary-font-lock-keywords () |
694008dfe9c9
(diary-set-maybe-redraw): Move definition before first use.
Glenn Morris <rgm@gnu.org>
parents:
76754
diff
changeset
|
2118 "Return a value for the variable `diary-font-lock-keywords'." |
694008dfe9c9
(diary-set-maybe-redraw): Move definition before first use.
Glenn Morris <rgm@gnu.org>
parents:
76754
diff
changeset
|
2119 (append |
694008dfe9c9
(diary-set-maybe-redraw): Move definition before first use.
Glenn Morris <rgm@gnu.org>
parents:
76754
diff
changeset
|
2120 (diary-font-lock-date-forms calendar-month-name-array |
694008dfe9c9
(diary-set-maybe-redraw): Move definition before first use.
Glenn Morris <rgm@gnu.org>
parents:
76754
diff
changeset
|
2121 nil calendar-month-abbrev-array) |
92994
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
2122 (diary-font-lock-keywords-1 mark-hebrew-diary-entries |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
2123 list-hebrew-diary-entries |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
2124 cal-hebrew |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
2125 calendar-hebrew-month-name-array-leap-year |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
2126 hebrew-diary-entry-symbol) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
2127 (diary-font-lock-keywords-1 mark-islamic-diary-entries |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
2128 list-islamic-diary-entries |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
2129 cal-islam |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
2130 calendar-islamic-month-name-array |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
2131 islamic-diary-entry-symbol) |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
2132 (diary-font-lock-keywords-1 diary-bahai-mark-entries |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
2133 diary-bahai-list-entries |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
2134 cal-bahai |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
2135 calendar-bahai-month-name-array |
deb2f6126df1
(diary-remind-message, mark-sexp-diary-entries, list-sexp-diary-entries)
Glenn Morris <rgm@gnu.org>
parents:
92973
diff
changeset
|
2136 bahai-diary-entry-symbol) |
77043
694008dfe9c9
(diary-set-maybe-redraw): Move definition before first use.
Glenn Morris <rgm@gnu.org>
parents:
76754
diff
changeset
|
2137 (list |
694008dfe9c9
(diary-set-maybe-redraw): Move definition before first use.
Glenn Morris <rgm@gnu.org>
parents:
76754
diff
changeset
|
2138 (cons |
92595 | 2139 (format "^%s.*$" (regexp-quote diary-include-string)) |
77043
694008dfe9c9
(diary-set-maybe-redraw): Move definition before first use.
Glenn Morris <rgm@gnu.org>
parents:
76754
diff
changeset
|
2140 'font-lock-keyword-face) |
694008dfe9c9
(diary-set-maybe-redraw): Move definition before first use.
Glenn Morris <rgm@gnu.org>
parents:
76754
diff
changeset
|
2141 (cons |
92595 | 2142 (format "^%s?\\(%s\\)" (regexp-quote diary-nonmarking-symbol) |
92859 | 2143 (regexp-quote sexp-diary-entry-symbol)) |
77043
694008dfe9c9
(diary-set-maybe-redraw): Move definition before first use.
Glenn Morris <rgm@gnu.org>
parents:
76754
diff
changeset
|
2144 '(1 font-lock-reference-face)) |
694008dfe9c9
(diary-set-maybe-redraw): Move definition before first use.
Glenn Morris <rgm@gnu.org>
parents:
76754
diff
changeset
|
2145 (cons |
92595 | 2146 (format "^%s" (regexp-quote diary-nonmarking-symbol)) |
77043
694008dfe9c9
(diary-set-maybe-redraw): Move definition before first use.
Glenn Morris <rgm@gnu.org>
parents:
76754
diff
changeset
|
2147 'font-lock-reference-face) |
694008dfe9c9
(diary-set-maybe-redraw): Move definition before first use.
Glenn Morris <rgm@gnu.org>
parents:
76754
diff
changeset
|
2148 (cons |
92595 | 2149 (format "^%s?%s" (regexp-quote diary-nonmarking-symbol) |
92859 | 2150 (regexp-opt (mapcar 'regexp-quote |
2151 (list hebrew-diary-entry-symbol | |
2152 islamic-diary-entry-symbol | |
2153 bahai-diary-entry-symbol)) | |
2154 t)) | |
77043
694008dfe9c9
(diary-set-maybe-redraw): Move definition before first use.
Glenn Morris <rgm@gnu.org>
parents:
76754
diff
changeset
|
2155 '(1 font-lock-reference-face)) |
694008dfe9c9
(diary-set-maybe-redraw): Move definition before first use.
Glenn Morris <rgm@gnu.org>
parents:
76754
diff
changeset
|
2156 '(diary-font-lock-sexps . font-lock-keyword-face) |
92595 | 2157 `(,(format "\\(^\\|\\s-\\)%s\\(-%s\\)?" diary-time-regexp |
92859 | 2158 diary-time-regexp) |
77043
694008dfe9c9
(diary-set-maybe-redraw): Move definition before first use.
Glenn Morris <rgm@gnu.org>
parents:
76754
diff
changeset
|
2159 . 'diary-time)))) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48421
diff
changeset
|
2160 |
77043
694008dfe9c9
(diary-set-maybe-redraw): Move definition before first use.
Glenn Morris <rgm@gnu.org>
parents:
76754
diff
changeset
|
2161 (defvar diary-font-lock-keywords (diary-font-lock-keywords) |
694008dfe9c9
(diary-set-maybe-redraw): Move definition before first use.
Glenn Morris <rgm@gnu.org>
parents:
76754
diff
changeset
|
2162 "Forms to highlight in `diary-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
|
2163 |
93027
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2164 ;;;###autoload |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2165 (define-derived-mode diary-mode fundamental-mode "Diary" |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2166 "Major mode for editing the diary file." |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2167 (set (make-local-variable 'font-lock-defaults) |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2168 '(diary-font-lock-keywords t)) |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2169 (add-to-invisibility-spec '(diary . nil)) |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2170 (add-hook 'after-save-hook 'diary-redraw-calendar nil t) |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2171 (if diary-header-line-flag |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2172 (setq header-line-format diary-header-line-format))) |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2173 |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2174 |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2175 ;;; Fancy Diary Mode. |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2176 |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2177 (defvar diary-fancy-date-pattern |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2178 (concat |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2179 (let ((dayname (diary-name-pattern calendar-day-name-array nil t)) |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2180 (monthname (diary-name-pattern calendar-month-name-array nil t)) |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2181 (day "[0-9]+") |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2182 (month "[0-9]+") |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2183 (year "-?[0-9]+")) |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2184 (mapconcat 'eval calendar-date-display-form "")) |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2185 ;; Optional ": holiday name" after the date. |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2186 "\\(: .*\\)?") |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2187 "Regular expression matching a date header in Fancy Diary.") |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2188 |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2189 (defvar fancy-diary-font-lock-keywords |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2190 (list |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2191 (list |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2192 ;; Any number of " other holiday name" lines, followed by "==" line. |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2193 (concat diary-fancy-date-pattern "\\(\n +.*\\)*\n=+$") |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2194 '(0 (progn (put-text-property (match-beginning 0) (match-end 0) |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2195 'font-lock-multiline t) |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2196 diary-face))) |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2197 '("^.*\\([aA]nniversary\\|[bB]irthday\\).*$" . 'diary-anniversary) |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2198 '("^.*Yahrzeit.*$" . font-lock-reference-face) |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2199 '("^\\(Erev \\)?Rosh Hodesh.*" . font-lock-function-name-face) |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2200 '("^Day.*omer.*$" . font-lock-builtin-face) |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2201 '("^Parashat.*$" . font-lock-comment-face) |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2202 `(,(format "\\(^\\|\\s-\\)%s\\(-%s\\)?" diary-time-regexp |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2203 diary-time-regexp) . 'diary-time)) |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2204 "Keywords to highlight in fancy diary display.") |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2205 |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2206 ;; If region looks like it might start or end in the middle of a |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2207 ;; multiline pattern, extend the region to encompass the whole pattern. |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2208 (defun diary-fancy-font-lock-fontify-region-function (beg end &optional verbose) |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2209 "Function to use for `font-lock-fontify-region-function' in Fancy Diary. |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2210 Needed to handle multiline keyword in `fancy-diary-font-lock-keywords'. |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2211 Fontify the region between BEG and END, quietly unless VERBOSE is non-nil." |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2212 (goto-char beg) |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2213 (forward-line 0) |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2214 (if (looking-at "=+$") (forward-line -1)) |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2215 (while (and (looking-at " +[^ ]") |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2216 (zerop (forward-line -1)))) |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2217 ;; This check not essential. |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2218 (if (looking-at diary-fancy-date-pattern) |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2219 (setq beg (line-beginning-position))) |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2220 (goto-char end) |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2221 (forward-line 0) |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2222 (while (and (looking-at " +[^ ]") |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2223 (zerop (forward-line 1)))) |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2224 (if (looking-at "=+$") |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2225 (setq end (line-beginning-position 2))) |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2226 (font-lock-default-fontify-region beg end verbose)) |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2227 |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2228 (define-derived-mode fancy-diary-display-mode fundamental-mode |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2229 "Diary" |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2230 "Major mode used while displaying diary entries using Fancy Display." |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2231 (set (make-local-variable 'font-lock-defaults) |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2232 '(fancy-diary-font-lock-keywords |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2233 t nil nil nil |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2234 (font-lock-fontify-region-function |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2235 . diary-fancy-font-lock-fontify-region-function))) |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2236 (local-set-key "q" 'quit-window)) |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2237 |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2238 |
55249 | 2239 ;; Following code from Dave Love <fx@gnu.org>. |
2240 ;; Import Outlook-format appointments from mail messages in Gnus or | |
2241 ;; Rmail using command `diary-from-outlook'. This, or the specialized | |
2242 ;; functions `diary-from-outlook-gnus' and `diary-from-outlook-rmail', | |
2243 ;; could be run from hooks to notice appointments automatically (in | |
2244 ;; which case they will prompt about adding to the diary). The | |
2245 ;; message formats recognized are customizable through | |
2246 ;; `diary-outlook-formats'. | |
2247 | |
92973
122f4beea537
(diary-face-attrs, diary-glob-file-regexp-prefix, diary-selective-display)
Glenn Morris <rgm@gnu.org>
parents:
92898
diff
changeset
|
2248 (defvar subject) ; bound in diary-from-outlook-gnus |
55249 | 2249 |
2250 (defun diary-from-outlook-internal (&optional test-only) | |
2251 "Snarf a diary entry from a message assumed to be from MS Outlook. | |
2252 Assumes `body' is bound to a string comprising the body of the message and | |
2253 `subject' is bound to a string comprising its subject. | |
2254 Arg TEST-ONLY non-nil means return non-nil if and only if the | |
2255 message contains an appointment, don't make a diary entry." | |
2256 (catch 'finished | |
2257 (let (format-string) | |
2258 (dotimes (i (length diary-outlook-formats)) | |
92859 | 2259 (when (eq 0 (string-match (car (nth i diary-outlook-formats)) |
2260 body)) | |
2261 (unless test-only | |
2262 (setq format-string (cdr (nth i diary-outlook-formats))) | |
2263 (save-excursion | |
2264 (save-window-excursion | |
2265 ;; Fixme: References to optional fields in the format | |
2266 ;; are treated literally, not replaced by the empty | |
2267 ;; string. I think this is an Emacs bug. | |
2268 (make-diary-entry | |
2269 (format (replace-match (if (functionp format-string) | |
2270 (funcall format-string body) | |
2271 format-string) | |
2272 t nil (match-string 0 body)) | |
2273 subject)) | |
2274 (save-buffer)))) | |
2275 (throw 'finished t)))) | |
55249 | 2276 nil)) |
2277 | |
2278 (defvar gnus-article-mime-handles) | |
2279 (defvar gnus-article-buffer) | |
2280 | |
2281 (autoload 'gnus-fetch-field "gnus-util") | |
2282 (autoload 'gnus-narrow-to-body "gnus") | |
2283 (autoload 'mm-get-part "mm-decode") | |
2284 | |
58101
e47a5c4e43ff
(diary-from-outlook, diary-from-outlook-gnus)
Glenn Morris <rgm@gnu.org>
parents:
58099
diff
changeset
|
2285 (defun diary-from-outlook-gnus (&optional noconfirm) |
55249 | 2286 "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
|
2287 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
|
2288 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
|
2289 user is asked to confirm its addition. |
0ff94b7bdea3
(diary-from-outlook, diary-from-outlook-gnus)
Glenn Morris <rgm@gnu.org>
parents:
57255
diff
changeset
|
2290 Add this function to `gnus-article-prepare-hook' to notice appointments |
55249 | 2291 automatically." |
58099
0ff94b7bdea3
(diary-from-outlook, diary-from-outlook-gnus)
Glenn Morris <rgm@gnu.org>
parents:
57255
diff
changeset
|
2292 (interactive "p") |
55249 | 2293 (with-current-buffer gnus-article-buffer |
2294 (let ((subject (gnus-fetch-field "subject")) | |
92859 | 2295 (body (if gnus-article-mime-handles |
2296 ;; We're multipart. Don't get confused by part | |
2297 ;; buttons &c. Assume info is in first part. | |
2298 (mm-get-part (nth 1 gnus-article-mime-handles)) | |
2299 (save-restriction | |
2300 (gnus-narrow-to-body) | |
2301 (buffer-string))))) | |
55249 | 2302 (when (diary-from-outlook-internal t) |
92859 | 2303 (when (or noconfirm (y-or-n-p "Snarf diary entry? ")) |
2304 (diary-from-outlook-internal) | |
2305 (message "Diary entry added")))))) | |
55249 | 2306 |
2307 (custom-add-option 'gnus-article-prepare-hook 'diary-from-outlook-gnus) | |
2308 | |
2309 (defvar rmail-buffer) | |
2310 | |
58101
e47a5c4e43ff
(diary-from-outlook, diary-from-outlook-gnus)
Glenn Morris <rgm@gnu.org>
parents:
58099
diff
changeset
|
2311 (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
|
2312 "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
|
2313 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
|
2314 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
|
2315 user is asked to confirm its addition." |
0ff94b7bdea3
(diary-from-outlook, diary-from-outlook-gnus)
Glenn Morris <rgm@gnu.org>
parents:
57255
diff
changeset
|
2316 (interactive "p") |
55249 | 2317 (with-current-buffer rmail-buffer |
2318 (let ((subject (mail-fetch-field "subject")) | |
92859 | 2319 (body (buffer-substring (save-excursion |
2320 (rfc822-goto-eoh) | |
2321 (point)) | |
2322 (point-max)))) | |
55249 | 2323 (when (diary-from-outlook-internal t) |
92859 | 2324 (when (or noconfirm (y-or-n-p "Snarf diary entry? ")) |
2325 (diary-from-outlook-internal) | |
2326 (message "Diary entry added")))))) | |
55249 | 2327 |
93027
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2328 (defun diary-from-outlook (&optional noconfirm) |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2329 "Maybe snarf diary entry from current Outlook-generated message. |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2330 Currently knows about Gnus and Rmail modes. Unless the optional |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2331 argument NOCONFIRM is non-nil (which is the case when this |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2332 function is called interactively), then if an entry is found the |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2333 user is asked to confirm its addition." |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2334 (interactive "p") |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2335 (let ((func (cond |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2336 ((eq major-mode 'rmail-mode) |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2337 #'diary-from-outlook-rmail) |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2338 ((memq major-mode '(gnus-summary-mode gnus-article-mode)) |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2339 #'diary-from-outlook-gnus) |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2340 (t (error "Don't know how to snarf in `%s'" major-mode))))) |
9c718a4c0412
Re-order some definitions before their use.
Glenn Morris <rgm@gnu.org>
parents:
92994
diff
changeset
|
2341 (funcall func noconfirm))) |
55249 | 2342 |
13650 | 2343 (provide 'diary-lib) |
13053 | 2344 |
65476
11058ae1650f
Use with-current-buffer, match-string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65108
diff
changeset
|
2345 ;; arch-tag: 22dd506e-2e33-410d-9ae1-095a0c1b2010 |
13650 | 2346 ;;; diary-lib.el ends here |