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