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