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