annotate lisp/calendar/diary-lib.el @ 46739:f77ac36bc907

(help-echo): If global-mode-string is non-nil, display some spaces after it.
author Richard M. Stallman <rms@gnu.org>
date Mon, 29 Jul 2002 21:17:06 +0000
parents f367f20901c0
children e020f18c490a
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
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13877
diff changeset
3 ;; Copyright (C) 1989, 1990, 1992, 1993, 1994, 1995 Free Software
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13877
diff changeset
4 ;; 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>
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
7 ;; Keywords: calendar
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
8
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
9 ;; This file is part of GNU Emacs.
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
10
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
11 ;; 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
12 ;; 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
13 ;; 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
14 ;; any later version.
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
15
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
16 ;; 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
17 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
19 ;; GNU General Public License for more details.
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
20
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
21 ;; 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
22 ;; 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
23 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13877
diff changeset
24 ;; Boston, MA 02111-1307, USA.
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
25
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
26 ;;; Commentary:
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
27
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
28 ;; This collection of functions implements the diary features as described
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
29 ;; in calendar.el.
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
30
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
31 ;; Comments, corrections, and improvements should be sent to
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
32 ;; Edward M. Reingold Department of Computer Science
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
33 ;; (217) 333-6733 University of Illinois at Urbana-Champaign
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
34 ;; reingold@cs.uiuc.edu 1304 West Springfield Avenue
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
35 ;; Urbana, Illinois 61801
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
36
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
37 ;;; Code:
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
38
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
39 (require 'calendar)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
40
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
41 ;;;###autoload
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
42 (defun diary (&optional arg)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
43 "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
44 If no argument is provided, the number of days of diary entries is governed
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
45 by the variable `number-of-diary-entries'. This function is suitable for
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
46 execution in a `.emacs' file."
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
47 (interactive "P")
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
48 (let ((d-file (substitute-in-file-name diary-file))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
49 (date (calendar-current-date)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
50 (if (and d-file (file-exists-p d-file))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
51 (if (file-readable-p d-file)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
52 (list-diary-entries
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
53 date
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
54 (cond
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
55 (arg (prefix-numeric-value arg))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
56 ((vectorp number-of-diary-entries)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
57 (aref number-of-diary-entries (calendar-day-of-week date)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
58 (t number-of-diary-entries)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
59 (error "Your diary file is not readable!"))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
60 (error "You don't have a diary file!"))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
61
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
62 (defun view-diary-entries (arg)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
63 "Prepare and display a buffer with diary entries.
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
64 Searches the file named in `diary-file' for entries that
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
65 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
66 in the displayed three-month calendar."
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
67 (interactive "p")
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
68 (let ((d-file (substitute-in-file-name diary-file)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
69 (if (and d-file (file-exists-p d-file))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
70 (if (file-readable-p d-file)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
71 (list-diary-entries (calendar-cursor-to-date t) arg)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
72 (error "Diary file is not readable!"))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
73 (error "You don't have a diary file!"))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
74
22412
6fdc14d2b071 Don't overide default value of diary-file.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents: 21957
diff changeset
75 (defun view-other-diary-entries (arg d-file)
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
76 "Prepare and display buffer of diary entries from an alternative diary file.
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
77 Prompts for a file name and searches that file for entries that match ARG
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
78 days starting with the date indicated by the cursor position in the displayed
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
79 three-month calendar."
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
80 (interactive
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
81 (list (cond ((null current-prefix-arg) 1)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
82 ((listp current-prefix-arg) (car current-prefix-arg))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
83 (t 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
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
127 (autoload 'diary-hebrew-date "cal-hebrew"
46620
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
128 "Hebrew calendar equivalent of date diary entry.")
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
129
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
130 (autoload 'diary-omer "cal-hebrew"
46620
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
131 "Omer count diary entry.")
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
132
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
133 (autoload 'diary-yahrzeit "cal-hebrew"
46620
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
134 "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
135
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
136 (autoload 'diary-parasha "cal-hebrew"
46620
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
137 "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
138
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
139 (autoload 'diary-rosh-hodesh "cal-hebrew"
46620
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
140 "Rosh Hodesh diary entry.")
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
141
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
142 (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
143 "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
144
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
145 (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
146 "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
147
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
148 (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
149 "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
150
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
151 (autoload 'diary-coptic-date "cal-coptic"
46620
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
152 "Coptic calendar equivalent of date diary entry.")
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
153
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
154 (autoload 'diary-ethiopic-date "cal-coptic"
46620
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
155 "Ethiopic calendar equivalent of date diary entry.")
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
156
15258
ab5975df6164 Change autoload references from cal-persian to cal-persia.
Karl Heuer <kwzh@gnu.org>
parents: 14954
diff changeset
157 (autoload 'diary-persian-date "cal-persia"
46620
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
158 "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
159
46620
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
160 (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
161
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
162 (autoload 'diary-sunrise-sunset "solar"
46620
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
163 "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
164
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
165 (autoload 'diary-sabbath-candles "solar"
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
166 "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
167 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
168
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
169 (defvar diary-syntax-table (copy-syntax-table (standard-syntax-table))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
170 "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
171 It is the standard syntax table used in Fundamental mode, but with the
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
172 syntax of `*' changed to be a word constituent.")
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
173
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
174 (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
175 (modify-syntax-entry ?: "w" diary-syntax-table)
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
176
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
177 (defun list-diary-entries (date number)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
178 "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
179 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
180 for NUMBER days starting with date DATE. The other entries are hidden
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
181 using selective display.
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
182
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
183 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
184 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
185 \(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
186 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
187 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
188 for a date with no diary entries.
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 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
191 `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
192 These hooks have the following distinct roles:
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
193
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
194 `nongregorian-diary-listing-hook' can cull dates from the diary
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
195 and each included file. Usually used for Hebrew or Islamic
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
196 diary entries in files. Applied to *each* file.
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
197
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
198 `list-diary-entries-hook' adds or manipulates diary entries from
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
199 external sources. Used, for example, to include diary entries
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
200 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
201 before the display hook is run.
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
202
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
203 `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
204 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
205 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
206 add-hook to set this to ignore.
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
207
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
208 `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
209 notification function."
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
210
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
211 (if (< 0 number)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
212 (let* ((original-date date);; save for possible use in the hooks
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
213 (old-diary-syntax-table)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
214 (diary-entries-list)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
215 (date-string (calendar-date-string date))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
216 (d-file (substitute-in-file-name diary-file)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
217 (message "Preparing diary...")
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
218 (save-excursion
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
219 (let ((diary-buffer (find-buffer-visiting d-file)))
16545
ff25eb6a7d11 (list-diary-entries): Reread the diary file if it has changed.
Richard M. Stallman <rms@gnu.org>
parents: 15258
diff changeset
220 (if (not diary-buffer)
ff25eb6a7d11 (list-diary-entries): Reread the diary file if it has changed.
Richard M. Stallman <rms@gnu.org>
parents: 15258
diff changeset
221 (set-buffer (find-file-noselect d-file t))
ff25eb6a7d11 (list-diary-entries): Reread the diary file if it has changed.
Richard M. Stallman <rms@gnu.org>
parents: 15258
diff changeset
222 (set-buffer diary-buffer)
ff25eb6a7d11 (list-diary-entries): Reread the diary file if it has changed.
Richard M. Stallman <rms@gnu.org>
parents: 15258
diff changeset
223 (or (verify-visited-file-modtime diary-buffer)
ff25eb6a7d11 (list-diary-entries): Reread the diary file if it has changed.
Richard M. Stallman <rms@gnu.org>
parents: 15258
diff changeset
224 (revert-buffer t t))))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
225 (setq selective-display t)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
226 (setq selective-display-ellipses nil)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
227 (setq old-diary-syntax-table (syntax-table))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
228 (set-syntax-table diary-syntax-table)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
229 (unwind-protect
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
230 (let ((buffer-read-only nil)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
231 (diary-modified (buffer-modified-p))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
232 (mark (regexp-quote diary-nonmarking-symbol)))
27918
a71031623500 (list-diary-entries): Don't try to go forward at
Gerd Moellmann <gerd@gnu.org>
parents: 27842
diff changeset
233 ;; First and last characters must be ^M or \n for
a71031623500 (list-diary-entries): Don't try to go forward at
Gerd Moellmann <gerd@gnu.org>
parents: 27842
diff changeset
234 ;; selective display to work properly
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
235 (goto-char (1- (point-max)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
236 (if (not (looking-at "\^M\\|\n"))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
237 (progn
27918
a71031623500 (list-diary-entries): Don't try to go forward at
Gerd Moellmann <gerd@gnu.org>
parents: 27842
diff changeset
238 (goto-char (point-max))
41566
82d4ad3abe8c (list-diary-entries): Use insert instead of insert-string.
Pavel Janík <Pavel@Janik.cz>
parents: 39615
diff changeset
239 (insert "\^M")))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
240 (goto-char (point-min))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
241 (if (not (looking-at "\^M\\|\n"))
41566
82d4ad3abe8c (list-diary-entries): Use insert instead of insert-string.
Pavel Janík <Pavel@Janik.cz>
parents: 39615
diff changeset
242 (insert "\^M"))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
243 (subst-char-in-region (point-min) (point-max) ?\n ?\^M t)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
244 (calendar-for-loop i from 1 to number do
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
245 (let ((d diary-date-forms)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
246 (month (extract-calendar-month date))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
247 (day (extract-calendar-day date))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
248 (year (extract-calendar-year date))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
249 (entry-found (list-sexp-diary-entries date)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
250 (while d
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
251 (let*
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
252 ((date-form (if (equal (car (car d)) 'backup)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
253 (cdr (car d))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
254 (car d)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
255 (backup (equal (car (car d)) 'backup))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
256 (dayname
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
257 (concat
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
258 (calendar-day-name date) "\\|"
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
259 (substring (calendar-day-name date) 0 3) ".?"))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
260 (monthname
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
261 (concat
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
262 "\\*\\|"
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
263 (calendar-month-name month) "\\|"
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
264 (substring (calendar-month-name month) 0 3) ".?"))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
265 (month (concat "\\*\\|0*" (int-to-string month)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
266 (day (concat "\\*\\|0*" (int-to-string day)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
267 (year
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
268 (concat
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
269 "\\*\\|0*" (int-to-string year)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
270 (if abbreviated-calendar-year
25594
2d1ef4eb8297 1999-09-07 Edward M. Reingold <reingold@emr.cs.uiuc.edu>
Dave Love <fx@gnu.org>
parents: 25155
diff changeset
271 (concat "\\|" (format "%02d" (% year 100)))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
272 "")))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
273 (regexp
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
274 (concat
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
275 "\\(\\`\\|\^M\\|\n\\)" mark "?\\("
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
276 (mapconcat 'eval date-form "\\)\\(")
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
277 "\\)"))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
278 (case-fold-search t))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
279 (goto-char (point-min))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
280 (while (re-search-forward regexp nil t)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
281 (if backup (re-search-backward "\\<" nil t))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
282 (if (and (or (char-equal (preceding-char) ?\^M)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
283 (char-equal (preceding-char) ?\n))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
284 (not (looking-at " \\|\^I")))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
285 ;; Diary entry that consists only of date.
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
286 (backward-char 1)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
287 ;; Found a nonempty diary entry--make it visible and
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
288 ;; add it to the list.
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
289 (setq entry-found t)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
290 (let ((entry-start (point))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
291 (date-start))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
292 (re-search-backward "\^M\\|\n\\|\\`")
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
293 (setq date-start (point))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
294 (re-search-forward "\^M\\|\n" nil t 2)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
295 (while (looking-at " \\|\^I")
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
296 (re-search-forward "\^M\\|\n" nil t))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
297 (backward-char 1)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
298 (subst-char-in-region date-start
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
299 (point) ?\^M ?\n t)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
300 (add-to-diary-list
20269
ca337d0a1553 (list-diary-entries, list-sexp-diary-entries, add-to-diary-list):
Karl Heuer <kwzh@gnu.org>
parents: 19324
diff changeset
301 date
43646
bcdc815ba23f (list-diary-entries): Use `buffer-substring' instead of
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 42513
diff changeset
302 (buffer-substring
20269
ca337d0a1553 (list-diary-entries, list-sexp-diary-entries, add-to-diary-list):
Karl Heuer <kwzh@gnu.org>
parents: 19324
diff changeset
303 entry-start (point))
43646
bcdc815ba23f (list-diary-entries): Use `buffer-substring' instead of
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 42513
diff changeset
304 (buffer-substring
20269
ca337d0a1553 (list-diary-entries, list-sexp-diary-entries, add-to-diary-list):
Karl Heuer <kwzh@gnu.org>
parents: 19324
diff changeset
305 (1+ date-start) (1- entry-start)))))))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
306 (setq d (cdr d)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
307 (or entry-found
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
308 (not diary-list-include-blanks)
39615
4287ce76bf9f (diary-entry-compare): When times are identical, compare the entries
Sam Steingold <sds@gnu.org>
parents: 38422
diff changeset
309 (setq diary-entries-list
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
310 (append diary-entries-list
20269
ca337d0a1553 (list-diary-entries, list-sexp-diary-entries, add-to-diary-list):
Karl Heuer <kwzh@gnu.org>
parents: 19324
diff changeset
311 (list (list date "" "")))))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
312 (setq date
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
313 (calendar-gregorian-from-absolute
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
314 (1+ (calendar-absolute-from-gregorian date))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
315 (setq entry-found nil)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
316 (set-buffer-modified-p diary-modified))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
317 (set-syntax-table old-diary-syntax-table))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
318 (goto-char (point-min))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
319 (run-hooks 'nongregorian-diary-listing-hook
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
320 'list-diary-entries-hook)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
321 (if diary-display-hook
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
322 (run-hooks 'diary-display-hook)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
323 (simple-diary-display))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
324 (run-hooks 'diary-hook)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
325 diary-entries-list))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
326
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
327 (defun include-other-diary-files ()
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
328 "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
329 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
330 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
331 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
332 #include \"filename\"
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
333 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
334 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
335 changing the variable `diary-include-string'."
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
336 (goto-char (point-min))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
337 (while (re-search-forward
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
338 (concat
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
339 "\\(\\`\\|\^M\\|\n\\)"
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
340 (regexp-quote diary-include-string)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
341 " \"\\([^\"]*\\)\"")
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
342 nil t)
27842
cfa579c1229f (include-other-diary-files): Undo the selective
Gerd Moellmann <gerd@gnu.org>
parents: 26330
diff changeset
343 (let* ((diary-file (substitute-in-file-name
cfa579c1229f (include-other-diary-files): Undo the selective
Gerd Moellmann <gerd@gnu.org>
parents: 26330
diff changeset
344 (buffer-substring-no-properties
cfa579c1229f (include-other-diary-files): Undo the selective
Gerd Moellmann <gerd@gnu.org>
parents: 26330
diff changeset
345 (match-beginning 2) (match-end 2))))
cfa579c1229f (include-other-diary-files): Undo the selective
Gerd Moellmann <gerd@gnu.org>
parents: 26330
diff changeset
346 (diary-list-include-blanks nil)
cfa579c1229f (include-other-diary-files): Undo the selective
Gerd Moellmann <gerd@gnu.org>
parents: 26330
diff changeset
347 (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
348 (diary-display-hook 'ignore)
cfa579c1229f (include-other-diary-files): Undo the selective
Gerd Moellmann <gerd@gnu.org>
parents: 26330
diff changeset
349 (diary-hook nil)
cfa579c1229f (include-other-diary-files): Undo the selective
Gerd Moellmann <gerd@gnu.org>
parents: 26330
diff changeset
350 (d-buffer (find-buffer-visiting diary-file))
cfa579c1229f (include-other-diary-files): Undo the selective
Gerd Moellmann <gerd@gnu.org>
parents: 26330
diff changeset
351 (diary-modified (if d-buffer
cfa579c1229f (include-other-diary-files): Undo the selective
Gerd Moellmann <gerd@gnu.org>
parents: 26330
diff changeset
352 (save-excursion
cfa579c1229f (include-other-diary-files): Undo the selective
Gerd Moellmann <gerd@gnu.org>
parents: 26330
diff changeset
353 (set-buffer d-buffer)
cfa579c1229f (include-other-diary-files): Undo the selective
Gerd Moellmann <gerd@gnu.org>
parents: 26330
diff changeset
354 (buffer-modified-p)))))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
355 (if (file-exists-p diary-file)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
356 (if (file-readable-p diary-file)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
357 (unwind-protect
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
358 (setq diary-entries-list
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
359 (append diary-entries-list
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
360 (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
361 (save-excursion
dc6ae1a1331c (include-other-diary-files): Fix the fix of
Gerd Moellmann <gerd@gnu.org>
parents: 27918
diff changeset
362 (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
363 (let ((inhibit-read-only t))
a3338547dad4 (include-other-diary-files): Allow modifying
Richard M. Stallman <rms@gnu.org>
parents: 43646
diff changeset
364 (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
365 (setq selective-display nil)
dc6ae1a1331c (include-other-diary-files): Fix the fix of
Gerd Moellmann <gerd@gnu.org>
parents: 27918
diff changeset
366 (set-buffer-modified-p diary-modified)))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
367 (beep)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
368 (message "Can't read included diary file %s" diary-file)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
369 (sleep-for 2))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
370 (beep)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
371 (message "Can't find included diary file %s" diary-file)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
372 (sleep-for 2))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
373 (goto-char (point-min)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
374
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
375 (defun simple-diary-display ()
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
376 "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
377 (let* ((holiday-list (if holidays-in-diary-buffer
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
378 (check-calendar-holidays original-date)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
379 (msg (format "No diary entries for %s %s"
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
380 (concat date-string (if holiday-list ":" ""))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
381 (mapconcat 'identity holiday-list "; "))))
26330
d0f895577892 (simple-diary-display): Reset modeline even if
Gerd Moellmann <gerd@gnu.org>
parents: 25594
diff changeset
382 (calendar-set-mode-line
d0f895577892 (simple-diary-display): Reset modeline even if
Gerd Moellmann <gerd@gnu.org>
parents: 25594
diff changeset
383 (concat "Diary for " date-string
d0f895577892 (simple-diary-display): Reset modeline even if
Gerd Moellmann <gerd@gnu.org>
parents: 25594
diff changeset
384 (if holiday-list ": " "")
d0f895577892 (simple-diary-display): Reset modeline even if
Gerd Moellmann <gerd@gnu.org>
parents: 25594
diff changeset
385 (mapconcat 'identity holiday-list "; ")))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
386 (if (or (not diary-entries-list)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
387 (and (not (cdr diary-entries-list))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
388 (string-equal (car (cdr (car diary-entries-list))) "")))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
389 (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
390 (message "%s" msg)
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
391 (set-buffer (get-buffer-create holiday-buffer))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
392 (setq buffer-read-only nil)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
393 (calendar-set-mode-line date-string)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
394 (erase-buffer)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
395 (insert (mapconcat 'identity holiday-list "\n"))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
396 (goto-char (point-min))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
397 (set-buffer-modified-p nil)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
398 (setq buffer-read-only t)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
399 (display-buffer holiday-buffer)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
400 (message "No diary entries for %s" date-string))
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
401 (display-buffer (find-buffer-visiting d-file))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
402 (message "Preparing diary...done"))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
403
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
404 (defun fancy-diary-display ()
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
405 "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
406 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
407 (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
408 (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
409 (let ((diary-modified (buffer-modified-p)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
410 (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
411 (setq selective-display nil)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
412 (kill-local-variable 'mode-line-format)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
413 (set-buffer-modified-p diary-modified)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
414 (if (or (not diary-entries-list)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
415 (and (not (cdr diary-entries-list))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
416 (string-equal (car (cdr (car diary-entries-list))) "")))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
417 (let* ((holiday-list (if holidays-in-diary-buffer
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
418 (check-calendar-holidays original-date)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
419 (msg (format "No diary entries for %s %s"
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
420 (concat date-string (if holiday-list ":" ""))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
421 (mapconcat 'identity holiday-list "; "))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
422 (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
423 (message "%s" msg)
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
424 (set-buffer (get-buffer-create holiday-buffer))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
425 (setq buffer-read-only nil)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
426 (calendar-set-mode-line date-string)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
427 (erase-buffer)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
428 (insert (mapconcat 'identity holiday-list "\n"))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
429 (goto-char (point-min))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
430 (set-buffer-modified-p nil)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
431 (setq buffer-read-only t)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
432 (display-buffer holiday-buffer)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
433 (message "No diary entries for %s" date-string)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
434 (save-excursion;; Prepare the fancy diary buffer.
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
435 (set-buffer (make-fancy-diary-buffer))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
436 (setq buffer-read-only nil)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
437 (let ((entry-list diary-entries-list)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
438 (holiday-list)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
439 (holiday-list-last-month 1)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
440 (holiday-list-last-year 1)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
441 (date (list 0 0 0)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
442 (while entry-list
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
443 (if (not (calendar-date-equal date (car (car entry-list))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
444 (progn
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
445 (setq date (car (car entry-list)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
446 (and holidays-in-diary-buffer
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
447 (calendar-date-compare
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
448 (list (list holiday-list-last-month
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
449 (calendar-last-day-of-month
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
450 holiday-list-last-month
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
451 holiday-list-last-year)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
452 holiday-list-last-year))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
453 (list date))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
454 ;; 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
455 (setq holiday-list-last-month
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
456 (extract-calendar-month date))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
457 (setq holiday-list-last-year
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
458 (extract-calendar-year date))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
459 (increment-calendar-month
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
460 holiday-list-last-month holiday-list-last-year 1)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
461 (setq holiday-list
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
462 (let ((displayed-month holiday-list-last-month)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
463 (displayed-year holiday-list-last-year))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
464 (calendar-holiday-list)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
465 (increment-calendar-month
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
466 holiday-list-last-month holiday-list-last-year 1))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
467 (let* ((date-string (calendar-date-string date))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
468 (date-holiday-list
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
469 (let ((h holiday-list)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
470 (d))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
471 ;; Make a list of all holidays for date.
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
472 (while h
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
473 (if (calendar-date-equal date (car (car h)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
474 (setq d (append d (cdr (car h)))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
475 (setq h (cdr h)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
476 d)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
477 (insert (if (= (point) (point-min)) "" ?\n) date-string)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
478 (if date-holiday-list (insert ": "))
14954
a9102c34a5b6 Fix length of separator string.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents: 14687
diff changeset
479 (let* ((l (current-column))
a9102c34a5b6 Fix length of separator string.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents: 14687
diff changeset
480 (longest 0))
28615
4c6883cb70ab (fancy-diary-display, mark-diary-entries)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28575
diff changeset
481 (insert (mapconcat (lambda (x)
4c6883cb70ab (fancy-diary-display, mark-diary-entries)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28575
diff changeset
482 (if (< longest (length x))
4c6883cb70ab (fancy-diary-display, mark-diary-entries)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28575
diff changeset
483 (setq longest (length x)))
4c6883cb70ab (fancy-diary-display, mark-diary-entries)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28575
diff changeset
484 x)
14954
a9102c34a5b6 Fix length of separator string.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents: 14687
diff changeset
485 date-holiday-list
a9102c34a5b6 Fix length of separator string.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents: 14687
diff changeset
486 (concat "\n" (make-string l ? ))))
a9102c34a5b6 Fix length of separator string.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents: 14687
diff changeset
487 (insert ?\n (make-string (+ l longest) ?=) ?\n)))))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
488 (if (< 0 (length (car (cdr (car entry-list)))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
489 (insert (car (cdr (car entry-list))) ?\n))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
490 (setq entry-list (cdr entry-list))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
491 (set-buffer-modified-p nil)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
492 (goto-char (point-min))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
493 (setq buffer-read-only t)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
494 (display-buffer fancy-diary-buffer)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
495 (message "Preparing diary...done"))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
496
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
497 (defun make-fancy-diary-buffer ()
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
498 "Create and return the initial fancy diary buffer."
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
499 (save-excursion
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
500 (set-buffer (get-buffer-create fancy-diary-buffer))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
501 (setq buffer-read-only nil)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
502 (make-local-variable 'mode-line-format)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
503 (calendar-set-mode-line "Diary Entries")
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
504 (erase-buffer)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
505 (set-buffer-modified-p nil)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
506 (setq buffer-read-only t)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
507 (get-buffer fancy-diary-buffer)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
508
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
509 (defun print-diary-entries ()
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
510 "Print a hard copy of the diary display.
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
511
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
512 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
513 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
514 line, print the temp buffer, and destroy it.
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
515
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
516 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
517
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
518 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
519 the actual printing."
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
520 (interactive)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
521 (if (bufferp (get-buffer fancy-diary-buffer))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
522 (save-excursion
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
523 (set-buffer (get-buffer fancy-diary-buffer))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
524 (run-hooks 'print-diary-entries-hook))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
525 (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
526 (find-buffer-visiting (substitute-in-file-name diary-file))))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
527 (if diary-buffer
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
528 (let ((temp-buffer (get-buffer-create "*Printable Diary Entries*"))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
529 (heading))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
530 (save-excursion
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
531 (set-buffer diary-buffer)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
532 (setq heading
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
533 (if (not (stringp mode-line-format))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
534 "All Diary Entries"
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
535 (string-match "^-*\\([^-].*[^-]\\)-*$" mode-line-format)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
536 (substring mode-line-format
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
537 (match-beginning 1) (match-end 1))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
538 (copy-to-buffer temp-buffer (point-min) (point-max))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
539 (set-buffer temp-buffer)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
540 (while (re-search-forward "\^M.*$" nil t)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
541 (replace-match ""))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
542 (goto-char (point-min))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
543 (insert heading "\n"
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
544 (make-string (length heading) ?=) "\n")
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
545 (run-hooks 'print-diary-entries-hook)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
546 (kill-buffer temp-buffer)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
547 (error "You don't have a diary buffer!")))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
548
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
549 (defun show-all-diary-entries ()
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
550 "Show all of the diary entries in the diary file.
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
551 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
552 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
553 is created."
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
554 (interactive)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
555 (let ((d-file (substitute-in-file-name diary-file)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
556 (if (and d-file (file-exists-p d-file))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
557 (if (file-readable-p d-file)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
558 (save-excursion
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
559 (let ((diary-buffer (find-buffer-visiting d-file)))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
560 (set-buffer (if diary-buffer
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
561 diary-buffer
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
562 (find-file-noselect d-file t)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
563 (let ((buffer-read-only nil)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
564 (diary-modified (buffer-modified-p)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
565 (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
566 (setq selective-display nil)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
567 (make-local-variable 'mode-line-format)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
568 (setq mode-line-format default-mode-line-format)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
569 (display-buffer (current-buffer))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
570 (set-buffer-modified-p diary-modified))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
571 (error "Your diary file is not readable!"))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
572 (error "You don't have a diary file!"))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
573
20345
69818ee01344 (diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 20269
diff changeset
574
69818ee01344 (diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 20269
diff changeset
575
39615
4287ce76bf9f (diary-entry-compare): When times are identical, compare the entries
Sam Steingold <sds@gnu.org>
parents: 38422
diff changeset
576 (defcustom diary-mail-addr
20345
69818ee01344 (diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 20269
diff changeset
577 (if (boundp 'user-mail-address) user-mail-address nil)
69818ee01344 (diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 20269
diff changeset
578 "*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
579 :group 'diary
22683
0941a5743283 (diary-mail-addr): Fix custom type.
Richard M. Stallman <rms@gnu.org>
parents: 22638
diff changeset
580 :type '(choice string (const nil))
21668
621dd51298ec *** empty log message ***
Dan Nicolaescu <done@ece.arizona.edu>
parents: 20354
diff changeset
581 :version "20.3")
20345
69818ee01344 (diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 20269
diff changeset
582
69818ee01344 (diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 20269
diff changeset
583 (defcustom diary-mail-days 7
69818ee01344 (diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 20269
diff changeset
584 "*Number of days for `diary-mail-entries' to check."
69818ee01344 (diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 20269
diff changeset
585 :group 'diary
21668
621dd51298ec *** empty log message ***
Dan Nicolaescu <done@ece.arizona.edu>
parents: 20354
diff changeset
586 :type 'integer
621dd51298ec *** empty log message ***
Dan Nicolaescu <done@ece.arizona.edu>
parents: 20354
diff changeset
587 :version "20.3")
20345
69818ee01344 (diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 20269
diff changeset
588
21957
a74e1cee89bf (diary-mail-entries): Add autoload cookie.
Richard M. Stallman <rms@gnu.org>
parents: 21893
diff changeset
589 ;;;###autoload
20345
69818ee01344 (diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 20269
diff changeset
590 (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
591 "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
592 If no prefix argument is given, NDAYS is set to `diary-mail-days'.
69818ee01344 (diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 20269
diff changeset
593
69818ee01344 (diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 20269
diff changeset
594 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
595 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
596 `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
597 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
598
69818ee01344 (diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 20269
diff changeset
599 #!/bin/sh
69818ee01344 (diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 20269
diff changeset
600 # 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
601 emacs -batch \\
69818ee01344 (diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 20269
diff changeset
602 -eval \"(setq diary-mail-days 3 \\
69818ee01344 (diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 20269
diff changeset
603 european-calendar-style t \\
69818ee01344 (diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 20269
diff changeset
604 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
605 -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
606 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
607
69818ee01344 (diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 20269
diff changeset
608 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
609 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
610 0 1 * * * diary-rem.sh
69818ee01344 (diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 20269
diff changeset
611 to run it every morning at 1am."
35500
38b437f4134e (diary-float): Fix case of MONTH
Gerd Moellmann <gerd@gnu.org>
parents: 34036
diff changeset
612 (interactive "P")
38b437f4134e (diary-float): Fix case of MONTH
Gerd Moellmann <gerd@gnu.org>
parents: 34036
diff changeset
613 (let* ((diary-display-hook 'fancy-diary-display)
38b437f4134e (diary-float): Fix case of MONTH
Gerd Moellmann <gerd@gnu.org>
parents: 34036
diff changeset
614 (diary-list-include-blanks t)
38b437f4134e (diary-float): Fix case of MONTH
Gerd Moellmann <gerd@gnu.org>
parents: 34036
diff changeset
615 (text (progn (list-diary-entries (calendar-current-date)
38b437f4134e (diary-float): Fix case of MONTH
Gerd Moellmann <gerd@gnu.org>
parents: 34036
diff changeset
616 (if ndays ndays diary-mail-days))
38b437f4134e (diary-float): Fix case of MONTH
Gerd Moellmann <gerd@gnu.org>
parents: 34036
diff changeset
617 (set-buffer fancy-diary-buffer)
38b437f4134e (diary-float): Fix case of MONTH
Gerd Moellmann <gerd@gnu.org>
parents: 34036
diff changeset
618 (buffer-substring (point-min) (point-max)))))
38b437f4134e (diary-float): Fix case of MONTH
Gerd Moellmann <gerd@gnu.org>
parents: 34036
diff changeset
619 (mail)
38b437f4134e (diary-float): Fix case of MONTH
Gerd Moellmann <gerd@gnu.org>
parents: 34036
diff changeset
620 (mail-to) (insert diary-mail-addr)
38b437f4134e (diary-float): Fix case of MONTH
Gerd Moellmann <gerd@gnu.org>
parents: 34036
diff changeset
621 (mail-subject) (insert "Diary entries generated "
38b437f4134e (diary-float): Fix case of MONTH
Gerd Moellmann <gerd@gnu.org>
parents: 34036
diff changeset
622 (calendar-date-string (calendar-current-date)))
38b437f4134e (diary-float): Fix case of MONTH
Gerd Moellmann <gerd@gnu.org>
parents: 34036
diff changeset
623 (mail-text) (insert text)
38b437f4134e (diary-float): Fix case of MONTH
Gerd Moellmann <gerd@gnu.org>
parents: 34036
diff changeset
624 (mail-send-and-exit nil)))
20345
69818ee01344 (diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 20269
diff changeset
625
69818ee01344 (diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 20269
diff changeset
626
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
627 (defun diary-name-pattern (string-array &optional fullname)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
628 "Convert an STRING-ARRAY, an array of strings to a pattern.
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
629 The pattern will match any of the strings, either entirely or abbreviated
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
630 to three characters. An abbreviated form will match with or without a period;
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
631 If the optional FULLNAME is t, abbreviations will not match, just the full
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
632 name."
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
633 (let ((pattern ""))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
634 (calendar-for-loop i from 0 to (1- (length string-array)) do
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
635 (setq pattern
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
636 (concat
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
637 pattern
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
638 (if (string-equal pattern "") "" "\\|")
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
639 (aref string-array i)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
640 (if fullname
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
641 ""
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
642 (concat
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
643 "\\|"
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
644 (substring (aref string-array i) 0 3) ".?")))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
645 pattern))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
646
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
647 (defvar marking-diary-entries nil
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
648 "True during the marking of diary entries, nil otherwise.")
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
649
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
650 (defvar marking-diary-entry nil
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
651 "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
652
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
653 (defun mark-diary-entries ()
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
654 "Mark days in the calendar window that have diary entries.
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
655 Each entry in the diary file visible in the calendar window is marked.
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
656 After the entries are marked, the hooks `nongregorian-diary-marking-hook' and
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
657 `mark-diary-entries-hook' are run."
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
658 (interactive)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
659 (setq mark-diary-entries-in-calendar t)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
660 (let ((d-file (substitute-in-file-name diary-file))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
661 (marking-diary-entries t))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
662 (if (and d-file (file-exists-p d-file))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
663 (if (file-readable-p d-file)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
664 (save-excursion
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
665 (message "Marking diary entries...")
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
666 (set-buffer (find-file-noselect d-file t))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
667 (let ((d diary-date-forms)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
668 (old-diary-syntax-table))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
669 (setq old-diary-syntax-table (syntax-table))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
670 (set-syntax-table diary-syntax-table)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
671 (while d
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
672 (let*
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
673 ((date-form (if (equal (car (car d)) 'backup)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
674 (cdr (car d))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
675 (car d)));; ignore 'backup directive
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
676 (dayname (diary-name-pattern calendar-day-name-array))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
677 (monthname
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
678 (concat
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
679 (diary-name-pattern calendar-month-name-array)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
680 "\\|\\*"))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
681 (month "[0-9]+\\|\\*")
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
682 (day "[0-9]+\\|\\*")
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
683 (year "[0-9]+\\|\\*")
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
684 (l (length date-form))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
685 (d-name-pos (- l (length (memq 'dayname date-form))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
686 (d-name-pos (if (/= l d-name-pos) (+ 2 d-name-pos)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
687 (m-name-pos (- l (length (memq 'monthname date-form))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
688 (m-name-pos (if (/= l m-name-pos) (+ 2 m-name-pos)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
689 (d-pos (- l (length (memq 'day date-form))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
690 (d-pos (if (/= l d-pos) (+ 2 d-pos)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
691 (m-pos (- l (length (memq 'month date-form))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
692 (m-pos (if (/= l m-pos) (+ 2 m-pos)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
693 (y-pos (- l (length (memq 'year date-form))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
694 (y-pos (if (/= l y-pos) (+ 2 y-pos)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
695 (regexp
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
696 (concat
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
697 "\\(\\`\\|\^M\\|\n\\)\\("
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
698 (mapconcat 'eval date-form "\\)\\(")
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
699 "\\)"))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
700 (case-fold-search t))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
701 (goto-char (point-min))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
702 (while (re-search-forward regexp nil t)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
703 (let* ((dd-name
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
704 (if d-name-pos
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
705 (buffer-substring-no-properties
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
706 (match-beginning d-name-pos)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
707 (match-end d-name-pos))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
708 (mm-name
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
709 (if m-name-pos
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
710 (buffer-substring-no-properties
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
711 (match-beginning m-name-pos)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
712 (match-end m-name-pos))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
713 (mm (string-to-int
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
714 (if m-pos
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
715 (buffer-substring-no-properties
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
716 (match-beginning m-pos)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
717 (match-end m-pos))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
718 "")))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
719 (dd (string-to-int
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
720 (if d-pos
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
721 (buffer-substring-no-properties
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
722 (match-beginning d-pos)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
723 (match-end d-pos))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
724 "")))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
725 (y-str (if y-pos
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
726 (buffer-substring-no-properties
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
727 (match-beginning y-pos)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
728 (match-end y-pos))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
729 (yy (if (not y-str)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
730 0
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
731 (if (and (= (length y-str) 2)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
732 abbreviated-calendar-year)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
733 (let* ((current-y
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
734 (extract-calendar-year
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
735 (calendar-current-date)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
736 (y (+ (string-to-int y-str)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
737 (* 100
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
738 (/ current-y 100)))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
739 (if (> (- y current-y) 50)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
740 (- y 100)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
741 (if (> (- current-y y) 50)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
742 (+ y 100)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
743 y)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
744 (string-to-int y-str)))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
745 (if dd-name
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
746 (mark-calendar-days-named
24192
1baa5a4968b2 (mark-diary-entries): Use assoc-ignore-case and do not capitalize when
Richard M. Stallman <rms@gnu.org>
parents: 23998
diff changeset
747 (cdr (assoc-ignore-case
1baa5a4968b2 (mark-diary-entries): Use assoc-ignore-case and do not capitalize when
Richard M. Stallman <rms@gnu.org>
parents: 23998
diff changeset
748 (substring dd-name 0 3)
1baa5a4968b2 (mark-diary-entries): Use assoc-ignore-case and do not capitalize when
Richard M. Stallman <rms@gnu.org>
parents: 23998
diff changeset
749 (calendar-make-alist
1baa5a4968b2 (mark-diary-entries): Use assoc-ignore-case and do not capitalize when
Richard M. Stallman <rms@gnu.org>
parents: 23998
diff changeset
750 calendar-day-name-array
1baa5a4968b2 (mark-diary-entries): Use assoc-ignore-case and do not capitalize when
Richard M. Stallman <rms@gnu.org>
parents: 23998
diff changeset
751 0
28615
4c6883cb70ab (fancy-diary-display, mark-diary-entries)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28575
diff changeset
752 (lambda (x) (substring x 0 3))))))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
753 (if mm-name
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
754 (if (string-equal mm-name "*")
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
755 (setq mm 0)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
756 (setq mm
24192
1baa5a4968b2 (mark-diary-entries): Use assoc-ignore-case and do not capitalize when
Richard M. Stallman <rms@gnu.org>
parents: 23998
diff changeset
757 (cdr (assoc-ignore-case
1baa5a4968b2 (mark-diary-entries): Use assoc-ignore-case and do not capitalize when
Richard M. Stallman <rms@gnu.org>
parents: 23998
diff changeset
758 (substring mm-name 0 3)
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
759 (calendar-make-alist
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
760 calendar-month-name-array
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
761 1
28615
4c6883cb70ab (fancy-diary-display, mark-diary-entries)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28575
diff changeset
762 (lambda (x) (substring x 0 3)))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
763 )))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
764 (mark-calendar-date-pattern mm dd yy))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
765 (setq d (cdr d))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
766 (mark-sexp-diary-entries)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
767 (run-hooks 'nongregorian-diary-marking-hook
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
768 'mark-diary-entries-hook)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
769 (set-syntax-table old-diary-syntax-table)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
770 (message "Marking diary entries...done")))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
771 (error "Your diary file is not readable!"))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
772 (error "You don't have a diary file!"))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
773
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
774 (defun mark-sexp-diary-entries ()
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
775 "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
776 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
777 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
778 (let* ((sexp-mark (regexp-quote sexp-diary-entry-symbol))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
779 (s-entry (concat "\\(\\`\\|\^M\\|\n\\)\\("
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
780 (regexp-quote sexp-mark) "(\\)\\|\\("
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
781 (regexp-quote diary-nonmarking-symbol)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
782 (regexp-quote sexp-mark) "(diary-remind\\)"))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
783 (m)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
784 (y)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
785 (first-date)
46620
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
786 (last-date)
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
787 (mark))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
788 (save-excursion
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
789 (set-buffer calendar-buffer)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
790 (setq m displayed-month)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
791 (setq y displayed-year))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
792 (increment-calendar-month m y -1)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
793 (setq first-date
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
794 (calendar-absolute-from-gregorian (list m 1 y)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
795 (increment-calendar-month m y 2)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
796 (setq last-date
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
797 (calendar-absolute-from-gregorian
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
798 (list m (calendar-last-day-of-month m y) y)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
799 (goto-char (point-min))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
800 (while (re-search-forward s-entry nil t)
13075
8a67628f4574 (mark-sexp-diary-entries): Add \ for C-M-f's sake.
Richard M. Stallman <rms@gnu.org>
parents: 13053
diff changeset
801 (if (char-equal (preceding-char) ?\()
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
802 (setq marking-diary-entry t)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
803 (setq marking-diary-entry nil))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
804 (re-search-backward "(")
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
805 (let ((sexp-start (point))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
806 (sexp)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
807 (entry)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
808 (entry-start)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
809 (line-start))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
810 (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
811 (setq sexp (buffer-substring-no-properties sexp-start (point)))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
812 (save-excursion
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
813 (re-search-backward "\^M\\|\n\\|\\`")
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
814 (setq line-start (point)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
815 (forward-char 1)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
816 (if (and (or (char-equal (preceding-char) ?\^M)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
817 (char-equal (preceding-char) ?\n))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
818 (not (looking-at " \\|\^I")))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
819 (progn;; Diary entry consists only of the sexp
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
820 (backward-char 1)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
821 (setq entry ""))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
822 (setq entry-start (point))
23247
1f91824c4087 (mark-sexp-diary-entries): Fix previous chg.
Karl Heuer <kwzh@gnu.org>
parents: 23232
diff changeset
823 ;; Find end of entry
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
824 (re-search-forward "\^M\\|\n" nil t)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
825 (while (looking-at " \\|\^I")
23232
97332957a969 (mark-sexp-diary-entries): Avoid infinite loop when
Karl Heuer <kwzh@gnu.org>
parents: 23122
diff changeset
826 (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
827 (re-search-forward "$" nil t)))
23247
1f91824c4087 (mark-sexp-diary-entries): Fix previous chg.
Karl Heuer <kwzh@gnu.org>
parents: 23232
diff changeset
828 (if (or (char-equal (preceding-char) ?\^M)
1f91824c4087 (mark-sexp-diary-entries): Fix previous chg.
Karl Heuer <kwzh@gnu.org>
parents: 23232
diff changeset
829 (char-equal (preceding-char) ?\n))
1f91824c4087 (mark-sexp-diary-entries): Fix previous chg.
Karl Heuer <kwzh@gnu.org>
parents: 23232
diff changeset
830 (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
831 (setq entry (buffer-substring-no-properties entry-start (point)))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
832 (while (string-match "[\^M]" entry)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
833 (aset entry (match-beginning 0) ?\n )))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
834 (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
835 (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
836 (calendar-gregorian-from-absolute date)))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
837 (mark-visible-calendar-date
46620
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
838 (calendar-gregorian-from-absolute date)
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
839 (if (consp mark)
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
840 (car mark)))))))))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
841
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
842 (defun mark-included-diary-files ()
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
843 "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
844 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
845 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
846 specified in the diary-file by lines of this form:
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
847 #include \"filename\"
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
848 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
849 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
850 changing the variable `diary-include-string'."
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
851 (goto-char (point-min))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
852 (while (re-search-forward
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
853 (concat
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
854 "\\(\\`\\|\^M\\|\n\\)"
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
855 (regexp-quote diary-include-string)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
856 " \"\\([^\"]*\\)\"")
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
857 nil t)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
858 (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
859 (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
860 (match-beginning 2) (match-end 2))))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
861 (mark-diary-entries-hook 'mark-included-diary-files))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
862 (if (file-exists-p diary-file)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
863 (if (file-readable-p diary-file)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
864 (progn
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
865 (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
866 (kill-buffer (find-buffer-visiting diary-file)))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
867 (beep)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
868 (message "Can't read included diary file %s" diary-file)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
869 (sleep-for 2))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
870 (beep)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
871 (message "Can't find included diary file %s" diary-file)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
872 (sleep-for 2))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
873 (goto-char (point-min)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
874
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
875 (defun mark-calendar-days-named (dayname)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
876 "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
877 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
878 (save-excursion
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
879 (set-buffer calendar-buffer)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
880 (let ((prev-month displayed-month)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
881 (prev-year displayed-year)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
882 (succ-month displayed-month)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
883 (succ-year displayed-year)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
884 (last-day)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
885 (day))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
886 (increment-calendar-month succ-month succ-year 1)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
887 (increment-calendar-month prev-month prev-year -1)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
888 (setq day (calendar-absolute-from-gregorian
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
889 (calendar-nth-named-day 1 dayname prev-month prev-year)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
890 (setq last-day (calendar-absolute-from-gregorian
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
891 (calendar-nth-named-day -1 dayname succ-month succ-year)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
892 (while (<= day last-day)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
893 (mark-visible-calendar-date (calendar-gregorian-from-absolute day))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
894 (setq day (+ day 7))))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
895
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
896 (defun mark-calendar-date-pattern (month day year)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
897 "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
898 A value of 0 in any position is a wildcard."
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
899 (save-excursion
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
900 (set-buffer calendar-buffer)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
901 (let ((m displayed-month)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
902 (y displayed-year))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
903 (increment-calendar-month m y -1)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
904 (calendar-for-loop i from 0 to 2 do
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
905 (mark-calendar-month m y month day year)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
906 (increment-calendar-month m y 1)))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
907
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
908 (defun mark-calendar-month (month year p-month p-day p-year)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
909 "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
910 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
911 (if (or (and (= month p-month)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
912 (or (= p-year 0) (= year p-year)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
913 (and (= p-month 0)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
914 (or (= p-year 0) (= year p-year))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
915 (if (= p-day 0)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
916 (calendar-for-loop
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
917 i from 1 to (calendar-last-day-of-month month year) do
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
918 (mark-visible-calendar-date (list month i year)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
919 (mark-visible-calendar-date (list month p-day year)))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
920
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
921 (defun sort-diary-entries ()
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
922 "Sort the list of diary entries by time of day."
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
923 (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
924
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
925 (defun diary-entry-compare (e1 e2)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
926 "Returns t if E1 is earlier than E2."
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
927 (or (calendar-date-compare e1 e2)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
928 (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
929 (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
930 (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
931 (or (< t1 t2)
4287ce76bf9f (diary-entry-compare): When times are identical, compare the entries
Sam Steingold <sds@gnu.org>
parents: 38422
diff changeset
932 (and (= t1 t2)
4287ce76bf9f (diary-entry-compare): When times are identical, compare the entries
Sam Steingold <sds@gnu.org>
parents: 38422
diff changeset
933 (string-lessp ts1 ts2)))))))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
934
20269
ca337d0a1553 (list-diary-entries, list-sexp-diary-entries, add-to-diary-list):
Karl Heuer <kwzh@gnu.org>
parents: 19324
diff changeset
935 (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
936 -9999
ca337d0a1553 (list-diary-entries, list-sexp-diary-entries, add-to-diary-list):
Karl Heuer <kwzh@gnu.org>
parents: 19324
diff changeset
937 "*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
938 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
939 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
940 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
941 :type 'integer
21669
9861518505cb *** empty log message ***
Dan Nicolaescu <done@ece.arizona.edu>
parents: 21668
diff changeset
942 :group 'diary
9861518505cb *** empty log message ***
Dan Nicolaescu <done@ece.arizona.edu>
parents: 21668
diff changeset
943 :version "20.3")
39615
4287ce76bf9f (diary-entry-compare): When times are identical, compare the entries
Sam Steingold <sds@gnu.org>
parents: 38422
diff changeset
944
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
945 (defun diary-entry-time (s)
46620
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
946 "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
947 For example, returns 1325 for 1:25pm.
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
948 Returns `diary-unknown-time' (default value -9999) if no time is recognized. The recognized forms are XXXX, X:XX, or
20269
ca337d0a1553 (list-diary-entries, list-sexp-diary-entries, add-to-diary-list):
Karl Heuer <kwzh@gnu.org>
parents: 19324
diff changeset
949 XX:XX (military time), and XXam, XXAM, XXpm, XXPM, XX:XXam, XX:XXAM XX:XXpm,
ca337d0a1553 (list-diary-entries, list-sexp-diary-entries, add-to-diary-list):
Karl Heuer <kwzh@gnu.org>
parents: 19324
diff changeset
950 or XX:XXPM."
19324
02a8fe146fa6 (diary-entry-time): Bind case-fold-search to nil.
Richard M. Stallman <rms@gnu.org>
parents: 18922
diff changeset
951 (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
952 (cond ((string-match ; Military time
34036
c2a8edb5b5ec (diary-entry-time): Anchor pattern correctly
Gerd Moellmann <gerd@gnu.org>
parents: 32415
diff changeset
953 "\\`[ \t\n\\^M]*\\([0-9]?[0-9]\\):?\\([0-9][0-9]\\)\\(\\>\\|[^ap]\\)" s)
19324
02a8fe146fa6 (diary-entry-time): Bind case-fold-search to nil.
Richard M. Stallman <rms@gnu.org>
parents: 18922
diff changeset
954 (+ (* 100 (string-to-int
02a8fe146fa6 (diary-entry-time): Bind case-fold-search to nil.
Richard M. Stallman <rms@gnu.org>
parents: 18922
diff changeset
955 (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
956 (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
957 ((string-match ; Hour only XXam or XXpm
34036
c2a8edb5b5ec (diary-entry-time): Anchor pattern correctly
Gerd Moellmann <gerd@gnu.org>
parents: 32415
diff changeset
958 "\\`[ \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
959 (+ (* 100 (% (string-to-int
02a8fe146fa6 (diary-entry-time): Bind case-fold-search to nil.
Richard M. Stallman <rms@gnu.org>
parents: 18922
diff changeset
960 (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
961 12))
02a8fe146fa6 (diary-entry-time): Bind case-fold-search to nil.
Richard M. Stallman <rms@gnu.org>
parents: 18922
diff changeset
962 (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
963 0 1200)))
39615
4287ce76bf9f (diary-entry-compare): When times are identical, compare the entries
Sam Steingold <sds@gnu.org>
parents: 38422
diff changeset
964 ((string-match ; Hour and minute XX:XXam or XX:XXpm
34036
c2a8edb5b5ec (diary-entry-time): Anchor pattern correctly
Gerd Moellmann <gerd@gnu.org>
parents: 32415
diff changeset
965 "\\`[ \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
966 (+ (* 100 (% (string-to-int
02a8fe146fa6 (diary-entry-time): Bind case-fold-search to nil.
Richard M. Stallman <rms@gnu.org>
parents: 18922
diff changeset
967 (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
968 12))
02a8fe146fa6 (diary-entry-time): Bind case-fold-search to nil.
Richard M. Stallman <rms@gnu.org>
parents: 18922
diff changeset
969 (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
970 (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
971 0 1200)))
39615
4287ce76bf9f (diary-entry-compare): When times are identical, compare the entries
Sam Steingold <sds@gnu.org>
parents: 38422
diff changeset
972 (t diary-unknown-time)))) ; Unrecognizable
34036
c2a8edb5b5ec (diary-entry-time): Anchor pattern correctly
Gerd Moellmann <gerd@gnu.org>
parents: 32415
diff changeset
973
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
974 (defun list-sexp-diary-entries (date)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
975 "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
976 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
977 found.
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
978
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
979 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
980 `%%'). The form of a sexp diary entry is
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
981
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
982 %%(SEXP) ENTRY
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
983
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
984 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
985 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
986 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
987 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
988
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
989 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
990 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
991
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
992 &%%(let ((dayname (calendar-day-of-week date))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
993 (day (extract-calendar-day date)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
994 (or
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
995 (and (= day 21) (memq dayname '(1 2 3 4 5)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
996 (and (memq day '(19 20)) (= dayname 5)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
997 ) UIUC pay checks deposited
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
998
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
999 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
1000
46620
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
1001 %%(diary-date MONTH DAY YEAR &optional MARK) text
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1002 Entry applies if date is MONTH, DAY, YEAR if
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1003 `european-calendar-style' is nil, and DAY, MONTH, YEAR if
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1004 `european-calendar-style' is t. DAY, MONTH, and YEAR
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1005 can be lists of integers, the constant t, or an integer.
46620
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
1006 The constant t means all values. An optional parameter
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
1007 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
1008 when highlighting the day in the calendar.
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1009
46620
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
1010 %%(diary-float MONTH DAYNAME N &optional DAY MARK) text
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1011 Entry will appear on the Nth DAYNAME of MONTH.
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1012 (DAYNAME=0 means Sunday, 1 means Monday, and so on;
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1013 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
1014 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
1015 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
1016 Nth DAYNAME of MONTH on or after/before DAY. DAY defaults
46620
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
1017 to 1 if N>0 and the last day of the month if N<0. An
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
1018 optional parameter MARK specifies a face or single-character
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
1019 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
1020
46620
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
1021 %%(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
1022 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
1023 inclusive. (If `european-calendar-style' is t, the
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1024 order of the parameters should be changed to D1, M1, Y1,
46620
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
1025 D2, M2, Y2.) An optional parameter MARK specifies a face
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
1026 or single-character string to use when highlighting the
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
1027 day in the calendar.
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1028
46620
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
1029 %%(diary-anniversary MONTH DAY YEAR &optional MARK) text
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1030 Entry will appear on anniversary dates of MONTH DAY, YEAR.
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1031 (If `european-calendar-style' is t, the order of the
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1032 parameters should be changed to DAY, MONTH, YEAR.) Text
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1033 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
1034 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
1035 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
1036 `rd' or `th', as appropriate. The anniversary of February
46620
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
1037 29 is considered to be March 1 in a non-leap year. An
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
1038 optional parameter MARK specifies a face or single-character
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
1039 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
1040
46620
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
1041 %%(diary-cyclic N MONTH DAY YEAR &optional MARK) text
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1042 Entry will appear every N days, starting MONTH DAY, YEAR.
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1043 (If `european-calendar-style' is t, the order of the
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1044 parameters should be changed to N, DAY, MONTH, YEAR.) Text
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1045 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
1046 of repetitions since the MONTH DAY, YEAR and %s will
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1047 be replaced by the ordinal ending of that number (that is,
46620
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
1048 `st', `nd', `rd' or `th', as appropriate. An optional
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
1049 parameter MARK specifies a face or single-character string
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
1050 to use when highlighting the day in the calendar.
13053
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 %%(diary-remind SEXP DAYS &optional MARKING) text
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1053 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
1054 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
1055 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
1056 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
1057 indicated by EXPR, then a suitable message (as specified
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1058 by `diary-remind-message') appears. In addition to the
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1059 reminders beforehand, the diary entry also appears on
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1060 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
1061 *reminders* are marked on the calendar. Marking of
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1062 reminders is independent of whether the entry *itself* is
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1063 a marking or nonmarking one.
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1064
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1065 %%(diary-day-of-year)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1066 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
1067 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
1068 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
1069 fancy diary display is used.
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1070
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1071 %%(diary-iso-date)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1072 Diary entries giving the corresponding ISO commercial date
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1073 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
1074 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
1075
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1076 %%(diary-french-date)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1077 Diary entries giving the corresponding French Revolutionary
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1078 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
1079 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
1080
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1081 %%(diary-islamic-date)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1082 Diary entries giving the corresponding Islamic date will be
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1083 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
1084 makes sense only if the fancy diary display is used.
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1085
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1086 %%(diary-hebrew-date)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1087 Diary entries giving the corresponding Hebrew date will be
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1088 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
1089 makes sense only if the fancy diary display is used.
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1090
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1091 %%(diary-astro-day-number) Diary entries giving the corresponding
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1092 astronomical (Julian) day number will be made every day.
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1093 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
1094 fancy diary display is used.
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1095
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1096 %%(diary-julian-date) Diary entries giving the corresponding
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1097 Julian date will be made every day. Note that since
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1098 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
1099 display is used.
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1100
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1101 %%(diary-sunrise-sunset)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1102 Diary entries giving the local times of sunrise and sunset
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1103 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
1104 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
1105 Floating point required.
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1106
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1107 %%(diary-phases-of-moon)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1108 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
1109 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
1110 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
1111 Floating point required.
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1112
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1113 %%(diary-yahrzeit MONTH DAY YEAR) text
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1114 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
1115 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
1116 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
1117 day before. (If `european-calendar-style' is t, the order
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1118 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
1119
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1120 %%(diary-rosh-hodesh)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1121 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
1122 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
1123 makes sense only if the fancy diary display is used.
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1124
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1125 %%(diary-parasha)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1126 Diary entries giving the weekly parasha will be made on
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1127 every Saturday. Note that since there is no text, it
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1128 makes sense only if the fancy diary display is used.
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1129
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1130 %%(diary-omer)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1131 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
1132 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
1133 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
1134
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1135 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
1136 best if they are nonmarking."
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1137 (let* ((mark (regexp-quote diary-nonmarking-symbol))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1138 (sexp-mark (regexp-quote sexp-diary-entry-symbol))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1139 (s-entry (concat "\\(\\`\\|\^M\\|\n\\)" mark "?" sexp-mark "("))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1140 (entry-found))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1141 (goto-char (point-min))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1142 (while (re-search-forward s-entry nil t)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1143 (backward-char 1)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1144 (let ((sexp-start (point))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1145 (sexp)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1146 (entry)
20269
ca337d0a1553 (list-diary-entries, list-sexp-diary-entries, add-to-diary-list):
Karl Heuer <kwzh@gnu.org>
parents: 19324
diff changeset
1147 (specifier)
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1148 (entry-start)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1149 (line-start))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1150 (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
1151 (setq sexp (buffer-substring-no-properties sexp-start (point)))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1152 (save-excursion
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1153 (re-search-backward "\^M\\|\n\\|\\`")
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1154 (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
1155 (setq specifier
ca337d0a1553 (list-diary-entries, list-sexp-diary-entries, add-to-diary-list):
Karl Heuer <kwzh@gnu.org>
parents: 19324
diff changeset
1156 (buffer-substring-no-properties (1+ line-start) (point)))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1157 (forward-char 1)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1158 (if (and (or (char-equal (preceding-char) ?\^M)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1159 (char-equal (preceding-char) ?\n))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1160 (not (looking-at " \\|\^I")))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1161 (progn;; Diary entry consists only of the sexp
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1162 (backward-char 1)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1163 (setq entry ""))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1164 (setq entry-start (point))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1165 (re-search-forward "\^M\\|\n" nil t)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1166 (while (looking-at " \\|\^I")
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1167 (re-search-forward "\^M\\|\n" nil t))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1168 (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
1169 (setq entry (buffer-substring-no-properties entry-start (point)))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1170 (while (string-match "[\^M]" entry)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1171 (aset entry (match-beginning 0) ?\n )))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1172 (let ((diary-entry (diary-sexp-entry sexp entry date)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1173 (if diary-entry
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1174 (subst-char-in-region line-start (point) ?\^M ?\n t))
46620
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
1175 (add-to-diary-list date
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
1176 (if (consp diary-entry)
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
1177 (cdr diary-entry)
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
1178 diary-entry)
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
1179 specifier)
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
1180 (setq entry-found (or entry-found diary-entry)))))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1181 entry-found))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1182
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1183 (defun diary-sexp-entry (sexp entry date)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1184 "Process a SEXP diary ENTRY for DATE."
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1185 (let ((result (if calendar-debug-sexp
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1186 (let ((stack-trace-on-error t))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1187 (eval (car (read-from-string sexp))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1188 (condition-case nil
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1189 (eval (car (read-from-string sexp)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1190 (error
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1191 (beep)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1192 (message "Bad sexp at line %d in %s: %s"
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1193 (save-excursion
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1194 (save-restriction
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1195 (narrow-to-region 1 (point))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1196 (goto-char (point-min))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1197 (let ((lines 1))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1198 (while (re-search-forward "\n\\|\^M" nil t)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1199 (setq lines (1+ lines)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1200 lines)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1201 diary-file sexp)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1202 (sleep-for 2))))))
46620
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
1203 (cond ((stringp result) result)
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
1204 ((and (consp result)
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
1205 (stringp (cdr result))) result)
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
1206 (result entry)
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
1207 (t nil))))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1208
46620
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
1209 (defun diary-date (month day year &optional mark)
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1210 "Specific date(s) diary entry.
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1211 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
1212 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
1213 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
1214 all values.
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
1215
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
1216 An optional parameter MARK specifies a face or single-character string to
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
1217 use when highlighting the day in the calendar."
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1218 (let* ((dd (if european-calendar-style
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1219 month
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1220 day))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1221 (mm (if european-calendar-style
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1222 day
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1223 month))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1224 (m (extract-calendar-month date))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1225 (y (extract-calendar-year date))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1226 (d (extract-calendar-day date)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1227 (if (and
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1228 (or (and (listp dd) (memq d dd))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1229 (equal d dd)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1230 (eq dd t))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1231 (or (and (listp mm) (memq m mm))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1232 (equal m mm)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1233 (eq mm t))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1234 (or (and (listp year) (memq y year))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1235 (equal y year)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1236 (eq year t)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1237 entry)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1238
46620
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
1239 (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
1240 "Block diary entry.
42513
22938e0c54b2 (diary-block): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 41566
diff changeset
1241 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
1242 The order of the parameters is
23122
07b9777e6713 (diary-block): Doc fix..
Karl Heuer <kwzh@gnu.org>
parents: 22683
diff changeset
1243 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
1244 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
1245
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
1246 An optional parameter MARK specifies a face or single-character string to
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
1247 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
1248
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1249 (let ((date1 (calendar-absolute-from-gregorian
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1250 (if european-calendar-style
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1251 (list d1 m1 y1)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1252 (list m1 d1 y1))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1253 (date2 (calendar-absolute-from-gregorian
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1254 (if european-calendar-style
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1255 (list d2 m2 y2)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1256 (list m2 d2 y2))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1257 (d (calendar-absolute-from-gregorian date)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1258 (if (and (<= date1 d) (<= d date2))
46620
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
1259 (cons mark entry))))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1260
46620
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
1261 (defun diary-float (month dayname n &optional day mark)
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1262 "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
1263 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
1264 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
1265 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
1266
46620
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
1267 An optional parameter DAY means the Nth DAYNAME on or after/before MONTH DAY.
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
1268 Optional MARK specifies a face or single-character string to use when
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
1269 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
1270 ;; 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
1271 ;; 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
1272 ;; 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
1273 ;; more grotesque.
b3514551f08d (diary-float): Rewritten to fix bug when base date
Richard M. Stallman <rms@gnu.org>
parents: 17626
diff changeset
1274 (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
1275 (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
1276 (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
1277 (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
1278 (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
1279 (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
1280 (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
1281 (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
1282 (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
1283 (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
1284 ; 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
1285 (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
1286 (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
1287 (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
1288 ; 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
1289 (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
1290 (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
1291 (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
1292 (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
1293 (or (eq month t)
38b437f4134e (diary-float): Fix case of MONTH
Gerd Moellmann <gerd@gnu.org>
parents: 34036
diff changeset
1294 (if (listp month)
38b437f4134e (diary-float): Fix case of MONTH
Gerd Moellmann <gerd@gnu.org>
parents: 34036
diff changeset
1295 (memq m1 month)
38b437f4134e (diary-float): Fix case of MONTH
Gerd Moellmann <gerd@gnu.org>
parents: 34036
diff changeset
1296 (= m1 month)))
18590
7d2a26d2371d (diary-float): Fix errors in previous change.
Richard M. Stallman <rms@gnu.org>
parents: 17892
diff changeset
1297 (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
1298 1
7d2a26d2371d (diary-float): Fix errors in previous change.
Richard M. Stallman <rms@gnu.org>
parents: 17892
diff changeset
1299 (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
1300 (and (<= d1 d) (<= d d2))))
7d2a26d2371d (diary-float): Fix errors in previous change.
Richard M. Stallman <rms@gnu.org>
parents: 17892
diff changeset
1301 ;; 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
1302 (and (or (< y1 y2)
6a6bb17fba97 (diary-float): Better fix of end-of-year error.
Richard M. Stallman <rms@gnu.org>
parents: 23908
diff changeset
1303 (and (= y1 y2) (< m1 m2)))
18590
7d2a26d2371d (diary-float): Fix errors in previous change.
Richard M. Stallman <rms@gnu.org>
parents: 17892
diff changeset
1304 (or
23908
2a56bdf4cef7 (diary-float): Fix end-of-year error and typos in comments.
Karl Heuer <kwzh@gnu.org>
parents: 23247
diff changeset
1305 ;; 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
1306 (and
35500
38b437f4134e (diary-float): Fix case of MONTH
Gerd Moellmann <gerd@gnu.org>
parents: 34036
diff changeset
1307 (or (eq month t)
38b437f4134e (diary-float): Fix case of MONTH
Gerd Moellmann <gerd@gnu.org>
parents: 34036
diff changeset
1308 (if (listp month)
38b437f4134e (diary-float): Fix case of MONTH
Gerd Moellmann <gerd@gnu.org>
parents: 34036
diff changeset
1309 (memq m1 month)
38b437f4134e (diary-float): Fix case of MONTH
Gerd Moellmann <gerd@gnu.org>
parents: 34036
diff changeset
1310 (= m1 month)))
18590
7d2a26d2371d (diary-float): Fix errors in previous change.
Richard M. Stallman <rms@gnu.org>
parents: 17892
diff changeset
1311 (<= d1 (or day (if (> n 0)
7d2a26d2371d (diary-float): Fix errors in previous change.
Richard M. Stallman <rms@gnu.org>
parents: 17892
diff changeset
1312 1
7d2a26d2371d (diary-float): Fix errors in previous change.
Richard M. Stallman <rms@gnu.org>
parents: 17892
diff changeset
1313 (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
1314 ;; m2, d2 works as a base date
35500
38b437f4134e (diary-float): Fix case of MONTH
Gerd Moellmann <gerd@gnu.org>
parents: 34036
diff changeset
1315 (and (or (eq month t)
38b437f4134e (diary-float): Fix case of MONTH
Gerd Moellmann <gerd@gnu.org>
parents: 34036
diff changeset
1316 (if (listp month)
38b437f4134e (diary-float): Fix case of MONTH
Gerd Moellmann <gerd@gnu.org>
parents: 34036
diff changeset
1317 (memq m2 month)
38b437f4134e (diary-float): Fix case of MONTH
Gerd Moellmann <gerd@gnu.org>
parents: 34036
diff changeset
1318 (= m2 month)))
18590
7d2a26d2371d (diary-float): Fix errors in previous change.
Richard M. Stallman <rms@gnu.org>
parents: 17892
diff changeset
1319 (<= (or day (if (> n 0)
7d2a26d2371d (diary-float): Fix errors in previous change.
Richard M. Stallman <rms@gnu.org>
parents: 17892
diff changeset
1320 1
7d2a26d2371d (diary-float): Fix errors in previous change.
Richard M. Stallman <rms@gnu.org>
parents: 17892
diff changeset
1321 (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
1322 d2)))))
46620
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
1323 (cons mark entry)))))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1324
35500
38b437f4134e (diary-float): Fix case of MONTH
Gerd Moellmann <gerd@gnu.org>
parents: 34036
diff changeset
1325
46620
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
1326 (defun diary-anniversary (month day year &optional mark)
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1327 "Anniversary diary entry.
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1328 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
1329 `european-calendar-style' is nil, and DAY, MONTH, YEAR if
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1330 `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
1331 %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
1332 %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
1333 `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
1334 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
1335
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
1336 An optional parameter MARK specifies a face or single-character string to
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
1337 use when highlighting the day in the calendar."
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1338 (let* ((d (if european-calendar-style
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1339 month
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1340 day))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1341 (m (if european-calendar-style
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1342 day
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1343 month))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1344 (y (extract-calendar-year date))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1345 (diff (- y year)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1346 (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
1347 (setq m 3
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1348 d 1))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1349 (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
1350 (cons mark (format entry diff (diary-ordinal-suffix diff))))))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1351
46620
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
1352 (defun diary-cyclic (n month day year &optional mark)
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1353 "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
1354 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
1355 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
1356 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
1357 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
1358 appropriate.
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
1359
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
1360 An optional parameter MARK specifies a face or single-character string to
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
1361 use when highlighting the day in the calendar."
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1362 (let* ((d (if european-calendar-style
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1363 month
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1364 day))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1365 (m (if european-calendar-style
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1366 day
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1367 month))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1368 (diff (- (calendar-absolute-from-gregorian date)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1369 (calendar-absolute-from-gregorian
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1370 (list m d year))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1371 (cycle (/ diff n)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1372 (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
1373 (cons mark (format entry cycle (diary-ordinal-suffix cycle))))))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1374
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1375 (defun diary-ordinal-suffix (n)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1376 "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
1377 (if (or (memq (% n 100) '(11 12 13))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1378 (< 3 (% n 10)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1379 "th"
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1380 (aref ["th" "st" "nd" "rd"] (% n 10))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1381
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1382 (defun diary-day-of-year ()
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1383 "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
1384 (calendar-day-of-year-string date))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1385
17626
68cce262538d Use defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 16545
diff changeset
1386 (defcustom diary-remind-message
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1387 '("Reminder: Only "
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1388 (if (= 0 (% days 7))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1389 (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
1390 (concat (int-to-string days) (if (= 1 days) " day" " days")))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1391 " until "
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1392 diary-entry)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1393 "*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
1394 display.
39615
4287ce76bf9f (diary-entry-compare): When times are identical, compare the entries
Sam Steingold <sds@gnu.org>
parents: 38422
diff changeset
1395
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1396 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
1397 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
1398 month, day, year), and `diary-entry' (a string)."
68cce262538d Use defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 16545
diff changeset
1399 :type 'sexp
68cce262538d Use defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 16545
diff changeset
1400 :group 'diary)
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1401
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1402 (defun diary-remind (sexp days &optional marking)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1403 "Provide a reminder of a diary entry.
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1404 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
1405 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
1406 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
1407 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
1408 returned.
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1409
24684
cca41b0e7ae7 (diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents: 24192
diff changeset
1410 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
1411 date itself.
cca41b0e7ae7 (diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents: 24192
diff changeset
1412
cca41b0e7ae7 (diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents: 24192
diff changeset
1413 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
1414 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
1415 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
1416 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
1417 marked on the calendar."
cca41b0e7ae7 (diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents: 24192
diff changeset
1418 (let ((diary-entry (eval sexp)))
cca41b0e7ae7 (diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents: 24192
diff changeset
1419 (cond
cca41b0e7ae7 (diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents: 24192
diff changeset
1420 ;; Diary entry applies on date
cca41b0e7ae7 (diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents: 24192
diff changeset
1421 ((and diary-entry
cca41b0e7ae7 (diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents: 24192
diff changeset
1422 (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
1423 diary-entry)
cca41b0e7ae7 (diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents: 24192
diff changeset
1424 ;; 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
1425 ((and (integerp days)
cca41b0e7ae7 (diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents: 24192
diff changeset
1426 (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
1427 (or (not marking-diary-entries) marking))
cca41b0e7ae7 (diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents: 24192
diff changeset
1428 (let ((date (calendar-gregorian-from-absolute
cca41b0e7ae7 (diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents: 24192
diff changeset
1429 (+ (calendar-absolute-from-gregorian date) days))))
cca41b0e7ae7 (diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents: 24192
diff changeset
1430 (if (setq diary-entry (eval sexp))
cca41b0e7ae7 (diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents: 24192
diff changeset
1431 (mapconcat 'eval diary-remind-message ""))))
cca41b0e7ae7 (diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents: 24192
diff changeset
1432 ;; 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
1433 ((and (listp days) days)
cca41b0e7ae7 (diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents: 24192
diff changeset
1434 (or (diary-remind sexp (car days) marking)
cca41b0e7ae7 (diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents: 24192
diff changeset
1435 (diary-remind sexp (cdr days) marking))))))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1436
20269
ca337d0a1553 (list-diary-entries, list-sexp-diary-entries, add-to-diary-list):
Karl Heuer <kwzh@gnu.org>
parents: 19324
diff changeset
1437 (defun add-to-diary-list (date string specifier)
ca337d0a1553 (list-diary-entries, list-sexp-diary-entries, add-to-diary-list):
Karl Heuer <kwzh@gnu.org>
parents: 19324
diff changeset
1438 "Add the entry (DATE STRING SPECIFIER) to `diary-entries-list'.
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1439 Do nothing if DATE or STRING is nil."
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1440 (and date string
39615
4287ce76bf9f (diary-entry-compare): When times are identical, compare the entries
Sam Steingold <sds@gnu.org>
parents: 38422
diff changeset
1441 (setq diary-entries-list
20269
ca337d0a1553 (list-diary-entries, list-sexp-diary-entries, add-to-diary-list):
Karl Heuer <kwzh@gnu.org>
parents: 19324
diff changeset
1442 (append diary-entries-list (list (list date string specifier))))))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1443
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1444 (defun make-diary-entry (string &optional nonmarking file)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1445 "Insert a diary entry STRING which may be NONMARKING in FILE.
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1446 If omitted, NONMARKING defaults to nil and FILE defaults to diary-file."
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1447 (find-file-other-window
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1448 (substitute-in-file-name (if file file diary-file)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1449 (goto-char (point-max))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1450 (insert
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1451 (if (bolp) "" "\n")
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1452 (if nonmarking diary-nonmarking-symbol "")
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1453 string " "))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1454
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1455 (defun insert-diary-entry (arg)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1456 "Insert a diary entry for the date indicated by point.
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1457 Prefix arg will make the entry nonmarking."
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1458 (interactive "P")
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1459 (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
1460 arg))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1461
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1462 (defun insert-weekly-diary-entry (arg)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1463 "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
1464 Prefix arg will make the entry nonmarking."
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1465 (interactive "P")
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1466 (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
1467 arg))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1468
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1469 (defun insert-monthly-diary-entry (arg)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1470 "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
1471 Prefix arg will make the entry nonmarking."
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1472 (interactive "P")
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1473 (let* ((calendar-date-display-form
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1474 (if european-calendar-style
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1475 '(day " * ")
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1476 '("* " day))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1477 (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
1478 arg)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1479
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1480 (defun insert-yearly-diary-entry (arg)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1481 "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
1482 Prefix arg will make the entry nonmarking."
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1483 (interactive "P")
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1484 (let* ((calendar-date-display-form
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1485 (if european-calendar-style
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1486 '(day " " monthname)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1487 '(monthname " " day))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1488 (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
1489 arg)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1490
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1491 (defun insert-anniversary-diary-entry (arg)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1492 "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
1493 Prefix arg will make the entry nonmarking."
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1494 (interactive "P")
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1495 (let* ((calendar-date-display-form
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1496 (if european-calendar-style
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1497 '(day " " month " " year)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1498 '(month " " day " " year))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1499 (make-diary-entry
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1500 (format "%s(diary-anniversary %s)"
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1501 sexp-diary-entry-symbol
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1502 (calendar-date-string (calendar-cursor-to-date t) nil t))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1503 arg)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1504
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1505 (defun insert-block-diary-entry (arg)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1506 "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
1507 Prefix arg will make the entry nonmarking."
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1508 (interactive "P")
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1509 (let* ((calendar-date-display-form
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1510 (if european-calendar-style
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1511 '(day " " month " " year)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1512 '(month " " day " " year)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1513 (cursor (calendar-cursor-to-date t))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1514 (mark (or (car calendar-mark-ring)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1515 (error "No mark set in this buffer")))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1516 (start)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1517 (end))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1518 (if (< (calendar-absolute-from-gregorian mark)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1519 (calendar-absolute-from-gregorian cursor))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1520 (setq start mark
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1521 end cursor)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1522 (setq start cursor
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1523 end mark))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1524 (make-diary-entry
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1525 (format "%s(diary-block %s %s)"
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1526 sexp-diary-entry-symbol
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1527 (calendar-date-string start nil t)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1528 (calendar-date-string end nil t))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1529 arg)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1530
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1531 (defun insert-cyclic-diary-entry (arg)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1532 "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
1533 Prefix arg will make the entry nonmarking."
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1534 (interactive "P")
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1535 (let* ((calendar-date-display-form
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1536 (if european-calendar-style
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1537 '(day " " month " " year)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1538 '(month " " day " " year))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1539 (make-diary-entry
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1540 (format "%s(diary-cyclic %d %s)"
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1541 sexp-diary-entry-symbol
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1542 (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
1543 (lambda (x) (> x 0)))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1544 (calendar-date-string (calendar-cursor-to-date t) nil t))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1545 arg)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1546
13650
a9e81464a9ea Renamed from diary.el.
Richard M. Stallman <rms@gnu.org>
parents: 13075
diff changeset
1547 (provide 'diary-lib)
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1548
13650
a9e81464a9ea Renamed from diary.el.
Richard M. Stallman <rms@gnu.org>
parents: 13075
diff changeset
1549 ;;; diary-lib.el ends here