annotate lisp/calendar/diary-lib.el @ 49737:a8a5fd61aada

(diary-attrtype-convert): Convert an attribute value string to the desired type. (diary-pull-attrs): New function that pulls the attributes off a diary entry, merges with file-global attributes, and returns the (possibly modified) entry and a list of attribute/values using diary-attrtype-convert above. (list-diary-entries, fancy-diary-display, show-all-diary-entries) (mark-diary-entries, mark-sexp-diary-entries, list-sexp-diary-entries): Add handling of file-global attributes, add handling of entry attributes using diary-pull-attrs above. (mark-calendar-days-named, mark-calendar-days-named, mark-calendar-date-pattern) (mark-calendar-month, add-to-diary-list): Add optional paramater `color' for passing face attribute info through the callchain. Pass this parameter around.
author Juanma Barranquero <lekktu@gmail.com>
date Tue, 11 Feb 2003 23:25:15 +0000
parents 0d8b17d428b5
children fa4e7ecda348 d7ddb3e565de
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
46826
e020f18c490a (diary-mail-entries): Use `compose-mail'
Sam Steingold <sds@gnu.org>
parents: 46620
diff changeset
177 (defvar diary-modified)
e020f18c490a (diary-mail-entries): Use `compose-mail'
Sam Steingold <sds@gnu.org>
parents: 46620
diff changeset
178 (defvar diary-entries-list)
e020f18c490a (diary-mail-entries): Use `compose-mail'
Sam Steingold <sds@gnu.org>
parents: 46620
diff changeset
179 (defvar displayed-year)
e020f18c490a (diary-mail-entries): Use `compose-mail'
Sam Steingold <sds@gnu.org>
parents: 46620
diff changeset
180 (defvar displayed-month)
e020f18c490a (diary-mail-entries): Use `compose-mail'
Sam Steingold <sds@gnu.org>
parents: 46620
diff changeset
181 (defvar entry)
e020f18c490a (diary-mail-entries): Use `compose-mail'
Sam Steingold <sds@gnu.org>
parents: 46620
diff changeset
182 (defvar date)
e020f18c490a (diary-mail-entries): Use `compose-mail'
Sam Steingold <sds@gnu.org>
parents: 46620
diff changeset
183 (defvar number)
e020f18c490a (diary-mail-entries): Use `compose-mail'
Sam Steingold <sds@gnu.org>
parents: 46620
diff changeset
184 (defvar date-string)
e020f18c490a (diary-mail-entries): Use `compose-mail'
Sam Steingold <sds@gnu.org>
parents: 46620
diff changeset
185 (defvar d-file)
e020f18c490a (diary-mail-entries): Use `compose-mail'
Sam Steingold <sds@gnu.org>
parents: 46620
diff changeset
186 (defvar original-date)
e020f18c490a (diary-mail-entries): Use `compose-mail'
Sam Steingold <sds@gnu.org>
parents: 46620
diff changeset
187
49737
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
188 (defun diary-attrtype-convert (attrvalue type)
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
189 "Convert the attrvalue from a string to the appropriate type for using
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
190 in a face description"
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
191 (let (ret)
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
192 (setq ret (cond ((eq type 'string) attrvalue)
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
193 ((eq type 'symbol) (read attrvalue))
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
194 ((eq type 'int) (string-to-int attrvalue))
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
195 ((eq type 'stringtnil)
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
196 (cond ((string= "t" attrvalue) t)
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
197 ((string= "nil" attrvalue) nil)
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
198 (t attrvalue)))
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
199 ((eq type 'tnil)
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
200 (cond ((string= "t" attrvalue) t)
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
201 ((string= "nil" attrvalue) nil)))))
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
202 ; (message "(%s)[%s]=[%s]" (print type) attrvalue ret)
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
203 ret))
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
204
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
205
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
206 (defun diary-pull-attrs (entry fileglobattrs)
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
207 "Pull the face-related attributes off the entry, merge with the
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
208 fileglobattrs, and return the (possibly modified) entry and face
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
209 data in a list of attrname attrvalue values.
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
210 The entry will be modified to drop all tags that are used for face matching.
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
211 If entry is nil, then the fileglobattrs are being searched for,
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
212 the fileglobattrs variable is ignored, and
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
213 diary-glob-file-regexp-prefix is prepended to the regexps before each
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
214 search."
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
215 (save-excursion
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
216 (let (regexp regnum attrname attr-list attrname attrvalue type)
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
217 (if (null entry)
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
218 (progn
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
219 (setq ret-attr '()
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
220 attr-list diary-face-attrs)
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
221 (while attr-list
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
222 (goto-char (point-min))
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
223 (setq attr (car attr-list)
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
224 regexp (nth 0 attr)
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
225 regnum (nth 1 attr)
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
226 attrname (nth 2 attr)
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
227 type (nth 3 attr)
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
228 regexp (concat diary-glob-file-regexp-prefix regexp))
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
229 (setq attrvalue nil)
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
230 (if (re-search-forward regexp (point-max) t)
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
231 (setq attrvalue (buffer-substring-no-properties
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
232 (match-beginning regnum)
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
233 (match-end regnum))))
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
234 (if (and attrvalue
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
235 (setq attrvalue (diary-attrtype-convert attrvalue type)))
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
236 (setq ret-attr (append ret-attr (list attrname attrvalue))))
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
237 (setq attr-list (cdr attr-list)))
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
238 (setq fileglobattrs ret-attr))
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
239 (progn
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
240 (setq ret-attr fileglobattrs
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
241 attr-list diary-face-attrs)
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
242 (while attr-list
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
243 (goto-char (point-min))
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
244 (setq attr (car attr-list)
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
245 regexp (nth 0 attr)
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
246 regnum (nth 1 attr)
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
247 attrname (nth 2 attr)
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
248 type (nth 3 attr))
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
249 (setq attrvalue nil)
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
250 (if (string-match regexp entry)
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
251 (progn
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
252 (setq attrvalue (substring-no-properties entry
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
253 (match-beginning regnum)
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
254 (match-end regnum)))
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
255 (setq entry (replace-match "" t t entry))))
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
256 (if (and attrvalue
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
257 (setq attrvalue (diary-attrtype-convert attrvalue type)))
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
258 (setq ret-attr (append ret-attr (list attrname attrvalue))))
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
259 (setq attr-list (cdr attr-list)))))))
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
260 (list entry ret-attr))
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
261
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
262
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
263
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
264 (defun list-diary-entries (date number)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
265 "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
266 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
267 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
268 using selective display.
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
269
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
270 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
271 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
272 \(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
273 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
274 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
275 for a date with no diary entries.
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
276
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
277 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
278 `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
279 These hooks have the following distinct roles:
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
280
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
281 `nongregorian-diary-listing-hook' can cull dates from the diary
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
282 and each included file. Usually used for Hebrew or Islamic
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
283 diary entries in files. Applied to *each* file.
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
284
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
285 `list-diary-entries-hook' adds or manipulates diary entries from
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
286 external sources. Used, for example, to include diary entries
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
287 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
288 before the display hook is run.
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
289
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
290 `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
291 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
292 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
293 add-hook to set this to ignore.
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
294
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
295 `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
296 notification function."
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
297
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
298 (if (< 0 number)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
299 (let* ((original-date date);; save for possible use in the hooks
46826
e020f18c490a (diary-mail-entries): Use `compose-mail'
Sam Steingold <sds@gnu.org>
parents: 46620
diff changeset
300 old-diary-syntax-table
e020f18c490a (diary-mail-entries): Use `compose-mail'
Sam Steingold <sds@gnu.org>
parents: 46620
diff changeset
301 diary-entries-list
49737
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
302 file-glob-attrs
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
303 (date-string (calendar-date-string date))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
304 (d-file (substitute-in-file-name diary-file)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
305 (message "Preparing diary...")
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
306 (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
307 (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
308 (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
309 (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
310 (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
311 (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
312 (revert-buffer t t))))
49737
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
313 (setq file-glob-attrs (nth 1 (diary-pull-attrs nil "")))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
314 (setq selective-display t)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
315 (setq selective-display-ellipses nil)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
316 (setq old-diary-syntax-table (syntax-table))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
317 (set-syntax-table diary-syntax-table)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
318 (unwind-protect
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
319 (let ((buffer-read-only nil)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
320 (diary-modified (buffer-modified-p))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
321 (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
322 ;; 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
323 ;; selective display to work properly
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
324 (goto-char (1- (point-max)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
325 (if (not (looking-at "\^M\\|\n"))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
326 (progn
27918
a71031623500 (list-diary-entries): Don't try to go forward at
Gerd Moellmann <gerd@gnu.org>
parents: 27842
diff changeset
327 (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
328 (insert "\^M")))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
329 (goto-char (point-min))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
330 (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
331 (insert "\^M"))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
332 (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
333 (calendar-for-loop i from 1 to number do
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
334 (let ((d diary-date-forms)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
335 (month (extract-calendar-month date))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
336 (day (extract-calendar-day date))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
337 (year (extract-calendar-year date))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
338 (entry-found (list-sexp-diary-entries date)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
339 (while d
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
340 (let*
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
341 ((date-form (if (equal (car (car d)) 'backup)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
342 (cdr (car d))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
343 (car d)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
344 (backup (equal (car (car d)) 'backup))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
345 (dayname
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
346 (concat
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
347 (calendar-day-name date) "\\|"
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
348 (substring (calendar-day-name date) 0 3) ".?"))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
349 (monthname
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
350 (concat
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
351 "\\*\\|"
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
352 (calendar-month-name month) "\\|"
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
353 (substring (calendar-month-name month) 0 3) ".?"))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
354 (month (concat "\\*\\|0*" (int-to-string month)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
355 (day (concat "\\*\\|0*" (int-to-string day)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
356 (year
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
357 (concat
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
358 "\\*\\|0*" (int-to-string year)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
359 (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
360 (concat "\\|" (format "%02d" (% year 100)))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
361 "")))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
362 (regexp
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
363 (concat
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
364 "\\(\\`\\|\^M\\|\n\\)" mark "?\\("
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
365 (mapconcat 'eval date-form "\\)\\(")
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
366 "\\)"))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
367 (case-fold-search t))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
368 (goto-char (point-min))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
369 (while (re-search-forward regexp nil t)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
370 (if backup (re-search-backward "\\<" nil t))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
371 (if (and (or (char-equal (preceding-char) ?\^M)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
372 (char-equal (preceding-char) ?\n))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
373 (not (looking-at " \\|\^I")))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
374 ;; Diary entry that consists only of date.
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
375 (backward-char 1)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
376 ;; Found a nonempty diary entry--make it visible and
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
377 ;; add it to the list.
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
378 (setq entry-found t)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
379 (let ((entry-start (point))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
380 (date-start))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
381 (re-search-backward "\^M\\|\n\\|\\`")
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
382 (setq date-start (point))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
383 (re-search-forward "\^M\\|\n" nil t 2)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
384 (while (looking-at " \\|\^I")
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
385 (re-search-forward "\^M\\|\n" nil t))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
386 (backward-char 1)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
387 (subst-char-in-region date-start
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
388 (point) ?\^M ?\n t)
49737
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
389 (setq entry (buffer-substring entry-start (point))
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
390 temp (diary-pull-attrs entry file-glob-attrs)
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
391 entry (nth 0 temp)
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
392 marks (nth 1 temp))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
393 (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
394 date
49737
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
395 entry
43646
bcdc815ba23f (list-diary-entries): Use `buffer-substring' instead of
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 42513
diff changeset
396 (buffer-substring
48365
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
397 (1+ date-start) (1- entry-start))
49737
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
398 (copy-marker entry-start) marks)))))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
399 (setq d (cdr d)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
400 (or entry-found
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
401 (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
402 (setq diary-entries-list
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
403 (append diary-entries-list
49737
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
404 (list (list date "" "" "" "")))))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
405 (setq date
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
406 (calendar-gregorian-from-absolute
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
407 (1+ (calendar-absolute-from-gregorian date))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
408 (setq entry-found nil)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
409 (set-buffer-modified-p diary-modified))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
410 (set-syntax-table old-diary-syntax-table))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
411 (goto-char (point-min))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
412 (run-hooks 'nongregorian-diary-listing-hook
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
413 'list-diary-entries-hook)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
414 (if diary-display-hook
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
415 (run-hooks 'diary-display-hook)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
416 (simple-diary-display))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
417 (run-hooks 'diary-hook)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
418 diary-entries-list))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
419
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
420 (defun include-other-diary-files ()
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
421 "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
422 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
423 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
424 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
425 #include \"filename\"
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
426 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
427 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
428 changing the variable `diary-include-string'."
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 (while (re-search-forward
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
431 (concat
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
432 "\\(\\`\\|\^M\\|\n\\)"
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
433 (regexp-quote diary-include-string)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
434 " \"\\([^\"]*\\)\"")
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
435 nil t)
27842
cfa579c1229f (include-other-diary-files): Undo the selective
Gerd Moellmann <gerd@gnu.org>
parents: 26330
diff changeset
436 (let* ((diary-file (substitute-in-file-name
cfa579c1229f (include-other-diary-files): Undo the selective
Gerd Moellmann <gerd@gnu.org>
parents: 26330
diff changeset
437 (buffer-substring-no-properties
cfa579c1229f (include-other-diary-files): Undo the selective
Gerd Moellmann <gerd@gnu.org>
parents: 26330
diff changeset
438 (match-beginning 2) (match-end 2))))
cfa579c1229f (include-other-diary-files): Undo the selective
Gerd Moellmann <gerd@gnu.org>
parents: 26330
diff changeset
439 (diary-list-include-blanks nil)
cfa579c1229f (include-other-diary-files): Undo the selective
Gerd Moellmann <gerd@gnu.org>
parents: 26330
diff changeset
440 (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
441 (diary-display-hook 'ignore)
cfa579c1229f (include-other-diary-files): Undo the selective
Gerd Moellmann <gerd@gnu.org>
parents: 26330
diff changeset
442 (diary-hook nil)
cfa579c1229f (include-other-diary-files): Undo the selective
Gerd Moellmann <gerd@gnu.org>
parents: 26330
diff changeset
443 (d-buffer (find-buffer-visiting diary-file))
cfa579c1229f (include-other-diary-files): Undo the selective
Gerd Moellmann <gerd@gnu.org>
parents: 26330
diff changeset
444 (diary-modified (if d-buffer
cfa579c1229f (include-other-diary-files): Undo the selective
Gerd Moellmann <gerd@gnu.org>
parents: 26330
diff changeset
445 (save-excursion
cfa579c1229f (include-other-diary-files): Undo the selective
Gerd Moellmann <gerd@gnu.org>
parents: 26330
diff changeset
446 (set-buffer d-buffer)
cfa579c1229f (include-other-diary-files): Undo the selective
Gerd Moellmann <gerd@gnu.org>
parents: 26330
diff changeset
447 (buffer-modified-p)))))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
448 (if (file-exists-p diary-file)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
449 (if (file-readable-p diary-file)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
450 (unwind-protect
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
451 (setq diary-entries-list
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
452 (append diary-entries-list
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
453 (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
454 (save-excursion
dc6ae1a1331c (include-other-diary-files): Fix the fix of
Gerd Moellmann <gerd@gnu.org>
parents: 27918
diff changeset
455 (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
456 (let ((inhibit-read-only t))
a3338547dad4 (include-other-diary-files): Allow modifying
Richard M. Stallman <rms@gnu.org>
parents: 43646
diff changeset
457 (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
458 (setq selective-display nil)
dc6ae1a1331c (include-other-diary-files): Fix the fix of
Gerd Moellmann <gerd@gnu.org>
parents: 27918
diff changeset
459 (set-buffer-modified-p diary-modified)))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
460 (beep)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
461 (message "Can't read included diary file %s" diary-file)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
462 (sleep-for 2))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
463 (beep)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
464 (message "Can't find included diary file %s" diary-file)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
465 (sleep-for 2))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
466 (goto-char (point-min)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
467
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
468 (defun simple-diary-display ()
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
469 "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
470 (let* ((holiday-list (if holidays-in-diary-buffer
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
471 (check-calendar-holidays original-date)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
472 (msg (format "No diary entries for %s %s"
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
473 (concat date-string (if holiday-list ":" ""))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
474 (mapconcat 'identity holiday-list "; "))))
26330
d0f895577892 (simple-diary-display): Reset modeline even if
Gerd Moellmann <gerd@gnu.org>
parents: 25594
diff changeset
475 (calendar-set-mode-line
d0f895577892 (simple-diary-display): Reset modeline even if
Gerd Moellmann <gerd@gnu.org>
parents: 25594
diff changeset
476 (concat "Diary for " date-string
d0f895577892 (simple-diary-display): Reset modeline even if
Gerd Moellmann <gerd@gnu.org>
parents: 25594
diff changeset
477 (if holiday-list ": " "")
d0f895577892 (simple-diary-display): Reset modeline even if
Gerd Moellmann <gerd@gnu.org>
parents: 25594
diff changeset
478 (mapconcat 'identity holiday-list "; ")))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
479 (if (or (not diary-entries-list)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
480 (and (not (cdr diary-entries-list))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
481 (string-equal (car (cdr (car diary-entries-list))) "")))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
482 (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
483 (message "%s" msg)
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
484 (set-buffer (get-buffer-create holiday-buffer))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
485 (setq buffer-read-only nil)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
486 (calendar-set-mode-line date-string)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
487 (erase-buffer)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
488 (insert (mapconcat 'identity holiday-list "\n"))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
489 (goto-char (point-min))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
490 (set-buffer-modified-p nil)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
491 (setq buffer-read-only t)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
492 (display-buffer holiday-buffer)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
493 (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
494 (display-buffer (find-buffer-visiting d-file))
13053
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
48365
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
497 (defface diary-button-face '((((type pc) (class color))
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
498 (:foreground "lightblue")))
48372
dedfe509d0ca (diary-button-face): Add group and version number.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48365
diff changeset
499 "Default face used for buttons."
dedfe509d0ca (diary-button-face): Add group and version number.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48365
diff changeset
500 :version "21.4"
dedfe509d0ca (diary-button-face): Add group and version number.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48365
diff changeset
501 :group 'diary)
48365
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
502
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
503 (define-button-type 'diary-entry
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
504 'action #'diary-goto-entry
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
505 'face #'diary-button-face)
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
506
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
507 (defun diary-goto-entry (button)
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
508 (let ((marker (button-get button 'marker)))
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
509 (when marker
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
510 (pop-to-buffer (marker-buffer marker))
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
511 (goto-char (marker-position marker)))))
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
512
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
513 (defun fancy-diary-display ()
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
514 "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
515 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
516 (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
517 (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
518 (let ((diary-modified (buffer-modified-p)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
519 (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
520 (setq selective-display nil)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
521 (kill-local-variable 'mode-line-format)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
522 (set-buffer-modified-p diary-modified)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
523 (if (or (not diary-entries-list)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
524 (and (not (cdr diary-entries-list))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
525 (string-equal (car (cdr (car diary-entries-list))) "")))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
526 (let* ((holiday-list (if holidays-in-diary-buffer
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
527 (check-calendar-holidays original-date)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
528 (msg (format "No diary entries for %s %s"
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
529 (concat date-string (if holiday-list ":" ""))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
530 (mapconcat 'identity holiday-list "; "))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
531 (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
532 (message "%s" msg)
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
533 (set-buffer (get-buffer-create holiday-buffer))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
534 (setq buffer-read-only nil)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
535 (calendar-set-mode-line date-string)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
536 (erase-buffer)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
537 (insert (mapconcat 'identity holiday-list "\n"))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
538 (goto-char (point-min))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
539 (set-buffer-modified-p nil)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
540 (setq buffer-read-only t)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
541 (display-buffer holiday-buffer)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
542 (message "No diary entries for %s" date-string)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
543 (save-excursion;; Prepare the fancy diary buffer.
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
544 (set-buffer (make-fancy-diary-buffer))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
545 (setq buffer-read-only nil)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
546 (let ((entry-list diary-entries-list)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
547 (holiday-list)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
548 (holiday-list-last-month 1)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
549 (holiday-list-last-year 1)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
550 (date (list 0 0 0)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
551 (while entry-list
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
552 (if (not (calendar-date-equal date (car (car entry-list))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
553 (progn
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
554 (setq date (car (car entry-list)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
555 (and holidays-in-diary-buffer
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
556 (calendar-date-compare
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
557 (list (list holiday-list-last-month
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
558 (calendar-last-day-of-month
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
559 holiday-list-last-month
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
560 holiday-list-last-year)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
561 holiday-list-last-year))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
562 (list date))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
563 ;; 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
564 (setq holiday-list-last-month
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
565 (extract-calendar-month date))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
566 (setq holiday-list-last-year
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
567 (extract-calendar-year date))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
568 (increment-calendar-month
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
569 holiday-list-last-month holiday-list-last-year 1)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
570 (setq holiday-list
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
571 (let ((displayed-month holiday-list-last-month)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
572 (displayed-year holiday-list-last-year))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
573 (calendar-holiday-list)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
574 (increment-calendar-month
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
575 holiday-list-last-month holiday-list-last-year 1))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
576 (let* ((date-string (calendar-date-string date))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
577 (date-holiday-list
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
578 (let ((h holiday-list)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
579 (d))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
580 ;; Make a list of all holidays for date.
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
581 (while h
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
582 (if (calendar-date-equal date (car (car h)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
583 (setq d (append d (cdr (car h)))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
584 (setq h (cdr h)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
585 d)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
586 (insert (if (= (point) (point-min)) "" ?\n) date-string)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
587 (if date-holiday-list (insert ": "))
14954
a9102c34a5b6 Fix length of separator string.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents: 14687
diff changeset
588 (let* ((l (current-column))
a9102c34a5b6 Fix length of separator string.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents: 14687
diff changeset
589 (longest 0))
28615
4c6883cb70ab (fancy-diary-display, mark-diary-entries)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28575
diff changeset
590 (insert (mapconcat (lambda (x)
4c6883cb70ab (fancy-diary-display, mark-diary-entries)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28575
diff changeset
591 (if (< longest (length x))
4c6883cb70ab (fancy-diary-display, mark-diary-entries)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28575
diff changeset
592 (setq longest (length x)))
4c6883cb70ab (fancy-diary-display, mark-diary-entries)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28575
diff changeset
593 x)
14954
a9102c34a5b6 Fix length of separator string.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents: 14687
diff changeset
594 date-holiday-list
a9102c34a5b6 Fix length of separator string.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents: 14687
diff changeset
595 (concat "\n" (make-string l ? ))))
a9102c34a5b6 Fix length of separator string.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents: 14687
diff changeset
596 (insert ?\n (make-string (+ l longest) ?=) ?\n)))))
49737
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
597
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
598 (setq entry (car (cdr (car entry-list))))
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
599 (if (< 0 (length entry))
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
600 (progn
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
601 (if (nth 3 (car entry-list))
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
602 (insert-button (concat entry "\n")
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
603 'marker (nth 3 (car entry-list))
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
604 :type 'diary-entry)
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
605 (insert entry ?\n))
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
606 (save-excursion
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
607 (setq marks (nth 4 (car entry-list)))
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
608 (setq temp-face (make-symbol (apply 'concat "temp-face-" (mapcar '(lambda (sym) (if (not (stringp sym)) (symbol-name sym) sym)) marks))))
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
609 (make-face temp-face)
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
610 ;; Remove :face info from the marks, copy the face info into temp-face
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
611 (setq faceinfo marks)
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
612 (while (setq faceinfo (memq :face faceinfo))
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
613 (copy-face (read (nth 1 faceinfo)) temp-face)
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
614 (setcar faceinfo nil)
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
615 (setcar (cdr faceinfo) nil))
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
616 (setq marks (delq nil marks))
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
617 ;; Apply the font aspects
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
618 (apply 'set-face-attribute temp-face nil marks)
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
619 (search-backward entry)
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
620 (overlay-put
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
621 (make-overlay (match-beginning 0) (match-end 0)) 'face temp-face))
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
622 ))
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
623 (setq entry-list (cdr entry-list))))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
624 (set-buffer-modified-p nil)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
625 (goto-char (point-min))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
626 (setq buffer-read-only t)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
627 (display-buffer fancy-diary-buffer)
48365
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
628 (fancy-diary-display-mode)
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
629 (message "Preparing diary...done"))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
630
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
631 (defun make-fancy-diary-buffer ()
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
632 "Create and return the initial fancy diary buffer."
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
633 (save-excursion
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
634 (set-buffer (get-buffer-create fancy-diary-buffer))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
635 (setq buffer-read-only nil)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
636 (make-local-variable 'mode-line-format)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
637 (calendar-set-mode-line "Diary Entries")
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
638 (erase-buffer)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
639 (set-buffer-modified-p nil)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
640 (setq buffer-read-only t)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
641 (get-buffer fancy-diary-buffer)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
642
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
643 (defun print-diary-entries ()
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
644 "Print a hard copy of the diary display.
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
645
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
646 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
647 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
648 line, print the temp buffer, and destroy it.
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 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
651
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
652 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
653 the actual printing."
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
654 (interactive)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
655 (if (bufferp (get-buffer fancy-diary-buffer))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
656 (save-excursion
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
657 (set-buffer (get-buffer fancy-diary-buffer))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
658 (run-hooks 'print-diary-entries-hook))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
659 (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
660 (find-buffer-visiting (substitute-in-file-name diary-file))))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
661 (if diary-buffer
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
662 (let ((temp-buffer (get-buffer-create "*Printable Diary Entries*"))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
663 (heading))
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 (set-buffer diary-buffer)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
666 (setq heading
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
667 (if (not (stringp mode-line-format))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
668 "All Diary Entries"
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
669 (string-match "^-*\\([^-].*[^-]\\)-*$" mode-line-format)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
670 (substring mode-line-format
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
671 (match-beginning 1) (match-end 1))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
672 (copy-to-buffer temp-buffer (point-min) (point-max))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
673 (set-buffer temp-buffer)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
674 (while (re-search-forward "\^M.*$" nil t)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
675 (replace-match ""))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
676 (goto-char (point-min))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
677 (insert heading "\n"
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
678 (make-string (length heading) ?=) "\n")
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
679 (run-hooks 'print-diary-entries-hook)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
680 (kill-buffer temp-buffer)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
681 (error "You don't have a diary buffer!")))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
682
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
683 (defun show-all-diary-entries ()
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
684 "Show all of the diary entries in the diary file.
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
685 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
686 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
687 is created."
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
688 (interactive)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
689 (let ((d-file (substitute-in-file-name diary-file)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
690 (if (and d-file (file-exists-p d-file))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
691 (if (file-readable-p d-file)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
692 (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
693 (let ((diary-buffer (find-buffer-visiting d-file)))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
694 (set-buffer (if diary-buffer
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
695 diary-buffer
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
696 (find-file-noselect d-file t)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
697 (let ((buffer-read-only nil)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
698 (diary-modified (buffer-modified-p)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
699 (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
700 (setq selective-display nil)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
701 (make-local-variable 'mode-line-format)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
702 (setq mode-line-format default-mode-line-format)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
703 (display-buffer (current-buffer))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
704 (set-buffer-modified-p diary-modified))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
705 (error "Your diary file is not readable!"))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
706 (error "You don't have a diary file!"))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
707
20345
69818ee01344 (diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 20269
diff changeset
708
69818ee01344 (diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 20269
diff changeset
709
39615
4287ce76bf9f (diary-entry-compare): When times are identical, compare the entries
Sam Steingold <sds@gnu.org>
parents: 38422
diff changeset
710 (defcustom diary-mail-addr
20345
69818ee01344 (diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 20269
diff changeset
711 (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
712 "*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
713 :group 'diary
22683
0941a5743283 (diary-mail-addr): Fix custom type.
Richard M. Stallman <rms@gnu.org>
parents: 22638
diff changeset
714 :type '(choice string (const nil))
21668
621dd51298ec *** empty log message ***
Dan Nicolaescu <done@ece.arizona.edu>
parents: 20354
diff changeset
715 :version "20.3")
20345
69818ee01344 (diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 20269
diff changeset
716
69818ee01344 (diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 20269
diff changeset
717 (defcustom diary-mail-days 7
69818ee01344 (diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 20269
diff changeset
718 "*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
719 :group 'diary
21668
621dd51298ec *** empty log message ***
Dan Nicolaescu <done@ece.arizona.edu>
parents: 20354
diff changeset
720 :type 'integer
621dd51298ec *** empty log message ***
Dan Nicolaescu <done@ece.arizona.edu>
parents: 20354
diff changeset
721 :version "20.3")
20345
69818ee01344 (diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 20269
diff changeset
722
21957
a74e1cee89bf (diary-mail-entries): Add autoload cookie.
Richard M. Stallman <rms@gnu.org>
parents: 21893
diff changeset
723 ;;;###autoload
20345
69818ee01344 (diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 20269
diff changeset
724 (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
725 "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
726 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
727
69818ee01344 (diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 20269
diff changeset
728 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
729 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
730 `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
731 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
732
69818ee01344 (diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 20269
diff changeset
733 #!/bin/sh
69818ee01344 (diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 20269
diff changeset
734 # 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
735 emacs -batch \\
69818ee01344 (diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 20269
diff changeset
736 -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
737 european-calendar-style t \\
69818ee01344 (diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 20269
diff changeset
738 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
739 -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
740 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
741
69818ee01344 (diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 20269
diff changeset
742 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
743 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
744 0 1 * * * diary-rem.sh
69818ee01344 (diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 20269
diff changeset
745 to run it every morning at 1am."
35500
38b437f4134e (diary-float): Fix case of MONTH
Gerd Moellmann <gerd@gnu.org>
parents: 34036
diff changeset
746 (interactive "P")
38b437f4134e (diary-float): Fix case of MONTH
Gerd Moellmann <gerd@gnu.org>
parents: 34036
diff changeset
747 (let* ((diary-display-hook 'fancy-diary-display)
38b437f4134e (diary-float): Fix case of MONTH
Gerd Moellmann <gerd@gnu.org>
parents: 34036
diff changeset
748 (text (progn (list-diary-entries (calendar-current-date)
38b437f4134e (diary-float): Fix case of MONTH
Gerd Moellmann <gerd@gnu.org>
parents: 34036
diff changeset
749 (if ndays ndays diary-mail-days))
38b437f4134e (diary-float): Fix case of MONTH
Gerd Moellmann <gerd@gnu.org>
parents: 34036
diff changeset
750 (set-buffer fancy-diary-buffer)
38b437f4134e (diary-float): Fix case of MONTH
Gerd Moellmann <gerd@gnu.org>
parents: 34036
diff changeset
751 (buffer-substring (point-min) (point-max)))))
46826
e020f18c490a (diary-mail-entries): Use `compose-mail'
Sam Steingold <sds@gnu.org>
parents: 46620
diff changeset
752 (compose-mail diary-mail-addr
47163
88f34e3227e6 (diary-mail-entries): Don't overwrite user's value
Richard M. Stallman <rms@gnu.org>
parents: 46826
diff changeset
753 (if (string-equal text "")
88f34e3227e6 (diary-mail-entries): Don't overwrite user's value
Richard M. Stallman <rms@gnu.org>
parents: 46826
diff changeset
754 "No entries found"
88f34e3227e6 (diary-mail-entries): Don't overwrite user's value
Richard M. Stallman <rms@gnu.org>
parents: 46826
diff changeset
755 (concat "Diary entries generated "
88f34e3227e6 (diary-mail-entries): Don't overwrite user's value
Richard M. Stallman <rms@gnu.org>
parents: 46826
diff changeset
756 (calendar-date-string (calendar-current-date)))))
46826
e020f18c490a (diary-mail-entries): Use `compose-mail'
Sam Steingold <sds@gnu.org>
parents: 46620
diff changeset
757 (insert text)
e020f18c490a (diary-mail-entries): Use `compose-mail'
Sam Steingold <sds@gnu.org>
parents: 46620
diff changeset
758 (funcall (get mail-user-agent 'sendfunc))))
20345
69818ee01344 (diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 20269
diff changeset
759
69818ee01344 (diary-mail-addr, diary-mail-days): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 20269
diff changeset
760
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
761 (defun diary-name-pattern (string-array &optional fullname)
47922
afefa409b756 (diary-name-pattern): Fix typo.
Juanma Barranquero <lekktu@gmail.com>
parents: 47163
diff changeset
762 "Convert a STRING-ARRAY, an array of strings to a pattern.
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
763 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
764 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
765 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
766 name."
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
767 (let ((pattern ""))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
768 (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
769 (setq pattern
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
770 (concat
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
771 pattern
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
772 (if (string-equal pattern "") "" "\\|")
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
773 (aref string-array i)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
774 (if fullname
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
775 ""
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
776 (concat
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
777 "\\|"
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
778 (substring (aref string-array i) 0 3) ".?")))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
779 pattern))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
780
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
781 (defvar marking-diary-entries nil
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
782 "True during the marking of diary entries, nil otherwise.")
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
783
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
784 (defvar marking-diary-entry nil
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
785 "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
786
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
787 (defun mark-diary-entries ()
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
788 "Mark days in the calendar window that have diary entries.
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
789 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
790 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
791 `mark-diary-entries-hook' are run."
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
792 (interactive)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
793 (setq mark-diary-entries-in-calendar t)
49737
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
794 (let (file-glob-attrs
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
795 marks
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
796 (d-file (substitute-in-file-name diary-file))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
797 (marking-diary-entries t))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
798 (if (and d-file (file-exists-p d-file))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
799 (if (file-readable-p d-file)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
800 (save-excursion
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
801 (message "Marking diary entries...")
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
802 (set-buffer (find-file-noselect d-file t))
49737
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
803 (setq file-glob-attrs (nth 1 (diary-pull-attrs nil '())))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
804 (let ((d diary-date-forms)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
805 (old-diary-syntax-table))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
806 (setq old-diary-syntax-table (syntax-table))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
807 (set-syntax-table diary-syntax-table)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
808 (while d
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
809 (let*
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
810 ((date-form (if (equal (car (car d)) 'backup)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
811 (cdr (car d))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
812 (car d)));; ignore 'backup directive
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
813 (dayname (diary-name-pattern calendar-day-name-array))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
814 (monthname
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
815 (concat
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
816 (diary-name-pattern calendar-month-name-array)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
817 "\\|\\*"))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
818 (month "[0-9]+\\|\\*")
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
819 (day "[0-9]+\\|\\*")
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
820 (year "[0-9]+\\|\\*")
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
821 (l (length date-form))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
822 (d-name-pos (- l (length (memq 'dayname date-form))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
823 (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
824 (m-name-pos (- l (length (memq 'monthname date-form))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
825 (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
826 (d-pos (- l (length (memq 'day date-form))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
827 (d-pos (if (/= l d-pos) (+ 2 d-pos)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
828 (m-pos (- l (length (memq 'month date-form))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
829 (m-pos (if (/= l m-pos) (+ 2 m-pos)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
830 (y-pos (- l (length (memq 'year date-form))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
831 (y-pos (if (/= l y-pos) (+ 2 y-pos)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
832 (regexp
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
833 (concat
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
834 "\\(\\`\\|\^M\\|\n\\)\\("
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
835 (mapconcat 'eval date-form "\\)\\(")
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
836 "\\)"))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
837 (case-fold-search t))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
838 (goto-char (point-min))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
839 (while (re-search-forward regexp nil t)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
840 (let* ((dd-name
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
841 (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
842 (buffer-substring-no-properties
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
843 (match-beginning d-name-pos)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
844 (match-end d-name-pos))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
845 (mm-name
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
846 (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
847 (buffer-substring-no-properties
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
848 (match-beginning m-name-pos)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
849 (match-end m-name-pos))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
850 (mm (string-to-int
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
851 (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
852 (buffer-substring-no-properties
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
853 (match-beginning m-pos)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
854 (match-end m-pos))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
855 "")))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
856 (dd (string-to-int
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
857 (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
858 (buffer-substring-no-properties
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
859 (match-beginning d-pos)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
860 (match-end d-pos))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
861 "")))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
862 (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
863 (buffer-substring-no-properties
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
864 (match-beginning y-pos)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
865 (match-end y-pos))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
866 (yy (if (not y-str)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
867 0
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
868 (if (and (= (length y-str) 2)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
869 abbreviated-calendar-year)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
870 (let* ((current-y
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
871 (extract-calendar-year
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
872 (calendar-current-date)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
873 (y (+ (string-to-int y-str)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
874 (* 100
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
875 (/ current-y 100)))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
876 (if (> (- y current-y) 50)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
877 (- y 100)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
878 (if (> (- current-y y) 50)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
879 (+ y 100)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
880 y)))
49737
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
881 (string-to-int y-str))))
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
882 (save-excursion
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
883 (setq entry (buffer-substring-no-properties (point) (line-end-position))
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
884 temp (diary-pull-attrs entry file-glob-attrs)
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
885 entry (nth 0 temp)
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
886 marks (nth 1 temp))))
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
887 (if dd-name
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
888 (mark-calendar-days-named
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
889 (cdr (assoc-ignore-case
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
890 (substring dd-name 0 3)
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
891 (calendar-make-alist
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
892 calendar-day-name-array
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
893 0
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
894 (lambda (x) (substring x 0 3))))) marks)
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
895 (if mm-name
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
896 (if (string-equal mm-name "*")
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
897 (setq mm 0)
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
898 (setq mm
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
899 (cdr (assoc-ignore-case
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
900 (substring mm-name 0 3)
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
901 (calendar-make-alist
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
902 calendar-month-name-array
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
903 1
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
904 (lambda (x) (substring x 0 3)))
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
905 )))))
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
906 (mark-calendar-date-pattern mm dd yy marks))))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
907 (setq d (cdr d))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
908 (mark-sexp-diary-entries)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
909 (run-hooks 'nongregorian-diary-marking-hook
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
910 'mark-diary-entries-hook)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
911 (set-syntax-table old-diary-syntax-table)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
912 (message "Marking diary entries...done")))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
913 (error "Your diary file is not readable!"))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
914 (error "You don't have a diary file!"))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
915
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
916 (defun mark-sexp-diary-entries ()
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
917 "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
918 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
919 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
920 (let* ((sexp-mark (regexp-quote sexp-diary-entry-symbol))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
921 (s-entry (concat "\\(\\`\\|\^M\\|\n\\)\\("
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
922 (regexp-quote sexp-mark) "(\\)\\|\\("
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
923 (regexp-quote diary-nonmarking-symbol)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
924 (regexp-quote sexp-mark) "(diary-remind\\)"))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
925 (m)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
926 (y)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
927 (first-date)
46620
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
928 (last-date)
49737
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
929 (mark)
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
930 file-glob-attrs)
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
931 (setq file-glob-attrs (nth 1 (diary-pull-attrs nil '())))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
932 (save-excursion
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
933 (set-buffer calendar-buffer)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
934 (setq m displayed-month)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
935 (setq y displayed-year))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
936 (increment-calendar-month m y -1)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
937 (setq first-date
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
938 (calendar-absolute-from-gregorian (list m 1 y)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
939 (increment-calendar-month m y 2)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
940 (setq last-date
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
941 (calendar-absolute-from-gregorian
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
942 (list m (calendar-last-day-of-month m y) y)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
943 (goto-char (point-min))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
944 (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
945 (if (char-equal (preceding-char) ?\()
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
946 (setq marking-diary-entry t)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
947 (setq marking-diary-entry nil))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
948 (re-search-backward "(")
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
949 (let ((sexp-start (point))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
950 (sexp)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
951 (entry)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
952 (entry-start)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
953 (line-start))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
954 (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
955 (setq sexp (buffer-substring-no-properties sexp-start (point)))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
956 (save-excursion
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
957 (re-search-backward "\^M\\|\n\\|\\`")
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
958 (setq line-start (point)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
959 (forward-char 1)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
960 (if (and (or (char-equal (preceding-char) ?\^M)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
961 (char-equal (preceding-char) ?\n))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
962 (not (looking-at " \\|\^I")))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
963 (progn;; Diary entry consists only of the sexp
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
964 (backward-char 1)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
965 (setq entry ""))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
966 (setq entry-start (point))
23247
1f91824c4087 (mark-sexp-diary-entries): Fix previous chg.
Karl Heuer <kwzh@gnu.org>
parents: 23232
diff changeset
967 ;; Find end of entry
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
968 (re-search-forward "\^M\\|\n" nil t)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
969 (while (looking-at " \\|\^I")
23232
97332957a969 (mark-sexp-diary-entries): Avoid infinite loop when
Karl Heuer <kwzh@gnu.org>
parents: 23122
diff changeset
970 (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
971 (re-search-forward "$" nil t)))
23247
1f91824c4087 (mark-sexp-diary-entries): Fix previous chg.
Karl Heuer <kwzh@gnu.org>
parents: 23232
diff changeset
972 (if (or (char-equal (preceding-char) ?\^M)
1f91824c4087 (mark-sexp-diary-entries): Fix previous chg.
Karl Heuer <kwzh@gnu.org>
parents: 23232
diff changeset
973 (char-equal (preceding-char) ?\n))
1f91824c4087 (mark-sexp-diary-entries): Fix previous chg.
Karl Heuer <kwzh@gnu.org>
parents: 23232
diff changeset
974 (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
975 (setq entry (buffer-substring-no-properties entry-start (point)))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
976 (while (string-match "[\^M]" entry)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
977 (aset entry (match-beginning 0) ?\n )))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
978 (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
979 (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
980 (calendar-gregorian-from-absolute date)))
49737
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
981 (progn
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
982 (setq marks (diary-pull-attrs entry file-glob-attrs)
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
983 temp (diary-pull-attrs entry file-glob-attrs)
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
984 marks (nth 1 temp))
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
985 (mark-visible-calendar-date
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
986 (calendar-gregorian-from-absolute date)
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
987 (if (< 0 (length marks))
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
988 marks
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
989 (if (consp mark)
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
990 (car mark)))))))))))
13053
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 (defun mark-included-diary-files ()
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
993 "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
994 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
995 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
996 specified in the diary-file by lines of this form:
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
997 #include \"filename\"
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
998 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
999 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
1000 changing the variable `diary-include-string'."
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1001 (goto-char (point-min))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1002 (while (re-search-forward
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1003 (concat
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1004 "\\(\\`\\|\^M\\|\n\\)"
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1005 (regexp-quote diary-include-string)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1006 " \"\\([^\"]*\\)\"")
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1007 nil t)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1008 (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
1009 (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
1010 (match-beginning 2) (match-end 2))))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1011 (mark-diary-entries-hook 'mark-included-diary-files))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1012 (if (file-exists-p diary-file)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1013 (if (file-readable-p diary-file)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1014 (progn
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1015 (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
1016 (kill-buffer (find-buffer-visiting diary-file)))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1017 (beep)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1018 (message "Can't read included diary file %s" diary-file)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1019 (sleep-for 2))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1020 (beep)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1021 (message "Can't find included diary file %s" diary-file)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1022 (sleep-for 2))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1023 (goto-char (point-min)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1024
49737
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
1025 (defun mark-calendar-days-named (dayname &optional color)
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1026 "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
1027 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
1028 (save-excursion
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1029 (set-buffer calendar-buffer)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1030 (let ((prev-month displayed-month)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1031 (prev-year displayed-year)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1032 (succ-month displayed-month)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1033 (succ-year displayed-year)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1034 (last-day)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1035 (day))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1036 (increment-calendar-month succ-month succ-year 1)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1037 (increment-calendar-month prev-month prev-year -1)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1038 (setq day (calendar-absolute-from-gregorian
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1039 (calendar-nth-named-day 1 dayname prev-month prev-year)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1040 (setq last-day (calendar-absolute-from-gregorian
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1041 (calendar-nth-named-day -1 dayname succ-month succ-year)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1042 (while (<= day last-day)
49737
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
1043 (mark-visible-calendar-date (calendar-gregorian-from-absolute day) color)
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1044 (setq day (+ day 7))))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1045
49737
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
1046 (defun mark-calendar-date-pattern (month day year &optional color)
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1047 "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
1048 A value of 0 in any position is a wildcard."
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1049 (save-excursion
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1050 (set-buffer calendar-buffer)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1051 (let ((m displayed-month)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1052 (y displayed-year))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1053 (increment-calendar-month m y -1)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1054 (calendar-for-loop i from 0 to 2 do
49737
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
1055 (mark-calendar-month m y month day year color)
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1056 (increment-calendar-month m y 1)))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1057
49737
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
1058 (defun mark-calendar-month (month year p-month p-day p-year &optional color)
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1059 "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
1060 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
1061 (if (or (and (= month p-month)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1062 (or (= p-year 0) (= year p-year)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1063 (and (= p-month 0)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1064 (or (= p-year 0) (= year p-year))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1065 (if (= p-day 0)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1066 (calendar-for-loop
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1067 i from 1 to (calendar-last-day-of-month month year) do
49737
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
1068 (mark-visible-calendar-date (list month i year) color))
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
1069 (mark-visible-calendar-date (list month p-day year) color))))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1070
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1071 (defun sort-diary-entries ()
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1072 "Sort the list of diary entries by time of day."
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1073 (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
1074
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1075 (defun diary-entry-compare (e1 e2)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1076 "Returns t if E1 is earlier than E2."
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1077 (or (calendar-date-compare e1 e2)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1078 (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
1079 (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
1080 (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
1081 (or (< t1 t2)
4287ce76bf9f (diary-entry-compare): When times are identical, compare the entries
Sam Steingold <sds@gnu.org>
parents: 38422
diff changeset
1082 (and (= t1 t2)
4287ce76bf9f (diary-entry-compare): When times are identical, compare the entries
Sam Steingold <sds@gnu.org>
parents: 38422
diff changeset
1083 (string-lessp ts1 ts2)))))))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1084
20269
ca337d0a1553 (list-diary-entries, list-sexp-diary-entries, add-to-diary-list):
Karl Heuer <kwzh@gnu.org>
parents: 19324
diff changeset
1085 (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
1086 -9999
ca337d0a1553 (list-diary-entries, list-sexp-diary-entries, add-to-diary-list):
Karl Heuer <kwzh@gnu.org>
parents: 19324
diff changeset
1087 "*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
1088 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
1089 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
1090 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
1091 :type 'integer
21669
9861518505cb *** empty log message ***
Dan Nicolaescu <done@ece.arizona.edu>
parents: 21668
diff changeset
1092 :group 'diary
9861518505cb *** empty log message ***
Dan Nicolaescu <done@ece.arizona.edu>
parents: 21668
diff changeset
1093 :version "20.3")
39615
4287ce76bf9f (diary-entry-compare): When times are identical, compare the entries
Sam Steingold <sds@gnu.org>
parents: 38422
diff changeset
1094
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1095 (defun diary-entry-time (s)
46620
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
1096 "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
1097 For example, returns 1325 for 1:25pm.
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
1098 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
1099 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
1100 or XX:XXPM."
19324
02a8fe146fa6 (diary-entry-time): Bind case-fold-search to nil.
Richard M. Stallman <rms@gnu.org>
parents: 18922
diff changeset
1101 (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
1102 (cond ((string-match ; Military time
34036
c2a8edb5b5ec (diary-entry-time): Anchor pattern correctly
Gerd Moellmann <gerd@gnu.org>
parents: 32415
diff changeset
1103 "\\`[ \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
1104 (+ (* 100 (string-to-int
02a8fe146fa6 (diary-entry-time): Bind case-fold-search to nil.
Richard M. Stallman <rms@gnu.org>
parents: 18922
diff changeset
1105 (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
1106 (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
1107 ((string-match ; Hour only XXam or XXpm
34036
c2a8edb5b5ec (diary-entry-time): Anchor pattern correctly
Gerd Moellmann <gerd@gnu.org>
parents: 32415
diff changeset
1108 "\\`[ \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
1109 (+ (* 100 (% (string-to-int
02a8fe146fa6 (diary-entry-time): Bind case-fold-search to nil.
Richard M. Stallman <rms@gnu.org>
parents: 18922
diff changeset
1110 (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
1111 12))
02a8fe146fa6 (diary-entry-time): Bind case-fold-search to nil.
Richard M. Stallman <rms@gnu.org>
parents: 18922
diff changeset
1112 (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
1113 0 1200)))
39615
4287ce76bf9f (diary-entry-compare): When times are identical, compare the entries
Sam Steingold <sds@gnu.org>
parents: 38422
diff changeset
1114 ((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
1115 "\\`[ \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
1116 (+ (* 100 (% (string-to-int
02a8fe146fa6 (diary-entry-time): Bind case-fold-search to nil.
Richard M. Stallman <rms@gnu.org>
parents: 18922
diff changeset
1117 (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
1118 12))
02a8fe146fa6 (diary-entry-time): Bind case-fold-search to nil.
Richard M. Stallman <rms@gnu.org>
parents: 18922
diff changeset
1119 (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
1120 (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
1121 0 1200)))
39615
4287ce76bf9f (diary-entry-compare): When times are identical, compare the entries
Sam Steingold <sds@gnu.org>
parents: 38422
diff changeset
1122 (t diary-unknown-time)))) ; Unrecognizable
34036
c2a8edb5b5ec (diary-entry-time): Anchor pattern correctly
Gerd Moellmann <gerd@gnu.org>
parents: 32415
diff changeset
1123
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1124 (defun list-sexp-diary-entries (date)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1125 "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
1126 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
1127 found.
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1128
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1129 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
1130 `%%'). The form of a sexp diary entry is
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1131
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1132 %%(SEXP) ENTRY
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1133
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1134 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
1135 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
1136 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
1137 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
1138
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1139 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
1140 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
1141
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1142 &%%(let ((dayname (calendar-day-of-week date))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1143 (day (extract-calendar-day date)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1144 (or
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1145 (and (= day 21) (memq dayname '(1 2 3 4 5)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1146 (and (memq day '(19 20)) (= dayname 5)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1147 ) UIUC pay checks deposited
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1148
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1149 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
1150
46620
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
1151 %%(diary-date MONTH DAY YEAR &optional MARK) text
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1152 Entry applies if date is MONTH, DAY, YEAR if
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1153 `european-calendar-style' is nil, and DAY, MONTH, YEAR if
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1154 `european-calendar-style' is t. DAY, MONTH, and YEAR
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1155 can be lists of integers, the constant t, or an integer.
46826
e020f18c490a (diary-mail-entries): Use `compose-mail'
Sam Steingold <sds@gnu.org>
parents: 46620
diff changeset
1156 The constant t means all values. An optional parameter
46620
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
1157 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
1158 when highlighting the day in the calendar.
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1159
46620
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
1160 %%(diary-float MONTH DAYNAME N &optional DAY MARK) text
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1161 Entry will appear on the Nth DAYNAME of MONTH.
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1162 (DAYNAME=0 means Sunday, 1 means Monday, and so on;
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1163 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
1164 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
1165 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
1166 Nth DAYNAME of MONTH on or after/before DAY. DAY defaults
46826
e020f18c490a (diary-mail-entries): Use `compose-mail'
Sam Steingold <sds@gnu.org>
parents: 46620
diff changeset
1167 to 1 if N>0 and the last day of the month if N<0. An
e020f18c490a (diary-mail-entries): Use `compose-mail'
Sam Steingold <sds@gnu.org>
parents: 46620
diff changeset
1168 optional parameter MARK specifies a face or single-character
46620
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
1169 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
1170
46620
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
1171 %%(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
1172 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
1173 inclusive. (If `european-calendar-style' is t, the
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1174 order of the parameters should be changed to D1, M1, Y1,
46826
e020f18c490a (diary-mail-entries): Use `compose-mail'
Sam Steingold <sds@gnu.org>
parents: 46620
diff changeset
1175 D2, M2, Y2.) An optional parameter MARK specifies a face
e020f18c490a (diary-mail-entries): Use `compose-mail'
Sam Steingold <sds@gnu.org>
parents: 46620
diff changeset
1176 or single-character string to use when highlighting the
46620
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
1177 day in the calendar.
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1178
46620
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
1179 %%(diary-anniversary MONTH DAY YEAR &optional MARK) text
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1180 Entry will appear on anniversary dates of MONTH DAY, YEAR.
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1181 (If `european-calendar-style' is t, the order of the
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1182 parameters should be changed to DAY, MONTH, YEAR.) Text
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1183 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
1184 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
1185 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
1186 `rd' or `th', as appropriate. The anniversary of February
46826
e020f18c490a (diary-mail-entries): Use `compose-mail'
Sam Steingold <sds@gnu.org>
parents: 46620
diff changeset
1187 29 is considered to be March 1 in a non-leap year. An
e020f18c490a (diary-mail-entries): Use `compose-mail'
Sam Steingold <sds@gnu.org>
parents: 46620
diff changeset
1188 optional parameter MARK specifies a face or single-character
46620
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
1189 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
1190
46620
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
1191 %%(diary-cyclic N MONTH DAY YEAR &optional MARK) text
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1192 Entry will appear every N days, starting MONTH DAY, YEAR.
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1193 (If `european-calendar-style' is t, the order of the
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1194 parameters should be changed to N, DAY, MONTH, YEAR.) Text
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1195 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
1196 of repetitions since the MONTH DAY, YEAR and %s will
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1197 be replaced by the ordinal ending of that number (that is,
46826
e020f18c490a (diary-mail-entries): Use `compose-mail'
Sam Steingold <sds@gnu.org>
parents: 46620
diff changeset
1198 `st', `nd', `rd' or `th', as appropriate. An optional
e020f18c490a (diary-mail-entries): Use `compose-mail'
Sam Steingold <sds@gnu.org>
parents: 46620
diff changeset
1199 parameter MARK specifies a face or single-character string
46620
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
1200 to use when highlighting the day in the calendar.
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1201
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1202 %%(diary-remind SEXP DAYS &optional MARKING) text
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1203 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
1204 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
1205 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
1206 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
1207 indicated by EXPR, then a suitable message (as specified
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1208 by `diary-remind-message') appears. In addition to the
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1209 reminders beforehand, the diary entry also appears on
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1210 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
1211 *reminders* are marked on the calendar. Marking of
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1212 reminders is independent of whether the entry *itself* is
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1213 a marking or nonmarking one.
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1214
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1215 %%(diary-day-of-year)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1216 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
1217 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
1218 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
1219 fancy diary display is used.
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1220
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1221 %%(diary-iso-date)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1222 Diary entries giving the corresponding ISO commercial date
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1223 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
1224 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
1225
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1226 %%(diary-french-date)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1227 Diary entries giving the corresponding French Revolutionary
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1228 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
1229 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
1230
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1231 %%(diary-islamic-date)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1232 Diary entries giving the corresponding Islamic date will be
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1233 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
1234 makes sense only if the fancy diary display is used.
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1235
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1236 %%(diary-hebrew-date)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1237 Diary entries giving the corresponding Hebrew date will be
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1238 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
1239 makes sense only if the fancy diary display is used.
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1240
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1241 %%(diary-astro-day-number) Diary entries giving the corresponding
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1242 astronomical (Julian) day number will be made every day.
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1243 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
1244 fancy diary display is used.
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1245
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1246 %%(diary-julian-date) Diary entries giving the corresponding
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1247 Julian date will be made every day. Note that since
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1248 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
1249 display is used.
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1250
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1251 %%(diary-sunrise-sunset)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1252 Diary entries giving the local times of sunrise and sunset
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1253 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
1254 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
1255 Floating point required.
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1256
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1257 %%(diary-phases-of-moon)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1258 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
1259 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
1260 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
1261 Floating point required.
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1262
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1263 %%(diary-yahrzeit MONTH DAY YEAR) text
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1264 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
1265 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
1266 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
1267 day before. (If `european-calendar-style' is t, the order
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1268 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
1269
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1270 %%(diary-rosh-hodesh)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1271 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
1272 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
1273 makes sense only if the fancy diary display is used.
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1274
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1275 %%(diary-parasha)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1276 Diary entries giving the weekly parasha will be made on
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1277 every Saturday. Note that since there is no text, it
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1278 makes sense only if the fancy diary display is used.
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1279
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1280 %%(diary-omer)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1281 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
1282 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
1283 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
1284
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1285 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
1286 best if they are nonmarking."
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1287 (let* ((mark (regexp-quote diary-nonmarking-symbol))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1288 (sexp-mark (regexp-quote sexp-diary-entry-symbol))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1289 (s-entry (concat "\\(\\`\\|\^M\\|\n\\)" mark "?" sexp-mark "("))
49737
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
1290 (entry-found)
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
1291 (file-glob-attrs)
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
1292 (marks))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1293 (goto-char (point-min))
49737
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
1294 (save-excursion
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
1295 (setq file-glob-attrs (nth 1 (diary-pull-attrs nil '()))))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1296 (while (re-search-forward s-entry nil t)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1297 (backward-char 1)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1298 (let ((sexp-start (point))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1299 (sexp)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1300 (entry)
20269
ca337d0a1553 (list-diary-entries, list-sexp-diary-entries, add-to-diary-list):
Karl Heuer <kwzh@gnu.org>
parents: 19324
diff changeset
1301 (specifier)
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1302 (entry-start)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1303 (line-start))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1304 (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
1305 (setq sexp (buffer-substring-no-properties sexp-start (point)))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1306 (save-excursion
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1307 (re-search-backward "\^M\\|\n\\|\\`")
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1308 (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
1309 (setq specifier
48365
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1310 (buffer-substring-no-properties (1+ line-start) (point))
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1311 entry-start (1+ line-start))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1312 (forward-char 1)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1313 (if (and (or (char-equal (preceding-char) ?\^M)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1314 (char-equal (preceding-char) ?\n))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1315 (not (looking-at " \\|\^I")))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1316 (progn;; Diary entry consists only of the sexp
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1317 (backward-char 1)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1318 (setq entry ""))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1319 (setq entry-start (point))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1320 (re-search-forward "\^M\\|\n" nil t)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1321 (while (looking-at " \\|\^I")
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1322 (re-search-forward "\^M\\|\n" nil t))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1323 (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
1324 (setq entry (buffer-substring-no-properties entry-start (point)))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1325 (while (string-match "[\^M]" entry)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1326 (aset entry (match-beginning 0) ?\n )))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1327 (let ((diary-entry (diary-sexp-entry sexp entry date)))
49737
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
1328 (setq entry (if (consp diary-entry)
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
1329 (cdr diary-entry)
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
1330 diary-entry))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1331 (if diary-entry
49737
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
1332 (progn
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
1333 (subst-char-in-region line-start (point) ?\^M ?\n t)
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
1334 (if (< 0 (length entry))
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
1335 (setq temp (diary-pull-attrs entry file-glob-attrs)
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
1336 entry (nth 0 temp)
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
1337 marks (nth 1 temp)))))
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
1338 (add-to-diary-list date
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
1339 entry
48365
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1340 specifier
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1341 (if entry-start (copy-marker entry-start)
49737
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
1342 nil)
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
1343 marks)
46620
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
1344 (setq entry-found (or entry-found diary-entry)))))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1345 entry-found))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1346
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1347 (defun diary-sexp-entry (sexp entry date)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1348 "Process a SEXP diary ENTRY for DATE."
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1349 (let ((result (if calendar-debug-sexp
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1350 (let ((stack-trace-on-error t))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1351 (eval (car (read-from-string sexp))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1352 (condition-case nil
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1353 (eval (car (read-from-string sexp)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1354 (error
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1355 (beep)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1356 (message "Bad sexp at line %d in %s: %s"
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1357 (save-excursion
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1358 (save-restriction
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1359 (narrow-to-region 1 (point))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1360 (goto-char (point-min))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1361 (let ((lines 1))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1362 (while (re-search-forward "\n\\|\^M" nil t)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1363 (setq lines (1+ lines)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1364 lines)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1365 diary-file sexp)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1366 (sleep-for 2))))))
46620
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
1367 (cond ((stringp result) result)
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
1368 ((and (consp result)
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
1369 (stringp (cdr result))) result)
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
1370 (result entry)
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
1371 (t nil))))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1372
46620
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
1373 (defun diary-date (month day year &optional mark)
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1374 "Specific date(s) diary entry.
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1375 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
1376 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
1377 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
1378 all values.
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
1379
46826
e020f18c490a (diary-mail-entries): Use `compose-mail'
Sam Steingold <sds@gnu.org>
parents: 46620
diff changeset
1380 An optional parameter MARK specifies a face or single-character string to
46620
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
1381 use when highlighting the day in the calendar."
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1382 (let* ((dd (if european-calendar-style
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1383 month
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1384 day))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1385 (mm (if european-calendar-style
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1386 day
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1387 month))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1388 (m (extract-calendar-month date))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1389 (y (extract-calendar-year date))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1390 (d (extract-calendar-day date)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1391 (if (and
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1392 (or (and (listp dd) (memq d dd))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1393 (equal d dd)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1394 (eq dd t))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1395 (or (and (listp mm) (memq m mm))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1396 (equal m mm)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1397 (eq mm t))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1398 (or (and (listp year) (memq y year))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1399 (equal y year)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1400 (eq year t)))
48365
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1401 (cons mark entry))))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1402
46620
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
1403 (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
1404 "Block diary entry.
42513
22938e0c54b2 (diary-block): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 41566
diff changeset
1405 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
1406 The order of the parameters is
23122
07b9777e6713 (diary-block): Doc fix..
Karl Heuer <kwzh@gnu.org>
parents: 22683
diff changeset
1407 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
1408 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
1409
46826
e020f18c490a (diary-mail-entries): Use `compose-mail'
Sam Steingold <sds@gnu.org>
parents: 46620
diff changeset
1410 An optional parameter MARK specifies a face or single-character string to
46620
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
1411 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
1412
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1413 (let ((date1 (calendar-absolute-from-gregorian
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1414 (if european-calendar-style
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1415 (list d1 m1 y1)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1416 (list m1 d1 y1))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1417 (date2 (calendar-absolute-from-gregorian
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1418 (if european-calendar-style
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1419 (list d2 m2 y2)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1420 (list m2 d2 y2))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1421 (d (calendar-absolute-from-gregorian date)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1422 (if (and (<= date1 d) (<= d date2))
46620
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
1423 (cons mark entry))))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1424
46620
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
1425 (defun diary-float (month dayname n &optional day mark)
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1426 "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
1427 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
1428 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
1429 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
1430
46620
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
1431 An optional parameter DAY means the Nth DAYNAME on or after/before MONTH DAY.
46826
e020f18c490a (diary-mail-entries): Use `compose-mail'
Sam Steingold <sds@gnu.org>
parents: 46620
diff changeset
1432 Optional MARK specifies a face or single-character string to use when
46620
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
1433 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
1434 ;; 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
1435 ;; 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
1436 ;; 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
1437 ;; more grotesque.
b3514551f08d (diary-float): Rewritten to fix bug when base date
Richard M. Stallman <rms@gnu.org>
parents: 17626
diff changeset
1438 (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
1439 (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
1440 (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
1441 (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
1442 (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
1443 (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
1444 (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
1445 (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
1446 (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
1447 (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
1448 ; 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
1449 (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
1450 (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
1451 (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
1452 ; 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
1453 (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
1454 (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
1455 (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
1456 (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
1457 (or (eq month t)
38b437f4134e (diary-float): Fix case of MONTH
Gerd Moellmann <gerd@gnu.org>
parents: 34036
diff changeset
1458 (if (listp month)
38b437f4134e (diary-float): Fix case of MONTH
Gerd Moellmann <gerd@gnu.org>
parents: 34036
diff changeset
1459 (memq m1 month)
38b437f4134e (diary-float): Fix case of MONTH
Gerd Moellmann <gerd@gnu.org>
parents: 34036
diff changeset
1460 (= m1 month)))
18590
7d2a26d2371d (diary-float): Fix errors in previous change.
Richard M. Stallman <rms@gnu.org>
parents: 17892
diff changeset
1461 (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
1462 1
7d2a26d2371d (diary-float): Fix errors in previous change.
Richard M. Stallman <rms@gnu.org>
parents: 17892
diff changeset
1463 (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
1464 (and (<= d1 d) (<= d d2))))
7d2a26d2371d (diary-float): Fix errors in previous change.
Richard M. Stallman <rms@gnu.org>
parents: 17892
diff changeset
1465 ;; 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
1466 (and (or (< y1 y2)
6a6bb17fba97 (diary-float): Better fix of end-of-year error.
Richard M. Stallman <rms@gnu.org>
parents: 23908
diff changeset
1467 (and (= y1 y2) (< m1 m2)))
18590
7d2a26d2371d (diary-float): Fix errors in previous change.
Richard M. Stallman <rms@gnu.org>
parents: 17892
diff changeset
1468 (or
23908
2a56bdf4cef7 (diary-float): Fix end-of-year error and typos in comments.
Karl Heuer <kwzh@gnu.org>
parents: 23247
diff changeset
1469 ;; 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
1470 (and
35500
38b437f4134e (diary-float): Fix case of MONTH
Gerd Moellmann <gerd@gnu.org>
parents: 34036
diff changeset
1471 (or (eq month t)
38b437f4134e (diary-float): Fix case of MONTH
Gerd Moellmann <gerd@gnu.org>
parents: 34036
diff changeset
1472 (if (listp month)
38b437f4134e (diary-float): Fix case of MONTH
Gerd Moellmann <gerd@gnu.org>
parents: 34036
diff changeset
1473 (memq m1 month)
38b437f4134e (diary-float): Fix case of MONTH
Gerd Moellmann <gerd@gnu.org>
parents: 34036
diff changeset
1474 (= m1 month)))
18590
7d2a26d2371d (diary-float): Fix errors in previous change.
Richard M. Stallman <rms@gnu.org>
parents: 17892
diff changeset
1475 (<= d1 (or day (if (> n 0)
7d2a26d2371d (diary-float): Fix errors in previous change.
Richard M. Stallman <rms@gnu.org>
parents: 17892
diff changeset
1476 1
7d2a26d2371d (diary-float): Fix errors in previous change.
Richard M. Stallman <rms@gnu.org>
parents: 17892
diff changeset
1477 (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
1478 ;; m2, d2 works as a base date
35500
38b437f4134e (diary-float): Fix case of MONTH
Gerd Moellmann <gerd@gnu.org>
parents: 34036
diff changeset
1479 (and (or (eq month t)
38b437f4134e (diary-float): Fix case of MONTH
Gerd Moellmann <gerd@gnu.org>
parents: 34036
diff changeset
1480 (if (listp month)
38b437f4134e (diary-float): Fix case of MONTH
Gerd Moellmann <gerd@gnu.org>
parents: 34036
diff changeset
1481 (memq m2 month)
38b437f4134e (diary-float): Fix case of MONTH
Gerd Moellmann <gerd@gnu.org>
parents: 34036
diff changeset
1482 (= m2 month)))
18590
7d2a26d2371d (diary-float): Fix errors in previous change.
Richard M. Stallman <rms@gnu.org>
parents: 17892
diff changeset
1483 (<= (or day (if (> n 0)
7d2a26d2371d (diary-float): Fix errors in previous change.
Richard M. Stallman <rms@gnu.org>
parents: 17892
diff changeset
1484 1
7d2a26d2371d (diary-float): Fix errors in previous change.
Richard M. Stallman <rms@gnu.org>
parents: 17892
diff changeset
1485 (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
1486 d2)))))
46620
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
1487 (cons mark entry)))))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1488
35500
38b437f4134e (diary-float): Fix case of MONTH
Gerd Moellmann <gerd@gnu.org>
parents: 34036
diff changeset
1489
46620
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
1490 (defun diary-anniversary (month day year &optional mark)
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1491 "Anniversary diary entry.
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1492 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
1493 `european-calendar-style' is nil, and DAY, MONTH, YEAR if
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1494 `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
1495 %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
1496 %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
1497 `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
1498 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
1499
46826
e020f18c490a (diary-mail-entries): Use `compose-mail'
Sam Steingold <sds@gnu.org>
parents: 46620
diff changeset
1500 An optional parameter MARK specifies a face or single-character string to
46620
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
1501 use when highlighting the day in the calendar."
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1502 (let* ((d (if european-calendar-style
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1503 month
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1504 day))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1505 (m (if european-calendar-style
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1506 day
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1507 month))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1508 (y (extract-calendar-year date))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1509 (diff (- y year)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1510 (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
1511 (setq m 3
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1512 d 1))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1513 (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
1514 (cons mark (format entry diff (diary-ordinal-suffix diff))))))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1515
46620
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
1516 (defun diary-cyclic (n month day year &optional mark)
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1517 "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
1518 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
1519 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
1520 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
1521 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
1522 appropriate.
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
1523
46826
e020f18c490a (diary-mail-entries): Use `compose-mail'
Sam Steingold <sds@gnu.org>
parents: 46620
diff changeset
1524 An optional parameter MARK specifies a face or single-character string to
46620
f367f20901c0 (mark-sexp-diary-entries): Retrieve mark
Richard M. Stallman <rms@gnu.org>
parents: 44732
diff changeset
1525 use when highlighting the day in the calendar."
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1526 (let* ((d (if european-calendar-style
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1527 month
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1528 day))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1529 (m (if european-calendar-style
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1530 day
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1531 month))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1532 (diff (- (calendar-absolute-from-gregorian date)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1533 (calendar-absolute-from-gregorian
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1534 (list m d year))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1535 (cycle (/ diff n)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1536 (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
1537 (cons mark (format entry cycle (diary-ordinal-suffix cycle))))))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1538
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1539 (defun diary-ordinal-suffix (n)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1540 "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
1541 (if (or (memq (% n 100) '(11 12 13))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1542 (< 3 (% n 10)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1543 "th"
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1544 (aref ["th" "st" "nd" "rd"] (% n 10))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1545
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1546 (defun diary-day-of-year ()
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1547 "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
1548 (calendar-day-of-year-string date))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1549
17626
68cce262538d Use defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 16545
diff changeset
1550 (defcustom diary-remind-message
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1551 '("Reminder: Only "
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1552 (if (= 0 (% days 7))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1553 (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
1554 (concat (int-to-string days) (if (= 1 days) " day" " days")))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1555 " until "
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1556 diary-entry)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1557 "*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
1558 display.
39615
4287ce76bf9f (diary-entry-compare): When times are identical, compare the entries
Sam Steingold <sds@gnu.org>
parents: 38422
diff changeset
1559
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1560 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
1561 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
1562 month, day, year), and `diary-entry' (a string)."
68cce262538d Use defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 16545
diff changeset
1563 :type 'sexp
68cce262538d Use defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 16545
diff changeset
1564 :group 'diary)
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1565
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1566 (defun diary-remind (sexp days &optional marking)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1567 "Provide a reminder of a diary entry.
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1568 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
1569 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
1570 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
1571 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
1572 returned.
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1573
24684
cca41b0e7ae7 (diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents: 24192
diff changeset
1574 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
1575 date itself.
cca41b0e7ae7 (diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents: 24192
diff changeset
1576
cca41b0e7ae7 (diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents: 24192
diff changeset
1577 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
1578 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
1579 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
1580 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
1581 marked on the calendar."
cca41b0e7ae7 (diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents: 24192
diff changeset
1582 (let ((diary-entry (eval sexp)))
cca41b0e7ae7 (diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents: 24192
diff changeset
1583 (cond
cca41b0e7ae7 (diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents: 24192
diff changeset
1584 ;; Diary entry applies on date
cca41b0e7ae7 (diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents: 24192
diff changeset
1585 ((and diary-entry
cca41b0e7ae7 (diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents: 24192
diff changeset
1586 (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
1587 diary-entry)
cca41b0e7ae7 (diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents: 24192
diff changeset
1588 ;; 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
1589 ((and (integerp days)
cca41b0e7ae7 (diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents: 24192
diff changeset
1590 (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
1591 (or (not marking-diary-entries) marking))
cca41b0e7ae7 (diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents: 24192
diff changeset
1592 (let ((date (calendar-gregorian-from-absolute
cca41b0e7ae7 (diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents: 24192
diff changeset
1593 (+ (calendar-absolute-from-gregorian date) days))))
cca41b0e7ae7 (diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents: 24192
diff changeset
1594 (if (setq diary-entry (eval sexp))
cca41b0e7ae7 (diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents: 24192
diff changeset
1595 (mapconcat 'eval diary-remind-message ""))))
cca41b0e7ae7 (diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents: 24192
diff changeset
1596 ;; 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
1597 ((and (listp days) days)
cca41b0e7ae7 (diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents: 24192
diff changeset
1598 (or (diary-remind sexp (car days) marking)
cca41b0e7ae7 (diary-remind): Rewritten to behave sensibly for
Karl Heuer <kwzh@gnu.org>
parents: 24192
diff changeset
1599 (diary-remind sexp (cdr days) marking))))))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1600
49737
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
1601 (defun add-to-diary-list (date string specifier marker &optional globcolor)
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
1602 "Add the entry (DATE STRING SPECIFIER MARKER GLOBCOLOR) to `diary-entries-list'.
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1603 Do nothing if DATE or STRING is nil."
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1604 (and date string
49737
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
1605 (if (and diary-file-name-prefix
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
1606 (setq prefix (concat "[" (funcall diary-file-name-prefix-function (buffer-file-name)) "] "))
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
1607 (not (string= prefix "[] ")))
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
1608 (setq string (concat prefix string))
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
1609 t)
39615
4287ce76bf9f (diary-entry-compare): When times are identical, compare the entries
Sam Steingold <sds@gnu.org>
parents: 38422
diff changeset
1610 (setq diary-entries-list
48365
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1611 (append diary-entries-list
49737
a8a5fd61aada (diary-attrtype-convert): Convert an attribute value string to the desired type.
Juanma Barranquero <lekktu@gmail.com>
parents: 49598
diff changeset
1612 (list (list date string specifier marker globcolor))))))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1613
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1614 (defun make-diary-entry (string &optional nonmarking file)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1615 "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
1616 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
1617 (find-file-other-window
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1618 (substitute-in-file-name (if file file diary-file)))
48312
67f6a633fe52 calendar/diary-lib.el (make-diary-entry): Allow for local variables at end of
Juanma Barranquero <lekktu@gmail.com>
parents: 47922
diff changeset
1619 (widen)
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1620 (goto-char (point-max))
48312
67f6a633fe52 calendar/diary-lib.el (make-diary-entry): Allow for local variables at end of
Juanma Barranquero <lekktu@gmail.com>
parents: 47922
diff changeset
1621 (when (let ((case-fold-search t))
67f6a633fe52 calendar/diary-lib.el (make-diary-entry): Allow for local variables at end of
Juanma Barranquero <lekktu@gmail.com>
parents: 47922
diff changeset
1622 (search-backward "Local Variables:"
67f6a633fe52 calendar/diary-lib.el (make-diary-entry): Allow for local variables at end of
Juanma Barranquero <lekktu@gmail.com>
parents: 47922
diff changeset
1623 (max (- (point-max) 3000) (point-min))
67f6a633fe52 calendar/diary-lib.el (make-diary-entry): Allow for local variables at end of
Juanma Barranquero <lekktu@gmail.com>
parents: 47922
diff changeset
1624 t))
67f6a633fe52 calendar/diary-lib.el (make-diary-entry): Allow for local variables at end of
Juanma Barranquero <lekktu@gmail.com>
parents: 47922
diff changeset
1625 (beginning-of-line)
67f6a633fe52 calendar/diary-lib.el (make-diary-entry): Allow for local variables at end of
Juanma Barranquero <lekktu@gmail.com>
parents: 47922
diff changeset
1626 (insert "\n")
67f6a633fe52 calendar/diary-lib.el (make-diary-entry): Allow for local variables at end of
Juanma Barranquero <lekktu@gmail.com>
parents: 47922
diff changeset
1627 (previous-line 1))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1628 (insert
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1629 (if (bolp) "" "\n")
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1630 (if nonmarking diary-nonmarking-symbol "")
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1631 string " "))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1632
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1633 (defun insert-diary-entry (arg)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1634 "Insert a diary entry for the date indicated by point.
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1635 Prefix arg will make the entry nonmarking."
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1636 (interactive "P")
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1637 (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
1638 arg))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1639
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1640 (defun insert-weekly-diary-entry (arg)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1641 "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
1642 Prefix arg will make the entry nonmarking."
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1643 (interactive "P")
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1644 (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
1645 arg))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1646
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1647 (defun insert-monthly-diary-entry (arg)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1648 "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
1649 Prefix arg will make the entry nonmarking."
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1650 (interactive "P")
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1651 (let* ((calendar-date-display-form
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1652 (if european-calendar-style
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1653 '(day " * ")
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1654 '("* " day))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1655 (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
1656 arg)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1657
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1658 (defun insert-yearly-diary-entry (arg)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1659 "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
1660 Prefix arg will make the entry nonmarking."
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1661 (interactive "P")
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1662 (let* ((calendar-date-display-form
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1663 (if european-calendar-style
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1664 '(day " " monthname)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1665 '(monthname " " day))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1666 (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
1667 arg)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1668
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1669 (defun insert-anniversary-diary-entry (arg)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1670 "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
1671 Prefix arg will make the entry nonmarking."
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1672 (interactive "P")
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1673 (let* ((calendar-date-display-form
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1674 (if european-calendar-style
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1675 '(day " " month " " year)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1676 '(month " " day " " year))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1677 (make-diary-entry
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1678 (format "%s(diary-anniversary %s)"
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1679 sexp-diary-entry-symbol
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1680 (calendar-date-string (calendar-cursor-to-date t) nil t))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1681 arg)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1682
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1683 (defun insert-block-diary-entry (arg)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1684 "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
1685 Prefix arg will make the entry nonmarking."
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1686 (interactive "P")
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1687 (let* ((calendar-date-display-form
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1688 (if european-calendar-style
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1689 '(day " " month " " year)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1690 '(month " " day " " year)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1691 (cursor (calendar-cursor-to-date t))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1692 (mark (or (car calendar-mark-ring)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1693 (error "No mark set in this buffer")))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1694 (start)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1695 (end))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1696 (if (< (calendar-absolute-from-gregorian mark)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1697 (calendar-absolute-from-gregorian cursor))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1698 (setq start mark
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1699 end cursor)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1700 (setq start cursor
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1701 end mark))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1702 (make-diary-entry
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1703 (format "%s(diary-block %s %s)"
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1704 sexp-diary-entry-symbol
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1705 (calendar-date-string start nil t)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1706 (calendar-date-string end nil t))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1707 arg)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1708
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1709 (defun insert-cyclic-diary-entry (arg)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1710 "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
1711 Prefix arg will make the entry nonmarking."
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1712 (interactive "P")
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1713 (let* ((calendar-date-display-form
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1714 (if european-calendar-style
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1715 '(day " " month " " year)
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1716 '(month " " day " " year))))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1717 (make-diary-entry
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1718 (format "%s(diary-cyclic %d %s)"
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1719 sexp-diary-entry-symbol
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1720 (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
1721 (lambda (x) (> x 0)))
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1722 (calendar-date-string (calendar-cursor-to-date t) nil t))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1723 arg)))
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1724
48365
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1725 ;;;###autoload
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1726 (define-derived-mode diary-mode text-mode
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1727 "Diary"
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1728 "Major mode for editing the diary file."
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1729 (set (make-local-variable 'font-lock-defaults)
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1730 '(diary-font-lock-keywords t)))
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1731
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1732 (define-derived-mode fancy-diary-display-mode text-mode
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1733 "Diary"
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1734 "Major mode used while displaying diary entries using Fancy Display."
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1735 (set (make-local-variable 'font-lock-defaults)
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1736 '(fancy-diary-font-lock-keywords t)))
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1737
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1738
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1739 (defvar fancy-diary-font-lock-keywords
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1740 (list
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1741 (cons
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1742 (concat
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1743 (let ((dayname
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1744 (concat "\\("
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1745 (diary-name-pattern calendar-day-name-array t)
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1746 "\\)"))
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1747 (monthname
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1748 (concat "\\("
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1749 (diary-name-pattern calendar-month-name-array t)
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1750 "\\)"))
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1751 (day "[0-9]+")
48421
9f9b3764df98 (fancy-diary-font-lock-keywords): Grok month numbers, too.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 48372
diff changeset
1752 (month "[0-9]+")
48365
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1753 (year "-?[0-9]+"))
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1754 (mapconcat 'eval calendar-date-display-form ""))
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1755 "\\(\\(: .*\\)\\|\\(\n +.*\\)\\)*\n=+$")
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1756 'diary-face)
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1757 '("^.*anniversary.*$" . font-lock-keyword-face)
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1758 '("^.*birthday.*$" . font-lock-keyword-face)
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1759 '("^.*Yahrzeit.*$" . font-lock-reference-face)
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1760 '("^\\(Erev \\)?Rosh Hodesh.*" . font-lock-function-name-face)
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1761 '("^Day.*omer.*$" . font-lock-builtin-face)
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1762 '("^Parashat.*$" . font-lock-comment-face)
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1763 '("^[ \t]*[0-9]?[0-9]\\(:?[0-9][0-9]\\)?\\(am\\|pm\\|AM\\|PM\\)?\\(-[0-9]?[0-9]\\(:?[0-9][0-9]\\)?\\(am\\|pm\\|AM\\|PM\\)?\\)?"
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1764 . font-lock-variable-name-face))
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1765 "Keywords to highlight in fancy diary display")
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1766
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1767
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1768 (defun font-lock-diary-sexps (limit)
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1769 "Recognize sexp diary entry for font-locking."
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1770 (if (re-search-forward
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1771 (concat "^" (regexp-quote diary-nonmarking-symbol)
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1772 "?\\(" (regexp-quote sexp-diary-entry-symbol) "\\)")
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1773 limit t)
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1774 (condition-case nil
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1775 (save-restriction
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1776 (narrow-to-region (point-min) limit)
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1777 (let ((start (point)))
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1778 (forward-sexp 1)
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1779 (store-match-data (list start (point)))
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1780 t))
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1781 (error t))))
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1782
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1783 (defun font-lock-diary-date-forms (month-list &optional symbol noabbrev)
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1784 "Create a list of font-lock patterns for `diary-date-forms' with MONTH-LIST.
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1785 If given, optional SYMBOL must be a prefix to entries.
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1786 If optional NOABBREV is t, do not allow abbreviations in names."
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1787 (let* ((dayname
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1788 (concat "\\(" (diary-name-pattern calendar-day-name-array) "\\)"))
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1789 (monthname (concat "\\("
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1790 (diary-name-pattern month-list noabbrev)
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1791 "\\|\\*\\)"))
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1792 (month "\\([0-9]+\\|\\*\\)")
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1793 (day "\\([0-9]+\\|\\*\\)")
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1794 (year "-?\\([0-9]+\\|\\*\\)"))
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1795 (mapcar '(lambda (x)
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1796 (cons
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1797 (concat "^" (regexp-quote diary-nonmarking-symbol) "?"
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1798 (if symbol (regexp-quote symbol) "") "\\("
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1799 (mapconcat 'eval
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1800 ;; If backup, omit first item (backup)
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1801 ;; and last item (not part of date)
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1802 (if (equal (car x) 'backup)
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1803 (reverse (cdr (reverse (cdr x))))
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1804 x)
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1805 "")
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1806 ;; With backup, last item is not part of date
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1807 (if (equal (car x) 'backup)
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1808 (concat "\\)" (eval (car (reverse x))))
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1809 "\\)"))
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1810 '(1 diary-face)))
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1811 diary-date-forms)))
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1812
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1813 (defvar diary-font-lock-keywords
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1814 (append
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1815 (font-lock-diary-date-forms calendar-month-name-array)
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1816 (if (or (memq 'mark-hebrew-diary-entries
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1817 nongregorian-diary-marking-hook)
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1818 (memq 'list-hebrew-diary-entries
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1819 nongregorian-diary-listing-hook))
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1820 (progn
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1821 (require 'cal-hebrew)
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1822 (font-lock-diary-date-forms
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1823 calendar-hebrew-month-name-array-leap-year
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1824 hebrew-diary-entry-symbol t)))
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1825 (if (or (memq 'mark-islamic-diary-entries
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1826 nongregorian-diary-marking-hook)
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1827 (memq 'list-islamic-diary-entries
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1828 nongregorian-diary-listing-hook))
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1829 (progn
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1830 (require 'cal-islamic)
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1831 (font-lock-diary-date-forms
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1832 calendar-islamic-month-name-array-leap-year
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1833 islamic-diary-entry-symbol t)))
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1834 (list
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1835 (cons
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1836 (concat "^" (regexp-quote diary-include-string) ".*$")
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1837 'font-lock-keyword-face)
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1838 (cons
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1839 (concat "^" (regexp-quote diary-nonmarking-symbol)
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1840 "?\\(" (regexp-quote sexp-diary-entry-symbol) "\\)")
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1841 '(1 font-lock-reference-face))
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1842 (cons
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1843 (concat "^" (regexp-quote diary-nonmarking-symbol))
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1844 'font-lock-reference-face)
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1845 (cons
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1846 (concat "^" (regexp-quote diary-nonmarking-symbol)
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1847 "?\\(" (regexp-quote hebrew-diary-entry-symbol) "\\)")
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1848 '(1 font-lock-reference-face))
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1849 (cons
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1850 (concat "^" (regexp-quote diary-nonmarking-symbol)
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1851 "?\\(" (regexp-quote islamic-diary-entry-symbol) "\\)")
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1852 '(1 font-lock-reference-face))
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1853 '(font-lock-diary-sexps . font-lock-keyword-face)
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1854 '("[0-9]?[0-9]\\(:?[0-9][0-9]\\)?\\(am\\|pm\\|AM\\|PM\\)\\(-[0-9]?[0-9]\\(:?[0-9][0-9]\\)?\\(am\\|pm\\|AM\\|PM\\)\\)?"
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1855 . font-lock-function-name-face)))
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1856 "Forms to highlight in diary-mode")
49598
0d8b17d428b5 Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48421
diff changeset
1857
48365
25f62a7a6efc Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 48312
diff changeset
1858
13650
a9e81464a9ea Renamed from diary.el.
Richard M. Stallman <rms@gnu.org>
parents: 13075
diff changeset
1859 (provide 'diary-lib)
13053
621d48117fde Initial revision
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
diff changeset
1860
13650
a9e81464a9ea Renamed from diary.el.
Richard M. Stallman <rms@gnu.org>
parents: 13075
diff changeset
1861 ;;; diary-lib.el ends here