annotate lisp/calendar/diary-lib.el @ 61635:a31ea8d7f03c

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