Mercurial > emacs
annotate lisp/calendar/calendar.el @ 106470:9e96dbbd314e
Handle prompt rules of ksh in OpenBSD 4.5. Reported by Rapha¸«³l
Berbain <raphael.berbain@gmail.com>.
* net/tramp.el (tramp-end-of-output): Move up. Use `#' and `$'
characters.
(tramp-initial-end-of-output): New defconst.
(tramp-methods, tramp-find-shell)
(tramp-open-connection-setup-interactive-shell)
(tramp-maybe-open-connection): Use it.
(tramp-shell-prompt-pattern, tramp-wait-for-output): Handle
existence of `#' and `$'.
* net/tramp-fish.el (tramp-fish-maybe-open-connection): Use
`tramp-initial-end-of-output'.
author | Michael Albinus <michael.albinus@gmx.de> |
---|---|
date | Mon, 07 Dec 2009 06:38:06 +0000 |
parents | 8f110099da5c |
children | 1d1d5d9bd884 |
rev | line source |
---|---|
38422
7a94f1c588c4
Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
38088
diff
changeset
|
1 ;;; calendar.el --- calendar functions |
811
e694e0879463
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
732
diff
changeset
|
2 |
39785
5c56451d877f
(calendar-mode-line-format): do not use #' on undefined functions
Sam Steingold <sds@gnu.org>
parents:
39523
diff
changeset
|
3 ;; Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1997, |
100908 | 4 ;; 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 |
86493 | 5 ;; Free Software Foundation, Inc. |
846
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
811
diff
changeset
|
6 |
811
e694e0879463
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
732
diff
changeset
|
7 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu> |
65919
5c09efcfc1d9
Update maintainer email address.
Glenn Morris <rgm@gnu.org>
parents:
65620
diff
changeset
|
8 ;; Maintainer: Glenn Morris <rgm@gnu.org> |
2247
2c7997f249eb
Add or correct keywords
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2211
diff
changeset
|
9 ;; Keywords: calendar |
13193
a25a4f1246c0
Added key definitions and autoloads for cal-tex.el (a new file).
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
13042
diff
changeset
|
10 ;; Human-Keywords: calendar, Gregorian calendar, diary, holidays |
957 | 11 |
628 | 12 ;; This file is part of GNU Emacs. |
13 | |
94653
e49abd957e81
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94454
diff
changeset
|
14 ;; GNU Emacs is free software: you can redistribute it and/or modify |
6737 | 15 ;; it under the terms of the GNU General Public License as published by |
94653
e49abd957e81
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94454
diff
changeset
|
16 ;; the Free Software Foundation, either version 3 of the License, or |
e49abd957e81
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94454
diff
changeset
|
17 ;; (at your option) any later version. |
6737 | 18 |
628 | 19 ;; GNU Emacs is distributed in the hope that it will be useful, |
6737 | 20 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of |
21 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
22 ;; GNU General Public License for more details. | |
23 | |
24 ;; You should have received a copy of the GNU General Public License | |
94653
e49abd957e81
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94454
diff
changeset
|
25 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
628 | 26 |
811
e694e0879463
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
732
diff
changeset
|
27 ;;; Commentary: |
e694e0879463
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
732
diff
changeset
|
28 |
55431
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
54536
diff
changeset
|
29 ;; This collection of functions implements a calendar window. It |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
54536
diff
changeset
|
30 ;; generates a calendar for the current month, together with the |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
54536
diff
changeset
|
31 ;; previous and coming months, or for any other three-month period. |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
54536
diff
changeset
|
32 ;; The calendar can be scrolled forward and backward in the window to |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
54536
diff
changeset
|
33 ;; show months in the past or future; the cursor can move forward and |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
54536
diff
changeset
|
34 ;; backward by days, weeks, or months, making it possible, for |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
54536
diff
changeset
|
35 ;; instance, to jump to the date a specified number of days, weeks, or |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
54536
diff
changeset
|
36 ;; months from the date under the cursor. The user can display a list |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
54536
diff
changeset
|
37 ;; of holidays and other notable days for the period shown; the |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
54536
diff
changeset
|
38 ;; notable days can be marked on the calendar, if desired. The user |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
54536
diff
changeset
|
39 ;; can also specify that dates having corresponding diary entries (in |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
54536
diff
changeset
|
40 ;; a file that the user specifies) be marked; the diary entries for |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
54536
diff
changeset
|
41 ;; any date can be viewed in a separate window. The diary and the |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
54536
diff
changeset
|
42 ;; notable days can be viewed independently of the calendar. Dates |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
54536
diff
changeset
|
43 ;; can be translated from the (usual) Gregorian calendar to the day of |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
54536
diff
changeset
|
44 ;; the year/days remaining in year, to the ISO commercial calendar, to |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
54536
diff
changeset
|
45 ;; the Julian (old style) calendar, to the Hebrew calendar, to the |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
54536
diff
changeset
|
46 ;; Islamic calendar, to the Baha'i calendar, to the French |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
54536
diff
changeset
|
47 ;; Revolutionary calendar, to the Mayan calendar, to the Chinese |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
54536
diff
changeset
|
48 ;; calendar, to the Coptic calendar, to the Ethiopic calendar, and to |
93492
2fe1b51b8771
(calendar-mode-map): Use calendar-mark-holidays rather than obsolete alias.
Glenn Morris <rgm@gnu.org>
parents:
93464
diff
changeset
|
49 ;; the astronomical (Julian) day number. Times of sunrise/sunset can |
2fe1b51b8771
(calendar-mode-map): Use calendar-mark-holidays rather than obsolete alias.
Glenn Morris <rgm@gnu.org>
parents:
93464
diff
changeset
|
50 ;; be displayed, as can the phases of the moon. Appointment |
2fe1b51b8771
(calendar-mode-map): Use calendar-mark-holidays rather than obsolete alias.
Glenn Morris <rgm@gnu.org>
parents:
93464
diff
changeset
|
51 ;; notification for diary entries is available. Calendar printing via |
2fe1b51b8771
(calendar-mode-map): Use calendar-mark-holidays rather than obsolete alias.
Glenn Morris <rgm@gnu.org>
parents:
93464
diff
changeset
|
52 ;; LaTeX is available. |
957 | 53 |
54 ;; The following files are part of the calendar/diary code: | |
55 | |
93492
2fe1b51b8771
(calendar-mode-map): Use calendar-mark-holidays rather than obsolete alias.
Glenn Morris <rgm@gnu.org>
parents:
93464
diff
changeset
|
56 ;; appt.el Appointment notification |
2fe1b51b8771
(calendar-mode-map): Use calendar-mark-holidays rather than obsolete alias.
Glenn Morris <rgm@gnu.org>
parents:
93464
diff
changeset
|
57 ;; cal-bahai.el Baha'i calendar |
2fe1b51b8771
(calendar-mode-map): Use calendar-mark-holidays rather than obsolete alias.
Glenn Morris <rgm@gnu.org>
parents:
93464
diff
changeset
|
58 ;; cal-china.el Chinese calendar |
2fe1b51b8771
(calendar-mode-map): Use calendar-mark-holidays rather than obsolete alias.
Glenn Morris <rgm@gnu.org>
parents:
93464
diff
changeset
|
59 ;; cal-coptic.el Coptic/Ethiopic calendars |
2fe1b51b8771
(calendar-mode-map): Use calendar-mark-holidays rather than obsolete alias.
Glenn Morris <rgm@gnu.org>
parents:
93464
diff
changeset
|
60 ;; cal-dst.el Daylight saving time rules |
2fe1b51b8771
(calendar-mode-map): Use calendar-mark-holidays rather than obsolete alias.
Glenn Morris <rgm@gnu.org>
parents:
93464
diff
changeset
|
61 ;; cal-french.el French revolutionary calendar |
2fe1b51b8771
(calendar-mode-map): Use calendar-mark-holidays rather than obsolete alias.
Glenn Morris <rgm@gnu.org>
parents:
93464
diff
changeset
|
62 ;; cal-hebrew.el Hebrew calendar |
2fe1b51b8771
(calendar-mode-map): Use calendar-mark-holidays rather than obsolete alias.
Glenn Morris <rgm@gnu.org>
parents:
93464
diff
changeset
|
63 ;; cal-html.el Calendars in HTML |
2fe1b51b8771
(calendar-mode-map): Use calendar-mark-holidays rather than obsolete alias.
Glenn Morris <rgm@gnu.org>
parents:
93464
diff
changeset
|
64 ;; cal-islam.el Islamic calendar |
2fe1b51b8771
(calendar-mode-map): Use calendar-mark-holidays rather than obsolete alias.
Glenn Morris <rgm@gnu.org>
parents:
93464
diff
changeset
|
65 ;; cal-iso.el ISO calendar |
2fe1b51b8771
(calendar-mode-map): Use calendar-mark-holidays rather than obsolete alias.
Glenn Morris <rgm@gnu.org>
parents:
93464
diff
changeset
|
66 ;; cal-julian.el Julian/astronomical calendars |
2fe1b51b8771
(calendar-mode-map): Use calendar-mark-holidays rather than obsolete alias.
Glenn Morris <rgm@gnu.org>
parents:
93464
diff
changeset
|
67 ;; cal-mayan.el Mayan calendars |
2fe1b51b8771
(calendar-mode-map): Use calendar-mark-holidays rather than obsolete alias.
Glenn Morris <rgm@gnu.org>
parents:
93464
diff
changeset
|
68 ;; cal-menu.el Menu support |
2fe1b51b8771
(calendar-mode-map): Use calendar-mark-holidays rather than obsolete alias.
Glenn Morris <rgm@gnu.org>
parents:
93464
diff
changeset
|
69 ;; cal-move.el Movement in the calendar |
2fe1b51b8771
(calendar-mode-map): Use calendar-mark-holidays rather than obsolete alias.
Glenn Morris <rgm@gnu.org>
parents:
93464
diff
changeset
|
70 ;; cal-persia.el Persian calendar |
2fe1b51b8771
(calendar-mode-map): Use calendar-mark-holidays rather than obsolete alias.
Glenn Morris <rgm@gnu.org>
parents:
93464
diff
changeset
|
71 ;; cal-tex.el Calendars in LaTeX |
2fe1b51b8771
(calendar-mode-map): Use calendar-mark-holidays rather than obsolete alias.
Glenn Morris <rgm@gnu.org>
parents:
93464
diff
changeset
|
72 ;; cal-x.el Dedicated frame functions |
2fe1b51b8771
(calendar-mode-map): Use calendar-mark-holidays rather than obsolete alias.
Glenn Morris <rgm@gnu.org>
parents:
93464
diff
changeset
|
73 ;; calendar.el This file |
2fe1b51b8771
(calendar-mode-map): Use calendar-mark-holidays rather than obsolete alias.
Glenn Morris <rgm@gnu.org>
parents:
93464
diff
changeset
|
74 ;; diary-lib.el Diary functions |
2fe1b51b8771
(calendar-mode-map): Use calendar-mark-holidays rather than obsolete alias.
Glenn Morris <rgm@gnu.org>
parents:
93464
diff
changeset
|
75 ;; holidays.el Holiday functions |
2fe1b51b8771
(calendar-mode-map): Use calendar-mark-holidays rather than obsolete alias.
Glenn Morris <rgm@gnu.org>
parents:
93464
diff
changeset
|
76 ;; lunar.el Phases of the moon |
2fe1b51b8771
(calendar-mode-map): Use calendar-mark-holidays rather than obsolete alias.
Glenn Morris <rgm@gnu.org>
parents:
93464
diff
changeset
|
77 ;; solar.el Sunrise/sunset, equinoxes/solstices |
628 | 78 |
20462
d179de7ad92e
Add reference to new Calendrical Calculations book.
Paul Eggert <eggert@twinsun.com>
parents:
20429
diff
changeset
|
79 ;; Technical details of all the calendrical calculations can be found in |
61148
7f7db25577d9
Update reference to "Calendrical Calculations" book; there's a new edition.
Paul Eggert <eggert@twinsun.com>
parents:
60922
diff
changeset
|
80 ;; ``Calendrical Calculations: The Millennium Edition'' by Edward M. Reingold |
7f7db25577d9
Update reference to "Calendrical Calculations" book; there's a new edition.
Paul Eggert <eggert@twinsun.com>
parents:
60922
diff
changeset
|
81 ;; and Nachum Dershowitz, Cambridge University Press (2001). |
628 | 82 |
20462
d179de7ad92e
Add reference to new Calendrical Calculations book.
Paul Eggert <eggert@twinsun.com>
parents:
20429
diff
changeset
|
83 ;; An earlier version of the technical details appeared in |
628 | 84 ;; ``Calendrical Calculations'' by Nachum Dershowitz and Edward M. Reingold, |
85 ;; Software--Practice and Experience, Volume 20, Number 9 (September, 1990), | |
61148
7f7db25577d9
Update reference to "Calendrical Calculations" book; there's a new edition.
Paul Eggert <eggert@twinsun.com>
parents:
60922
diff
changeset
|
86 ;; pages 899-928, and in ``Calendrical Calculations, Part II: Three Historical |
957 | 87 ;; Calendars'' by E. M. Reingold, N. Dershowitz, and S. M. Clamen, |
2640
fc7b8160bcc9
* calendar.el: Update reference to the papers in S-P&E.
Jim Blandy <jimb@redhat.com>
parents:
2347
diff
changeset
|
88 ;; Software--Practice and Experience, Volume 23, Number 4 (April, 1993), |
fc7b8160bcc9
* calendar.el: Update reference to the papers in S-P&E.
Jim Blandy <jimb@redhat.com>
parents:
2347
diff
changeset
|
89 ;; pages 383-404. |
957 | 90 |
91 ;; Hard copies of these two papers can be obtained by sending email to | |
92 ;; reingold@cs.uiuc.edu with the SUBJECT "send-paper-cal" (no quotes) and | |
93 ;; the message BODY containing your mailing address (snail). | |
628 | 94 |
92969
bb4fc128d00d
(european-calendar-style, calendar-for-loop)
Glenn Morris <rgm@gnu.org>
parents:
92930
diff
changeset
|
95 |
bb4fc128d00d
(european-calendar-style, calendar-for-loop)
Glenn Morris <rgm@gnu.org>
parents:
92930
diff
changeset
|
96 ;; A note on free variables: |
bb4fc128d00d
(european-calendar-style, calendar-for-loop)
Glenn Morris <rgm@gnu.org>
parents:
92930
diff
changeset
|
97 |
bb4fc128d00d
(european-calendar-style, calendar-for-loop)
Glenn Morris <rgm@gnu.org>
parents:
92930
diff
changeset
|
98 ;; The calendar passes around a few dynamically bound variables, which |
bb4fc128d00d
(european-calendar-style, calendar-for-loop)
Glenn Morris <rgm@gnu.org>
parents:
92930
diff
changeset
|
99 ;; unfortunately have rather common names. They are meant to be |
bb4fc128d00d
(european-calendar-style, calendar-for-loop)
Glenn Morris <rgm@gnu.org>
parents:
92930
diff
changeset
|
100 ;; available for external functions, so the names can't be changed. |
bb4fc128d00d
(european-calendar-style, calendar-for-loop)
Glenn Morris <rgm@gnu.org>
parents:
92930
diff
changeset
|
101 |
93808
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
102 ;; displayed-month, displayed-year: bound in calendar-generate, the |
92969
bb4fc128d00d
(european-calendar-style, calendar-for-loop)
Glenn Morris <rgm@gnu.org>
parents:
92930
diff
changeset
|
103 ;; central month of the 3 month calendar window |
bb4fc128d00d
(european-calendar-style, calendar-for-loop)
Glenn Morris <rgm@gnu.org>
parents:
92930
diff
changeset
|
104 ;; original-date, number: bound in diary-list-entries, the arguments |
bb4fc128d00d
(european-calendar-style, calendar-for-loop)
Glenn Morris <rgm@gnu.org>
parents:
92930
diff
changeset
|
105 ;; with which that function was called. |
93791
4ef65ad699dc
Update for diary-lib name changes.
Glenn Morris <rgm@gnu.org>
parents:
93740
diff
changeset
|
106 ;; date, entry: bound in diary-list-sexp-entries (qv) |
92969
bb4fc128d00d
(european-calendar-style, calendar-for-loop)
Glenn Morris <rgm@gnu.org>
parents:
92930
diff
changeset
|
107 |
bb4fc128d00d
(european-calendar-style, calendar-for-loop)
Glenn Morris <rgm@gnu.org>
parents:
92930
diff
changeset
|
108 ;; Bound in diary-list-entries: |
93791
4ef65ad699dc
Update for diary-lib name changes.
Glenn Morris <rgm@gnu.org>
parents:
93740
diff
changeset
|
109 ;; diary-entries-list: use in d-l, appt.el, and by diary-add-to-list |
92969
bb4fc128d00d
(european-calendar-style, calendar-for-loop)
Glenn Morris <rgm@gnu.org>
parents:
92930
diff
changeset
|
110 ;; diary-saved-point: only used in diary-lib.el, passed to the display func |
92988 | 111 ;; date-string: only used in diary-lib.el |
112 ;; list-only: don't modify the diary-buffer, just return a list of entries | |
113 ;; file-glob-attrs: yuck | |
92969
bb4fc128d00d
(european-calendar-style, calendar-for-loop)
Glenn Morris <rgm@gnu.org>
parents:
92930
diff
changeset
|
114 |
811
e694e0879463
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
732
diff
changeset
|
115 ;;; Code: |
628 | 116 |
105933
8f110099da5c
Update x-popup-menu declaration.
Glenn Morris <rgm@gnu.org>
parents:
105844
diff
changeset
|
117 (load "cal-loaddefs" nil t) |
92594
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
118 |
93714
6b2af597432a
Require loaddef file rather than loading it.
Glenn Morris <rgm@gnu.org>
parents:
93647
diff
changeset
|
119 ;; Avoid recursive load of calendar when loading cal-menu. Yuck. |
93227
940127da5863
Provide calendar before requiring cal-menu.
Glenn Morris <rgm@gnu.org>
parents:
93187
diff
changeset
|
120 (provide 'calendar) |
92594
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
121 (require 'cal-menu) |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
122 |
17625
321afd5b0bc5
Add defgroups, and use defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16099
diff
changeset
|
123 (defgroup calendar nil |
321afd5b0bc5
Add defgroups, and use defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16099
diff
changeset
|
124 "Calendar and time management support." |
93947
6819f30b721b
(calendar, diary): Add :prefix.
Glenn Morris <rgm@gnu.org>
parents:
93900
diff
changeset
|
125 :prefix "calendar-" |
17625
321afd5b0bc5
Add defgroups, and use defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16099
diff
changeset
|
126 :group 'applications) |
321afd5b0bc5
Add defgroups, and use defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16099
diff
changeset
|
127 |
92594
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
128 (defgroup calendar-hooks nil |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
129 "Calendar hooks." |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
130 :prefix "calendar-" |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
131 :group 'calendar) |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
132 |
94019
28144b96054e
(calendar-faces): New custom group.
Glenn Morris <rgm@gnu.org>
parents:
93995
diff
changeset
|
133 (defgroup calendar-faces nil |
28144b96054e
(calendar-faces): New custom group.
Glenn Morris <rgm@gnu.org>
parents:
93995
diff
changeset
|
134 "Calendar faces." |
28144b96054e
(calendar-faces): New custom group.
Glenn Morris <rgm@gnu.org>
parents:
93995
diff
changeset
|
135 :prefix "calendar-" |
28144b96054e
(calendar-faces): New custom group.
Glenn Morris <rgm@gnu.org>
parents:
93995
diff
changeset
|
136 :group 'calendar) |
28144b96054e
(calendar-faces): New custom group.
Glenn Morris <rgm@gnu.org>
parents:
93995
diff
changeset
|
137 |
17625
321afd5b0bc5
Add defgroups, and use defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16099
diff
changeset
|
138 (defcustom calendar-offset 0 |
68366
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
139 "The offset of the principal month from the center of the calendar window. |
9709
3ece524b8ea3
Lots of minor fixes and code polishing. Exit-calendar code rewritten.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
9417
diff
changeset
|
140 0 means the principal month is in the center (default), -1 means on the left, |
3ece524b8ea3
Lots of minor fixes and code polishing. Exit-calendar code rewritten.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
9417
diff
changeset
|
141 +1 means on the right. Larger (or smaller) values push the principal month off |
17625
321afd5b0bc5
Add defgroups, and use defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16099
diff
changeset
|
142 the screen." |
321afd5b0bc5
Add defgroups, and use defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16099
diff
changeset
|
143 :type 'integer |
321afd5b0bc5
Add defgroups, and use defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16099
diff
changeset
|
144 :group 'calendar) |
9709
3ece524b8ea3
Lots of minor fixes and code polishing. Exit-calendar code rewritten.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
9417
diff
changeset
|
145 |
92594
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
146 (defcustom calendar-setup nil |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
147 "The frame setup of the calendar. |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
148 The choices are: `one-frame' (calendar and diary together in one separate, |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
149 dedicated frame); `two-frames' (calendar and diary in separate, dedicated |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
150 frames); `calendar-only' (calendar in a separate, dedicated frame); with |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
151 any other value the current frame is used. Using any of the first |
93808
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
152 three options overrides the value of `calendar-view-diary-initially-flag'." |
92594
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
153 :type '(choice |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
154 (const :tag "calendar and diary in separate frame" one-frame) |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
155 (const :tag "calendar and diary each in own frame" two-frames) |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
156 (const :tag "calendar in separate frame" calendar-only) |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
157 (const :tag "use current frame" nil)) |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
158 :group 'calendar) |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
159 |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
160 (defcustom calendar-minimum-window-height 8 |
93808
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
161 "Minimum height `calendar-generate-window' should use for calendar window." |
92594
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
162 :type 'integer |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
163 :version "22.1" |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
164 :group 'calendar) |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
165 |
105539
4886a9e0be01
(calendar-split-width-threshold): New option.
Glenn Morris <rgm@gnu.org>
parents:
105499
diff
changeset
|
166 ;; See discussion in bug#1806. |
4886a9e0be01
(calendar-split-width-threshold): New option.
Glenn Morris <rgm@gnu.org>
parents:
105499
diff
changeset
|
167 (defcustom calendar-split-width-threshold nil |
4886a9e0be01
(calendar-split-width-threshold): New option.
Glenn Morris <rgm@gnu.org>
parents:
105499
diff
changeset
|
168 "Value to use for `split-width-threshold' when creating a calendar. |
4886a9e0be01
(calendar-split-width-threshold): New option.
Glenn Morris <rgm@gnu.org>
parents:
105499
diff
changeset
|
169 This only affects frames wider than the default value of |
4886a9e0be01
(calendar-split-width-threshold): New option.
Glenn Morris <rgm@gnu.org>
parents:
105499
diff
changeset
|
170 `split-width-threshold'." |
4886a9e0be01
(calendar-split-width-threshold): New option.
Glenn Morris <rgm@gnu.org>
parents:
105499
diff
changeset
|
171 :type '(choice (const nil) |
4886a9e0be01
(calendar-split-width-threshold): New option.
Glenn Morris <rgm@gnu.org>
parents:
105499
diff
changeset
|
172 (integer)) |
4886a9e0be01
(calendar-split-width-threshold): New option.
Glenn Morris <rgm@gnu.org>
parents:
105499
diff
changeset
|
173 :version "23.2" |
4886a9e0be01
(calendar-split-width-threshold): New option.
Glenn Morris <rgm@gnu.org>
parents:
105499
diff
changeset
|
174 :group 'calendar) |
4886a9e0be01
(calendar-split-width-threshold): New option.
Glenn Morris <rgm@gnu.org>
parents:
105499
diff
changeset
|
175 |
92594
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
176 (defcustom calendar-week-start-day 0 |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
177 "The day of the week on which a week in the calendar begins. |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
178 0 means Sunday (default), 1 means Monday, and so on. |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
179 |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
180 If you change this variable directly (without using customize) |
93808
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
181 after starting `calendar', you should call `calendar-redraw' to |
92594
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
182 update the calendar display to reflect the change, otherwise |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
183 movement commands will not work correctly." |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
184 :type 'integer |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
185 ;; Change the initialize so that if you reload calendar.el, it will not |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
186 ;; cause a redraw (which may fail, e.g. with "invalid byte-code in |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
187 ;; calendar.elc" because of the "byte-compile-dynamic"). |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
188 :initialize 'custom-initialize-default |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
189 :set (lambda (sym val) |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
190 (set sym val) |
93808
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
191 (calendar-redraw)) |
92594
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
192 :group 'calendar) |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
193 |
94019
28144b96054e
(calendar-faces): New custom group.
Glenn Morris <rgm@gnu.org>
parents:
93995
diff
changeset
|
194 (define-obsolete-variable-alias 'view-diary-entries-initially |
28144b96054e
(calendar-faces): New custom group.
Glenn Morris <rgm@gnu.org>
parents:
93995
diff
changeset
|
195 'calendar-view-diary-initially-flag "23.1") |
28144b96054e
(calendar-faces): New custom group.
Glenn Morris <rgm@gnu.org>
parents:
93995
diff
changeset
|
196 |
93808
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
197 (defcustom calendar-view-diary-initially-flag nil |
68366
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
198 "Non-nil means display current date's diary entries on entry to calendar. |
628 | 199 The diary is displayed in another window when the calendar is first displayed, |
200 if the current date is visible. The number of days of diary entries displayed | |
93791
4ef65ad699dc
Update for diary-lib name changes.
Glenn Morris <rgm@gnu.org>
parents:
93740
diff
changeset
|
201 is governed by the variable `diary-number-of-entries'. This variable can |
53559 | 202 be overridden by the value of `calendar-setup'." |
17625
321afd5b0bc5
Add defgroups, and use defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16099
diff
changeset
|
203 :type 'boolean |
321afd5b0bc5
Add defgroups, and use defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16099
diff
changeset
|
204 :group 'diary) |
628 | 205 |
94019
28144b96054e
(calendar-faces): New custom group.
Glenn Morris <rgm@gnu.org>
parents:
93995
diff
changeset
|
206 (define-obsolete-variable-alias 'mark-diary-entries-in-calendar |
28144b96054e
(calendar-faces): New custom group.
Glenn Morris <rgm@gnu.org>
parents:
93995
diff
changeset
|
207 'calendar-mark-diary-entries-flag "23.1") |
93808
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
208 |
101899
6c501f7469ab
(diary-entry-marker, calendar-today-marker, calendar-holiday-marker)
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
209 ;; FIXME :set |
93808
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
210 (defcustom calendar-mark-diary-entries-flag nil |
68366
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
211 "Non-nil means mark dates with diary entries, in the calendar window. |
17625
321afd5b0bc5
Add defgroups, and use defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16099
diff
changeset
|
212 The marking symbol is specified by the variable `diary-entry-marker'." |
321afd5b0bc5
Add defgroups, and use defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16099
diff
changeset
|
213 :type 'boolean |
321afd5b0bc5
Add defgroups, and use defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16099
diff
changeset
|
214 :group 'diary) |
628 | 215 |
93187
c68684b0a2d1
(calendar-remove-frame-by-deleting): Default to t. Add to 'calendar group.
Glenn Morris <rgm@gnu.org>
parents:
93091
diff
changeset
|
216 (defcustom calendar-remove-frame-by-deleting t |
68366
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
217 "Determine how the calendar mode removes a frame no longer needed. |
26427
3b6cf16f3633
* calendar/calendar.el (calendar-remove-frame-by-deleting):
Sam Steingold <sds@gnu.org>
parents:
26329
diff
changeset
|
218 If nil, make an icon of the frame. If non-nil, delete the frame." |
3b6cf16f3633
* calendar/calendar.el (calendar-remove-frame-by-deleting):
Sam Steingold <sds@gnu.org>
parents:
26329
diff
changeset
|
219 :type 'boolean |
93187
c68684b0a2d1
(calendar-remove-frame-by-deleting): Default to t. Add to 'calendar group.
Glenn Morris <rgm@gnu.org>
parents:
93091
diff
changeset
|
220 :version "23.1" ; changed from nil to t |
c68684b0a2d1
(calendar-remove-frame-by-deleting): Default to t. Add to 'calendar group.
Glenn Morris <rgm@gnu.org>
parents:
93091
diff
changeset
|
221 :group 'view |
c68684b0a2d1
(calendar-remove-frame-by-deleting): Default to t. Add to 'calendar group.
Glenn Morris <rgm@gnu.org>
parents:
93091
diff
changeset
|
222 :group 'calendar) |
26427
3b6cf16f3633
* calendar/calendar.el (calendar-remove-frame-by-deleting):
Sam Steingold <sds@gnu.org>
parents:
26329
diff
changeset
|
223 |
92594
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
224 (defface calendar-today |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
225 '((t (:underline t))) |
94019
28144b96054e
(calendar-faces): New custom group.
Glenn Morris <rgm@gnu.org>
parents:
93995
diff
changeset
|
226 "Face for indicating today's date in the calendar. |
104754 | 227 See the variable `calendar-today-marker'." |
94019
28144b96054e
(calendar-faces): New custom group.
Glenn Morris <rgm@gnu.org>
parents:
93995
diff
changeset
|
228 :group 'calendar-faces) |
104754 | 229 |
230 (define-obsolete-face-alias 'calendar-today-face 'calendar-today "22.1") | |
92594
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
231 |
63221
6e968f79cfbc
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-385
Miles Bader <miles@gnu.org>
parents:
62779
diff
changeset
|
232 (defface diary |
61394
31aa9a390538
* mh-customize.el (mh-speedbar-selected-folder-face): Special case
Dan Nicolaescu <dann@ics.uci.edu>
parents:
61148
diff
changeset
|
233 '((((min-colors 88) (class color) (background light)) |
31aa9a390538
* mh-customize.el (mh-speedbar-selected-folder-face): Special case
Dan Nicolaescu <dann@ics.uci.edu>
parents:
61148
diff
changeset
|
234 :foreground "red1") |
31aa9a390538
* mh-customize.el (mh-speedbar-selected-folder-face): Special case
Dan Nicolaescu <dann@ics.uci.edu>
parents:
61148
diff
changeset
|
235 (((class color) (background light)) |
33208 | 236 :foreground "red") |
61394
31aa9a390538
* mh-customize.el (mh-speedbar-selected-folder-face): Special case
Dan Nicolaescu <dann@ics.uci.edu>
parents:
61148
diff
changeset
|
237 (((min-colors 88) (class color) (background dark)) |
31aa9a390538
* mh-customize.el (mh-speedbar-selected-folder-face): Special case
Dan Nicolaescu <dann@ics.uci.edu>
parents:
61148
diff
changeset
|
238 :foreground "yellow1") |
33160
8006eaf2db42
(diary-face, calendar-today-face, holiday-face):
Miles Bader <miles@gnu.org>
parents:
33114
diff
changeset
|
239 (((class color) (background dark)) |
33208 | 240 :foreground "yellow") |
33160
8006eaf2db42
(diary-face, calendar-today-face, holiday-face):
Miles Bader <miles@gnu.org>
parents:
33114
diff
changeset
|
241 (t |
42456
8a4077ab418c
(various face definitions): Use :weight, not :bold.
Richard M. Stallman <rms@gnu.org>
parents:
41577
diff
changeset
|
242 :weight bold)) |
94019
28144b96054e
(calendar-faces): New custom group.
Glenn Morris <rgm@gnu.org>
parents:
93995
diff
changeset
|
243 "Face for highlighting diary entries. |
28144b96054e
(calendar-faces): New custom group.
Glenn Morris <rgm@gnu.org>
parents:
93995
diff
changeset
|
244 Used to mark diary entries in the calendar (see `diary-entry-marker'), |
28144b96054e
(calendar-faces): New custom group.
Glenn Morris <rgm@gnu.org>
parents:
93995
diff
changeset
|
245 and to highlight the date header in the fancy diary." |
28144b96054e
(calendar-faces): New custom group.
Glenn Morris <rgm@gnu.org>
parents:
93995
diff
changeset
|
246 :group 'calendar-faces) |
104754 | 247 |
248 (define-obsolete-face-alias 'diary-face 'diary "22.1") | |
63221
6e968f79cfbc
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-385
Miles Bader <miles@gnu.org>
parents:
62779
diff
changeset
|
249 |
6e968f79cfbc
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-385
Miles Bader <miles@gnu.org>
parents:
62779
diff
changeset
|
250 (defface holiday |
33160
8006eaf2db42
(diary-face, calendar-today-face, holiday-face):
Miles Bader <miles@gnu.org>
parents:
33114
diff
changeset
|
251 '((((class color) (background light)) |
33208 | 252 :background "pink") |
33160
8006eaf2db42
(diary-face, calendar-today-face, holiday-face):
Miles Bader <miles@gnu.org>
parents:
33114
diff
changeset
|
253 (((class color) (background dark)) |
33208 | 254 :background "chocolate4") |
33160
8006eaf2db42
(diary-face, calendar-today-face, holiday-face):
Miles Bader <miles@gnu.org>
parents:
33114
diff
changeset
|
255 (t |
33208 | 256 :inverse-video t)) |
94019
28144b96054e
(calendar-faces): New custom group.
Glenn Morris <rgm@gnu.org>
parents:
93995
diff
changeset
|
257 "Face for indicating in the calendar dates that have holidays. |
28144b96054e
(calendar-faces): New custom group.
Glenn Morris <rgm@gnu.org>
parents:
93995
diff
changeset
|
258 See `calendar-holiday-marker'." |
28144b96054e
(calendar-faces): New custom group.
Glenn Morris <rgm@gnu.org>
parents:
93995
diff
changeset
|
259 :group 'calendar-faces) |
104754 | 260 |
261 (define-obsolete-face-alias 'holiday-face 'holiday "22.1") | |
19059
06cb7a02a079
(diary-face, calendar-today-face, holiday-face):
Richard M. Stallman <rms@gnu.org>
parents:
18940
diff
changeset
|
262 |
101908
2f90d8471cb7
(diary-entry-marker, calendar-today-marker)
Glenn Morris <rgm@gnu.org>
parents:
101899
diff
changeset
|
263 ;; These briefly checked font-lock-mode, but that is broken, since it |
2f90d8471cb7
(diary-entry-marker, calendar-today-marker)
Glenn Morris <rgm@gnu.org>
parents:
101899
diff
changeset
|
264 ;; is a buffer-local variable, and which buffer happens to be current |
2f90d8471cb7
(diary-entry-marker, calendar-today-marker)
Glenn Morris <rgm@gnu.org>
parents:
101899
diff
changeset
|
265 ;; when this file is loaded shouldn't make a difference. One could |
2f90d8471cb7
(diary-entry-marker, calendar-today-marker)
Glenn Morris <rgm@gnu.org>
parents:
101899
diff
changeset
|
266 ;; perhaps check global-font-lock-mode, or font-lock-global-modes; but |
2f90d8471cb7
(diary-entry-marker, calendar-today-marker)
Glenn Morris <rgm@gnu.org>
parents:
101899
diff
changeset
|
267 ;; this feature doesn't use font-lock, so there's no real reason it |
2f90d8471cb7
(diary-entry-marker, calendar-today-marker)
Glenn Morris <rgm@gnu.org>
parents:
101899
diff
changeset
|
268 ;; should respect those either. See bug#2199. |
2f90d8471cb7
(diary-entry-marker, calendar-today-marker)
Glenn Morris <rgm@gnu.org>
parents:
101899
diff
changeset
|
269 ;; They also used to check display-color-p, but that is a problem if |
2f90d8471cb7
(diary-entry-marker, calendar-today-marker)
Glenn Morris <rgm@gnu.org>
parents:
101899
diff
changeset
|
270 ;; loaded from --daemon. Since BW displays are rare now, this was |
2f90d8471cb7
(diary-entry-marker, calendar-today-marker)
Glenn Morris <rgm@gnu.org>
parents:
101899
diff
changeset
|
271 ;; also taken out. The way to keep it would be to have nil mean do a |
2f90d8471cb7
(diary-entry-marker, calendar-today-marker)
Glenn Morris <rgm@gnu.org>
parents:
101899
diff
changeset
|
272 ;; runtime check whenever this variable is used. |
2f90d8471cb7
(diary-entry-marker, calendar-today-marker)
Glenn Morris <rgm@gnu.org>
parents:
101899
diff
changeset
|
273 (defcustom diary-entry-marker 'diary |
68366
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
274 "How to mark dates that have diary entries. |
101908
2f90d8471cb7
(diary-entry-marker, calendar-today-marker)
Glenn Morris <rgm@gnu.org>
parents:
101899
diff
changeset
|
275 The value can be either a single-character string (e.g. \"+\") or a face." |
2f90d8471cb7
(diary-entry-marker, calendar-today-marker)
Glenn Morris <rgm@gnu.org>
parents:
101899
diff
changeset
|
276 :type '(choice (string :tag "Single character string") face) |
101910
3d527c23c151
Add :version tags for previous change.
Glenn Morris <rgm@gnu.org>
parents:
101908
diff
changeset
|
277 :group 'diary |
3d527c23c151
Add :version tags for previous change.
Glenn Morris <rgm@gnu.org>
parents:
101908
diff
changeset
|
278 :version "23.1") |
5694
69471d331d0c
(calendar-version): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5272
diff
changeset
|
279 |
101908
2f90d8471cb7
(diary-entry-marker, calendar-today-marker)
Glenn Morris <rgm@gnu.org>
parents:
101899
diff
changeset
|
280 (defcustom calendar-today-marker 'calendar-today |
68366
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
281 "How to mark today's date in the calendar. |
101908
2f90d8471cb7
(diary-entry-marker, calendar-today-marker)
Glenn Morris <rgm@gnu.org>
parents:
101899
diff
changeset
|
282 The value can be either a single-character string (e.g. \"=\") or a face. |
93026
8e1a78482251
(calendar-today-marker, initial-calendar-window-hook)
Glenn Morris <rgm@gnu.org>
parents:
92988
diff
changeset
|
283 Used by `calendar-mark-today'." |
101908
2f90d8471cb7
(diary-entry-marker, calendar-today-marker)
Glenn Morris <rgm@gnu.org>
parents:
101899
diff
changeset
|
284 :type '(choice (string :tag "Single character string") face) |
101910
3d527c23c151
Add :version tags for previous change.
Glenn Morris <rgm@gnu.org>
parents:
101908
diff
changeset
|
285 :group 'calendar |
3d527c23c151
Add :version tags for previous change.
Glenn Morris <rgm@gnu.org>
parents:
101908
diff
changeset
|
286 :version "23.1") |
5694
69471d331d0c
(calendar-version): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5272
diff
changeset
|
287 |
101908
2f90d8471cb7
(diary-entry-marker, calendar-today-marker)
Glenn Morris <rgm@gnu.org>
parents:
101899
diff
changeset
|
288 (defcustom calendar-holiday-marker 'holiday |
68366
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
289 "How to mark notable dates in the calendar. |
101908
2f90d8471cb7
(diary-entry-marker, calendar-today-marker)
Glenn Morris <rgm@gnu.org>
parents:
101899
diff
changeset
|
290 The value can be either a single-character string (e.g. \"*\") or a face." |
2f90d8471cb7
(diary-entry-marker, calendar-today-marker)
Glenn Morris <rgm@gnu.org>
parents:
101899
diff
changeset
|
291 :type '(choice (string :tag "Single character string") face) |
101910
3d527c23c151
Add :version tags for previous change.
Glenn Morris <rgm@gnu.org>
parents:
101908
diff
changeset
|
292 :group 'holidays |
3d527c23c151
Add :version tags for previous change.
Glenn Morris <rgm@gnu.org>
parents:
101908
diff
changeset
|
293 :version "23.1") |
628 | 294 |
94019
28144b96054e
(calendar-faces): New custom group.
Glenn Morris <rgm@gnu.org>
parents:
93995
diff
changeset
|
295 (define-obsolete-variable-alias 'view-calendar-holidays-initially |
28144b96054e
(calendar-faces): New custom group.
Glenn Morris <rgm@gnu.org>
parents:
93995
diff
changeset
|
296 'calendar-view-holidays-initially-flag "23.1") |
28144b96054e
(calendar-faces): New custom group.
Glenn Morris <rgm@gnu.org>
parents:
93995
diff
changeset
|
297 |
93808
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
298 (defcustom calendar-view-holidays-initially-flag nil |
68366
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
299 "Non-nil means display holidays for current three month period on entry. |
3865
2c6883d0a1b2
* calendar.el (calendar-version): Update to 5.1. Fixed a variety
Jim Blandy <jimb@redhat.com>
parents:
3778
diff
changeset
|
300 The holidays are displayed in another window when the calendar is first |
17625
321afd5b0bc5
Add defgroups, and use defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16099
diff
changeset
|
301 displayed." |
321afd5b0bc5
Add defgroups, and use defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16099
diff
changeset
|
302 :type 'boolean |
321afd5b0bc5
Add defgroups, and use defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16099
diff
changeset
|
303 :group 'holidays) |
628 | 304 |
94019
28144b96054e
(calendar-faces): New custom group.
Glenn Morris <rgm@gnu.org>
parents:
93995
diff
changeset
|
305 (define-obsolete-variable-alias 'mark-holidays-in-calendar |
28144b96054e
(calendar-faces): New custom group.
Glenn Morris <rgm@gnu.org>
parents:
93995
diff
changeset
|
306 'calendar-mark-holidays-flag "23.1") |
93808
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
307 |
101899
6c501f7469ab
(diary-entry-marker, calendar-today-marker, calendar-holiday-marker)
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
308 ;; FIXME :set |
93808
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
309 (defcustom calendar-mark-holidays-flag nil |
68366
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
310 "Non-nil means mark dates of holidays in the calendar window. |
17625
321afd5b0bc5
Add defgroups, and use defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16099
diff
changeset
|
311 The marking symbol is specified by the variable `calendar-holiday-marker'." |
321afd5b0bc5
Add defgroups, and use defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16099
diff
changeset
|
312 :type 'boolean |
321afd5b0bc5
Add defgroups, and use defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16099
diff
changeset
|
313 :group 'holidays) |
628 | 314 |
76752
f6dad15ba551
(calendar-mode-hook): Declare it.
Glenn Morris <rgm@gnu.org>
parents:
76641
diff
changeset
|
315 (defcustom calendar-mode-hook nil |
f6dad15ba551
(calendar-mode-hook): Declare it.
Glenn Morris <rgm@gnu.org>
parents:
76641
diff
changeset
|
316 "Hook run when entering `calendar-mode'." |
f6dad15ba551
(calendar-mode-hook): Declare it.
Glenn Morris <rgm@gnu.org>
parents:
76641
diff
changeset
|
317 :type 'hook |
f6dad15ba551
(calendar-mode-hook): Declare it.
Glenn Morris <rgm@gnu.org>
parents:
76641
diff
changeset
|
318 :group 'calendar-hooks) |
f6dad15ba551
(calendar-mode-hook): Declare it.
Glenn Morris <rgm@gnu.org>
parents:
76641
diff
changeset
|
319 |
17625
321afd5b0bc5
Add defgroups, and use defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16099
diff
changeset
|
320 (defcustom calendar-load-hook nil |
68366
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
321 "List of functions to be called after the calendar is first loaded. |
17625
321afd5b0bc5
Add defgroups, and use defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16099
diff
changeset
|
322 This is the place to add key bindings to `calendar-mode-map'." |
321afd5b0bc5
Add defgroups, and use defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16099
diff
changeset
|
323 :type 'hook |
321afd5b0bc5
Add defgroups, and use defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16099
diff
changeset
|
324 :group 'calendar-hooks) |
957 | 325 |
94019
28144b96054e
(calendar-faces): New custom group.
Glenn Morris <rgm@gnu.org>
parents:
93995
diff
changeset
|
326 (define-obsolete-variable-alias 'initial-calendar-window-hook |
28144b96054e
(calendar-faces): New custom group.
Glenn Morris <rgm@gnu.org>
parents:
93995
diff
changeset
|
327 'calendar-initial-window-hook "23.1") |
28144b96054e
(calendar-faces): New custom group.
Glenn Morris <rgm@gnu.org>
parents:
93995
diff
changeset
|
328 |
93808
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
329 (defcustom calendar-initial-window-hook nil |
93026
8e1a78482251
(calendar-today-marker, initial-calendar-window-hook)
Glenn Morris <rgm@gnu.org>
parents:
92988
diff
changeset
|
330 "List of functions to be called when the calendar window is created. |
93043
0e73f340ef25
(initial-calendar-window-hook, today-visible-calendar-hook): Doc fixes.
Glenn Morris <rgm@gnu.org>
parents:
93026
diff
changeset
|
331 Quitting the calendar and re-entering it will cause these functions |
93026
8e1a78482251
(calendar-today-marker, initial-calendar-window-hook)
Glenn Morris <rgm@gnu.org>
parents:
92988
diff
changeset
|
332 to be called again." |
17625
321afd5b0bc5
Add defgroups, and use defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16099
diff
changeset
|
333 :type 'hook |
321afd5b0bc5
Add defgroups, and use defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16099
diff
changeset
|
334 :group 'calendar-hooks) |
628 | 335 |
94019
28144b96054e
(calendar-faces): New custom group.
Glenn Morris <rgm@gnu.org>
parents:
93995
diff
changeset
|
336 (define-obsolete-variable-alias 'today-visible-calendar-hook |
28144b96054e
(calendar-faces): New custom group.
Glenn Morris <rgm@gnu.org>
parents:
93995
diff
changeset
|
337 'calendar-today-visible-hook "23.1") |
93808
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
338 |
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
339 (defcustom calendar-today-visible-hook nil |
68366
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
340 "List of functions called whenever the current date is visible. |
93026
8e1a78482251
(calendar-today-marker, initial-calendar-window-hook)
Glenn Morris <rgm@gnu.org>
parents:
92988
diff
changeset
|
341 To mark today's date, add the function `calendar-mark-today'. |
8e1a78482251
(calendar-today-marker, initial-calendar-window-hook)
Glenn Morris <rgm@gnu.org>
parents:
92988
diff
changeset
|
342 To replace the date with asterisks, add the function `calendar-star-date'. |
93808
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
343 See also `calendar-today-invisible-hook'. |
628 | 344 |
93043
0e73f340ef25
(initial-calendar-window-hook, today-visible-calendar-hook): Doc fixes.
Glenn Morris <rgm@gnu.org>
parents:
93026
diff
changeset
|
345 In general, be careful about changing characters in the calendar buffer, |
0e73f340ef25
(initial-calendar-window-hook, today-visible-calendar-hook): Doc fixes.
Glenn Morris <rgm@gnu.org>
parents:
93026
diff
changeset
|
346 since it may cause the movement commands to fail." |
17625
321afd5b0bc5
Add defgroups, and use defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16099
diff
changeset
|
347 :type 'hook |
93026
8e1a78482251
(calendar-today-marker, initial-calendar-window-hook)
Glenn Morris <rgm@gnu.org>
parents:
92988
diff
changeset
|
348 :options '(calendar-mark-today calendar-star-date) |
17625
321afd5b0bc5
Add defgroups, and use defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16099
diff
changeset
|
349 :group 'calendar-hooks) |
628 | 350 |
94019
28144b96054e
(calendar-faces): New custom group.
Glenn Morris <rgm@gnu.org>
parents:
93995
diff
changeset
|
351 (define-obsolete-variable-alias 'today-invisible-calendar-hook |
28144b96054e
(calendar-faces): New custom group.
Glenn Morris <rgm@gnu.org>
parents:
93995
diff
changeset
|
352 'calendar-today-invisible-hook "23.1") |
93808
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
353 |
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
354 (defcustom calendar-today-invisible-hook nil |
68366
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
355 "List of functions called whenever the current date is not visible. |
93808
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
356 See also `calendar-today-visible-hook'." |
17625
321afd5b0bc5
Add defgroups, and use defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16099
diff
changeset
|
357 :type 'hook |
321afd5b0bc5
Add defgroups, and use defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16099
diff
changeset
|
358 :group 'calendar-hooks) |
628 | 359 |
25410
3ab4413f7549
(calendar-move-hook): New hook.
Richard M. Stallman <rms@gnu.org>
parents:
25154
diff
changeset
|
360 (defcustom calendar-move-hook nil |
68366
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
361 "List of functions called whenever the cursor moves in the calendar. |
26427
3b6cf16f3633
* calendar/calendar.el (calendar-remove-frame-by-deleting):
Sam Steingold <sds@gnu.org>
parents:
26329
diff
changeset
|
362 For example, |
25410
3ab4413f7549
(calendar-move-hook): New hook.
Richard M. Stallman <rms@gnu.org>
parents:
25154
diff
changeset
|
363 |
65477
a08c0922f1c4
(calendar-for-loop): Add edebug info.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64826
diff
changeset
|
364 (add-hook 'calendar-move-hook (lambda () (diary-view-entries 1))) |
25410
3ab4413f7549
(calendar-move-hook): New hook.
Richard M. Stallman <rms@gnu.org>
parents:
25154
diff
changeset
|
365 |
3ab4413f7549
(calendar-move-hook): New hook.
Richard M. Stallman <rms@gnu.org>
parents:
25154
diff
changeset
|
366 redisplays the diary for whatever date the cursor is moved to." |
3ab4413f7549
(calendar-move-hook): New hook.
Richard M. Stallman <rms@gnu.org>
parents:
25154
diff
changeset
|
367 :type 'hook |
96031
edf0549afd4a
(calendar-move-hook):Add calendar-update-mode-line as an option.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
368 :options '(calendar-update-mode-line) |
25410
3ab4413f7549
(calendar-move-hook): New hook.
Richard M. Stallman <rms@gnu.org>
parents:
25154
diff
changeset
|
369 :group 'calendar-hooks) |
3ab4413f7549
(calendar-move-hook): New hook.
Richard M. Stallman <rms@gnu.org>
parents:
25154
diff
changeset
|
370 |
96031
edf0549afd4a
(calendar-move-hook):Add calendar-update-mode-line as an option.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
371 (defcustom calendar-date-echo-text |
edf0549afd4a
(calendar-move-hook):Add calendar-update-mode-line as an option.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
372 "mouse-2: general menu\nmouse-3: menu for this date" |
edf0549afd4a
(calendar-move-hook):Add calendar-update-mode-line as an option.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
373 "String displayed when the cursor is over a date in the calendar. |
96295
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
374 Can be either a fixed string, or a lisp expression that returns one. |
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
375 When this expression is evaluated, DAY, MONTH, and YEAR are |
96031
edf0549afd4a
(calendar-move-hook):Add calendar-update-mode-line as an option.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
376 integers appropriate to the relevant date. For example, to |
96295
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
377 display the ISO date: |
96031
edf0549afd4a
(calendar-move-hook):Add calendar-update-mode-line as an option.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
378 |
96295
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
379 (setq calendar-date-echo-text '(format \"ISO date: %s\" |
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
380 (calendar-iso-date-string |
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
381 (list month day year)))) |
96031
edf0549afd4a
(calendar-move-hook):Add calendar-update-mode-line as an option.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
382 Changing this variable without using customize has no effect on |
edf0549afd4a
(calendar-move-hook):Add calendar-update-mode-line as an option.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
383 pre-existing calendar windows." |
edf0549afd4a
(calendar-move-hook):Add calendar-update-mode-line as an option.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
384 :group 'calendar |
edf0549afd4a
(calendar-move-hook):Add calendar-update-mode-line as an option.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
385 :initialize 'custom-initialize-default |
edf0549afd4a
(calendar-move-hook):Add calendar-update-mode-line as an option.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
386 :risky t |
edf0549afd4a
(calendar-move-hook):Add calendar-update-mode-line as an option.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
387 :set (lambda (sym val) |
edf0549afd4a
(calendar-move-hook):Add calendar-update-mode-line as an option.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
388 (set sym val) |
edf0549afd4a
(calendar-move-hook):Add calendar-update-mode-line as an option.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
389 (calendar-redraw)) |
96295
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
390 :type '(choice (string :tag "Fixed string") |
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
391 (sexp :value |
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
392 (format "ISO date: %s" |
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
393 (calendar-iso-date-string |
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
394 (list month day year))))) |
96031
edf0549afd4a
(calendar-move-hook):Add calendar-update-mode-line as an option.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
395 :version "23.1") |
edf0549afd4a
(calendar-move-hook):Add calendar-update-mode-line as an option.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
396 |
96158
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
397 |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
398 (defvar calendar-month-digit-width nil |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
399 "Width of the region with numbers in each month in the calendar.") |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
400 |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
401 (defvar calendar-month-width nil |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
402 "Full width of each month in the calendar.") |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
403 |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
404 (defvar calendar-right-margin nil |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
405 "Right margin of the calendar.") |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
406 |
96295
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
407 (defvar calendar-month-edges nil |
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
408 "Alist of month edge columns. |
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
409 Each element has the form (N LEFT FIRST LAST RIGHT), where |
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
410 LEFT is the leftmost column associated with month segment N, |
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
411 FIRST and LAST are the first and last columns with day digits in, |
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
412 and LAST is the rightmost column.") |
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
413 |
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
414 (defun calendar-month-edges (segment) |
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
415 "Compute the month edge columns for month SEGMENT. |
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
416 Returns a list (LEFT FIRST LAST RIGHT), where LEFT is the |
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
417 leftmost column associated with a month, FIRST and LAST are the |
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
418 first and last columns with day digits in, and LAST is the |
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
419 rightmost column." |
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
420 ;; The leftmost column with a digit in it in this month segment. |
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
421 (let* ((first (+ calendar-left-margin |
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
422 (* segment calendar-month-width))) |
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
423 ;; The rightmost column with a digit in it in this month segment. |
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
424 (last (+ first (1- calendar-month-digit-width))) |
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
425 (left (if (eq segment 0) |
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
426 0 |
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
427 (+ calendar-left-margin |
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
428 (* segment calendar-month-width) |
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
429 (- (/ calendar-intermonth-spacing 2))))) |
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
430 ;; The rightmost edge of this month segment, dividing the |
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
431 ;; space between months in two. |
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
432 (right (+ calendar-left-margin |
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
433 (* (1+ segment) calendar-month-width) |
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
434 (- (/ calendar-intermonth-spacing 2))))) |
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
435 (list left first last right))) |
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
436 |
96158
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
437 (defun calendar-recompute-layout-variables () |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
438 "Recompute some layout-related calendar \"constants\"." |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
439 (setq calendar-month-digit-width (+ (* 6 calendar-column-width) |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
440 calendar-day-digit-width) |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
441 calendar-month-width (+ (* 7 calendar-column-width) |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
442 calendar-intermonth-spacing) |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
443 calendar-right-margin (+ calendar-left-margin |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
444 (* 3 (* 7 calendar-column-width)) |
96295
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
445 (* 2 calendar-intermonth-spacing)) |
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
446 calendar-month-edges nil) |
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
447 (dotimes (i 3) |
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
448 (push (cons i (calendar-month-edges i)) calendar-month-edges)) |
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
449 (setq calendar-month-edges (reverse calendar-month-edges))) |
96158
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
450 |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
451 ;; FIXME add font-lock-keywords. |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
452 (defun calendar-set-layout-variable (symbol value &optional minmax) |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
453 "Set SYMBOL's value to VALUE, an integer. |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
454 A positive/negative MINMAX enforces a minimum/maximum value. |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
455 Then redraw the calendar, if necessary." |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
456 (let ((oldvalue (symbol-value symbol))) |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
457 (custom-set-default symbol (if minmax |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
458 (if (< minmax 0) |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
459 (min value (- minmax)) |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
460 (max value minmax)) |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
461 value)) |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
462 (unless (equal value oldvalue) |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
463 (calendar-recompute-layout-variables) |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
464 (calendar-redraw)))) |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
465 |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
466 (defcustom calendar-left-margin 5 |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
467 "Empty space to the left of the first month in the calendar." |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
468 :group 'calendar |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
469 :initialize 'custom-initialize-default |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
470 :set 'calendar-set-layout-variable |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
471 :type 'integer |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
472 :version "23.1") |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
473 |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
474 ;; Or you can view it as columns of width 2, with 1 space, no space |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
475 ;; after the last column, and a 5 space gap between month. |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
476 ;; FIXME check things work if this is odd. |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
477 (defcustom calendar-intermonth-spacing 4 |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
478 "Space between months in the calendar. Minimum value is 1." |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
479 :group 'calendar |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
480 :initialize 'custom-initialize-default |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
481 :set (lambda (sym val) |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
482 (calendar-set-layout-variable sym val 1)) |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
483 :type 'integer |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
484 :version "23.1") |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
485 |
96295
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
486 ;; FIXME calendar-month-column-width? |
96158
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
487 (defcustom calendar-column-width 3 |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
488 "Width of each day column in the calendar. Minimum value is 3." |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
489 :initialize 'custom-initialize-default |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
490 :set (lambda (sym val) |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
491 (calendar-set-layout-variable sym val 3)) |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
492 :type 'integer |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
493 :version "23.1") |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
494 |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
495 (defcustom calendar-day-header-width 2 |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
496 "Width of the day column headers in the calendar. |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
497 Must be at least one less than `calendar-column-width'." |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
498 :group 'calendar |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
499 :initialize 'custom-initialize-default |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
500 :set (lambda (sym val) |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
501 (calendar-set-layout-variable sym val (- 1 calendar-column-width))) |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
502 :type 'integer |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
503 :version "23.1") |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
504 |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
505 ;; FIXME a format specifier instead? |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
506 (defcustom calendar-day-digit-width 2 |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
507 "Width of the day digits in the calendar. Minimum value is 2." |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
508 :group 'calendar |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
509 :initialize 'custom-initialize-default |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
510 :set (lambda (sym val) |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
511 (calendar-set-layout-variable sym val 2)) |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
512 :type 'integer |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
513 :version "23.1") |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
514 |
96313
d0a5d3e21e88
(calendar-intermonth-header, calendar-intermonth-text): Move earlier in file.
Glenn Morris <rgm@gnu.org>
parents:
96295
diff
changeset
|
515 (defcustom calendar-intermonth-header nil |
d0a5d3e21e88
(calendar-intermonth-header, calendar-intermonth-text): Move earlier in file.
Glenn Morris <rgm@gnu.org>
parents:
96295
diff
changeset
|
516 "Header text display in the space to the left of each calendar month. |
d0a5d3e21e88
(calendar-intermonth-header, calendar-intermonth-text): Move earlier in file.
Glenn Morris <rgm@gnu.org>
parents:
96295
diff
changeset
|
517 See `calendar-intermonth-text'." |
d0a5d3e21e88
(calendar-intermonth-header, calendar-intermonth-text): Move earlier in file.
Glenn Morris <rgm@gnu.org>
parents:
96295
diff
changeset
|
518 :group 'calendar |
d0a5d3e21e88
(calendar-intermonth-header, calendar-intermonth-text): Move earlier in file.
Glenn Morris <rgm@gnu.org>
parents:
96295
diff
changeset
|
519 :initialize 'custom-initialize-default |
d0a5d3e21e88
(calendar-intermonth-header, calendar-intermonth-text): Move earlier in file.
Glenn Morris <rgm@gnu.org>
parents:
96295
diff
changeset
|
520 :risky t |
d0a5d3e21e88
(calendar-intermonth-header, calendar-intermonth-text): Move earlier in file.
Glenn Morris <rgm@gnu.org>
parents:
96295
diff
changeset
|
521 :set (lambda (sym val) |
d0a5d3e21e88
(calendar-intermonth-header, calendar-intermonth-text): Move earlier in file.
Glenn Morris <rgm@gnu.org>
parents:
96295
diff
changeset
|
522 (set sym val) |
d0a5d3e21e88
(calendar-intermonth-header, calendar-intermonth-text): Move earlier in file.
Glenn Morris <rgm@gnu.org>
parents:
96295
diff
changeset
|
523 (calendar-redraw)) |
d0a5d3e21e88
(calendar-intermonth-header, calendar-intermonth-text): Move earlier in file.
Glenn Morris <rgm@gnu.org>
parents:
96295
diff
changeset
|
524 :type '(choice (const nil :tag "Nothing") |
d0a5d3e21e88
(calendar-intermonth-header, calendar-intermonth-text): Move earlier in file.
Glenn Morris <rgm@gnu.org>
parents:
96295
diff
changeset
|
525 (string :tag "Fixed string") |
d0a5d3e21e88
(calendar-intermonth-header, calendar-intermonth-text): Move earlier in file.
Glenn Morris <rgm@gnu.org>
parents:
96295
diff
changeset
|
526 (sexp :value |
d0a5d3e21e88
(calendar-intermonth-header, calendar-intermonth-text): Move earlier in file.
Glenn Morris <rgm@gnu.org>
parents:
96295
diff
changeset
|
527 (propertize "WK" 'font-lock-face |
d0a5d3e21e88
(calendar-intermonth-header, calendar-intermonth-text): Move earlier in file.
Glenn Morris <rgm@gnu.org>
parents:
96295
diff
changeset
|
528 'font-lock-function-name-face))) |
d0a5d3e21e88
(calendar-intermonth-header, calendar-intermonth-text): Move earlier in file.
Glenn Morris <rgm@gnu.org>
parents:
96295
diff
changeset
|
529 :version "23.1") |
d0a5d3e21e88
(calendar-intermonth-header, calendar-intermonth-text): Move earlier in file.
Glenn Morris <rgm@gnu.org>
parents:
96295
diff
changeset
|
530 |
d0a5d3e21e88
(calendar-intermonth-header, calendar-intermonth-text): Move earlier in file.
Glenn Morris <rgm@gnu.org>
parents:
96295
diff
changeset
|
531 (defcustom calendar-intermonth-text nil |
d0a5d3e21e88
(calendar-intermonth-header, calendar-intermonth-text): Move earlier in file.
Glenn Morris <rgm@gnu.org>
parents:
96295
diff
changeset
|
532 "Text to display in the space to the left of each calendar month. |
d0a5d3e21e88
(calendar-intermonth-header, calendar-intermonth-text): Move earlier in file.
Glenn Morris <rgm@gnu.org>
parents:
96295
diff
changeset
|
533 Can be nil, a fixed string, or a lisp expression that returns a string. |
d0a5d3e21e88
(calendar-intermonth-header, calendar-intermonth-text): Move earlier in file.
Glenn Morris <rgm@gnu.org>
parents:
96295
diff
changeset
|
534 When the expression is evaluated, the variables DAY, MONTH and YEAR |
d0a5d3e21e88
(calendar-intermonth-header, calendar-intermonth-text): Move earlier in file.
Glenn Morris <rgm@gnu.org>
parents:
96295
diff
changeset
|
535 are integers appropriate for the first day in each week. |
d0a5d3e21e88
(calendar-intermonth-header, calendar-intermonth-text): Move earlier in file.
Glenn Morris <rgm@gnu.org>
parents:
96295
diff
changeset
|
536 Will be truncated to the smaller of `calendar-left-margin' and |
d0a5d3e21e88
(calendar-intermonth-header, calendar-intermonth-text): Move earlier in file.
Glenn Morris <rgm@gnu.org>
parents:
96295
diff
changeset
|
537 `calendar-intermonth-spacing'. The last character is forced to be a space. |
d0a5d3e21e88
(calendar-intermonth-header, calendar-intermonth-text): Move earlier in file.
Glenn Morris <rgm@gnu.org>
parents:
96295
diff
changeset
|
538 For example, to display the ISO week numbers: |
d0a5d3e21e88
(calendar-intermonth-header, calendar-intermonth-text): Move earlier in file.
Glenn Morris <rgm@gnu.org>
parents:
96295
diff
changeset
|
539 |
d0a5d3e21e88
(calendar-intermonth-header, calendar-intermonth-text): Move earlier in file.
Glenn Morris <rgm@gnu.org>
parents:
96295
diff
changeset
|
540 (setq calendar-week-start-day 1 |
d0a5d3e21e88
(calendar-intermonth-header, calendar-intermonth-text): Move earlier in file.
Glenn Morris <rgm@gnu.org>
parents:
96295
diff
changeset
|
541 calendar-intermonth-text |
d0a5d3e21e88
(calendar-intermonth-header, calendar-intermonth-text): Move earlier in file.
Glenn Morris <rgm@gnu.org>
parents:
96295
diff
changeset
|
542 '(propertize |
d0a5d3e21e88
(calendar-intermonth-header, calendar-intermonth-text): Move earlier in file.
Glenn Morris <rgm@gnu.org>
parents:
96295
diff
changeset
|
543 (format \"%2d\" |
d0a5d3e21e88
(calendar-intermonth-header, calendar-intermonth-text): Move earlier in file.
Glenn Morris <rgm@gnu.org>
parents:
96295
diff
changeset
|
544 (car |
d0a5d3e21e88
(calendar-intermonth-header, calendar-intermonth-text): Move earlier in file.
Glenn Morris <rgm@gnu.org>
parents:
96295
diff
changeset
|
545 (calendar-iso-from-absolute |
d0a5d3e21e88
(calendar-intermonth-header, calendar-intermonth-text): Move earlier in file.
Glenn Morris <rgm@gnu.org>
parents:
96295
diff
changeset
|
546 (calendar-absolute-from-gregorian (list month day year))))) |
d0a5d3e21e88
(calendar-intermonth-header, calendar-intermonth-text): Move earlier in file.
Glenn Morris <rgm@gnu.org>
parents:
96295
diff
changeset
|
547 'font-lock-face 'font-lock-function-name-face)) |
d0a5d3e21e88
(calendar-intermonth-header, calendar-intermonth-text): Move earlier in file.
Glenn Morris <rgm@gnu.org>
parents:
96295
diff
changeset
|
548 |
d0a5d3e21e88
(calendar-intermonth-header, calendar-intermonth-text): Move earlier in file.
Glenn Morris <rgm@gnu.org>
parents:
96295
diff
changeset
|
549 See also `calendar-intermonth-header'." |
d0a5d3e21e88
(calendar-intermonth-header, calendar-intermonth-text): Move earlier in file.
Glenn Morris <rgm@gnu.org>
parents:
96295
diff
changeset
|
550 :group 'calendar |
d0a5d3e21e88
(calendar-intermonth-header, calendar-intermonth-text): Move earlier in file.
Glenn Morris <rgm@gnu.org>
parents:
96295
diff
changeset
|
551 :initialize 'custom-initialize-default |
d0a5d3e21e88
(calendar-intermonth-header, calendar-intermonth-text): Move earlier in file.
Glenn Morris <rgm@gnu.org>
parents:
96295
diff
changeset
|
552 :risky t |
d0a5d3e21e88
(calendar-intermonth-header, calendar-intermonth-text): Move earlier in file.
Glenn Morris <rgm@gnu.org>
parents:
96295
diff
changeset
|
553 :set (lambda (sym val) |
d0a5d3e21e88
(calendar-intermonth-header, calendar-intermonth-text): Move earlier in file.
Glenn Morris <rgm@gnu.org>
parents:
96295
diff
changeset
|
554 (set sym val) |
d0a5d3e21e88
(calendar-intermonth-header, calendar-intermonth-text): Move earlier in file.
Glenn Morris <rgm@gnu.org>
parents:
96295
diff
changeset
|
555 (calendar-redraw)) |
d0a5d3e21e88
(calendar-intermonth-header, calendar-intermonth-text): Move earlier in file.
Glenn Morris <rgm@gnu.org>
parents:
96295
diff
changeset
|
556 :type '(choice (const nil :tag "Nothing") |
d0a5d3e21e88
(calendar-intermonth-header, calendar-intermonth-text): Move earlier in file.
Glenn Morris <rgm@gnu.org>
parents:
96295
diff
changeset
|
557 (string :tag "Fixed string") |
d0a5d3e21e88
(calendar-intermonth-header, calendar-intermonth-text): Move earlier in file.
Glenn Morris <rgm@gnu.org>
parents:
96295
diff
changeset
|
558 (sexp :value |
d0a5d3e21e88
(calendar-intermonth-header, calendar-intermonth-text): Move earlier in file.
Glenn Morris <rgm@gnu.org>
parents:
96295
diff
changeset
|
559 (propertize |
d0a5d3e21e88
(calendar-intermonth-header, calendar-intermonth-text): Move earlier in file.
Glenn Morris <rgm@gnu.org>
parents:
96295
diff
changeset
|
560 (format "%2d" |
d0a5d3e21e88
(calendar-intermonth-header, calendar-intermonth-text): Move earlier in file.
Glenn Morris <rgm@gnu.org>
parents:
96295
diff
changeset
|
561 (car |
d0a5d3e21e88
(calendar-intermonth-header, calendar-intermonth-text): Move earlier in file.
Glenn Morris <rgm@gnu.org>
parents:
96295
diff
changeset
|
562 (calendar-iso-from-absolute |
d0a5d3e21e88
(calendar-intermonth-header, calendar-intermonth-text): Move earlier in file.
Glenn Morris <rgm@gnu.org>
parents:
96295
diff
changeset
|
563 (calendar-absolute-from-gregorian |
d0a5d3e21e88
(calendar-intermonth-header, calendar-intermonth-text): Move earlier in file.
Glenn Morris <rgm@gnu.org>
parents:
96295
diff
changeset
|
564 (list month day year))))) |
d0a5d3e21e88
(calendar-intermonth-header, calendar-intermonth-text): Move earlier in file.
Glenn Morris <rgm@gnu.org>
parents:
96295
diff
changeset
|
565 'font-lock-face 'font-lock-function-name-face))) |
d0a5d3e21e88
(calendar-intermonth-header, calendar-intermonth-text): Move earlier in file.
Glenn Morris <rgm@gnu.org>
parents:
96295
diff
changeset
|
566 :version "23.1") |
96158
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
567 |
17625
321afd5b0bc5
Add defgroups, and use defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16099
diff
changeset
|
568 (defcustom diary-file "~/diary" |
68366
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
569 "Name of the file in which one's personal diary of dates is kept. |
628 | 570 |
52115
60ffdeba6e0e
(diary-file, diary-file-name-prefix)
Glenn Morris <rgm@gnu.org>
parents:
49828
diff
changeset
|
571 The file's entries are lines beginning with any of the forms |
93278 | 572 specified by the variable `diary-date-forms', which by default |
93808
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
573 uses the forms of `diary-american-date-forms': |
628 | 574 |
575 MONTH/DAY | |
576 MONTH/DAY/YEAR | |
577 MONTHNAME DAY | |
578 MONTHNAME DAY, YEAR | |
579 DAYNAME | |
580 | |
52115
60ffdeba6e0e
(diary-file, diary-file-name-prefix)
Glenn Morris <rgm@gnu.org>
parents:
49828
diff
changeset
|
581 with the remainder of the line being the diary entry string for |
60ffdeba6e0e
(diary-file, diary-file-name-prefix)
Glenn Morris <rgm@gnu.org>
parents:
49828
diff
changeset
|
582 that date. MONTH and DAY are one or two digit numbers, YEAR is a |
60ffdeba6e0e
(diary-file, diary-file-name-prefix)
Glenn Morris <rgm@gnu.org>
parents:
49828
diff
changeset
|
583 number and may be written in full or abbreviated to the final two |
93791
4ef65ad699dc
Update for diary-lib name changes.
Glenn Morris <rgm@gnu.org>
parents:
93740
diff
changeset
|
584 digits (if `diary-abbreviated-year-flag' is non-nil). MONTHNAME |
92895 | 585 and DAYNAME can be spelled in full (as specified by the variables |
93278 | 586 `calendar-month-name-array' and `calendar-day-name-array'), or |
52115
60ffdeba6e0e
(diary-file, diary-file-name-prefix)
Glenn Morris <rgm@gnu.org>
parents:
49828
diff
changeset
|
587 abbreviated (as specified by `calendar-month-abbrev-array' and |
93278 | 588 `calendar-day-abbrev-array') with or without a period. Case is |
589 ignored. Any of DAY, MONTH, or MONTHNAME, YEAR can be `*' which | |
590 matches any day, month, or year, respectively. If the date does | |
591 not contain a year, it is generic and applies to any year. A | |
592 DAYNAME entry applies to the appropriate day of the week in every week. | |
52115
60ffdeba6e0e
(diary-file, diary-file-name-prefix)
Glenn Morris <rgm@gnu.org>
parents:
49828
diff
changeset
|
593 |
93374
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
594 You can customize `diary-date-forms' to your preferred format. |
93808
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
595 Three default styles are provided: `diary-american-date-forms', |
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
596 `diary-european-date-forms', and `diary-iso-date-forms'. |
93374
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
597 You can choose between these by setting `calendar-date-style' in your |
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
598 .emacs file, or by using `calendar-set-date-style' when in the calendar. |
628 | 599 |
93278 | 600 A diary entry can be preceded by the character `diary-nonmarking-symbol' |
601 \(ordinarily `&') to make that entry nonmarking--that is, it will not be | |
602 marked on dates in the calendar window but will appear in a diary window. | |
628 | 603 |
604 Multiline diary entries are made by indenting lines after the first with | |
605 either a TAB or one or more spaces. | |
606 | |
607 Lines not in one the above formats are ignored. Here are some sample diary | |
608 entries (in the default American style): | |
609 | |
610 12/22/1988 Twentieth wedding anniversary!! | |
611 &1/1. Happy New Year! | |
612 10/22 Ruth's birthday. | |
613 21: Payday | |
614 Tuesday--weekly meeting with grad students at 10am | |
615 Supowit, Shen, Bitner, and Kapoor to attend. | |
616 1/13/89 Friday the thirteenth!! | |
617 &thu 4pm squash game with Lloyd. | |
618 mar 16 Dad's birthday | |
619 April 15, 1989 Income tax due. | |
620 &* 15 time cards due. | |
621 | |
622 If the first line of a diary entry consists only of the date or day name with | |
6737 | 623 no trailing blanks or punctuation, then that line is not displayed in the |
624 diary window; only the continuation lines is shown. For example, the | |
628 | 625 single diary entry |
626 | |
627 02/11/1989 | |
628 Bill Blattner visits Princeton today | |
629 2pm Cognitive Studies Committee meeting | |
630 2:30-5:30 Lizzie at Lawrenceville for `Group Initiative' | |
631 4:00pm Jamie Tappenden | |
632 7:30pm Dinner at George and Ed's for Alan Ryan | |
633 7:30-10:00pm dance at Stewart Country Day School | |
634 | |
635 will appear in the diary window without the date line at the beginning. This | |
636 facility allows the diary window to look neater, but can cause confusion if | |
637 used with more than one day's entries displayed. | |
638 | |
639 Diary entries can be based on Lisp sexps. For example, the diary entry | |
640 | |
641 %%(diary-block 11 1 1990 11 10 1990) Vacation | |
642 | |
55431
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
54536
diff
changeset
|
643 causes the diary entry \"Vacation\" to appear from November 1 through |
93278 | 644 November 10, 1990. See the documentation for the function |
93791
4ef65ad699dc
Update for diary-lib name changes.
Glenn Morris <rgm@gnu.org>
parents:
93740
diff
changeset
|
645 `diary-list-sexp-entries' for more details. |
55431
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
54536
diff
changeset
|
646 |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
54536
diff
changeset
|
647 Diary entries based on the Hebrew, the Islamic and/or the Baha'i |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
54536
diff
changeset
|
648 calendar are also possible, but because these are somewhat slow, they |
93791
4ef65ad699dc
Update for diary-lib name changes.
Glenn Morris <rgm@gnu.org>
parents:
93740
diff
changeset
|
649 are ignored unless you set the `diary-nongregorian-listing-hook' and |
4ef65ad699dc
Update for diary-lib name changes.
Glenn Morris <rgm@gnu.org>
parents:
93740
diff
changeset
|
650 the `diary-nongregorian-marking-hook' appropriately. See the |
93026
8e1a78482251
(calendar-today-marker, initial-calendar-window-hook)
Glenn Morris <rgm@gnu.org>
parents:
92988
diff
changeset
|
651 documentation of these hooks for details. |
628 | 652 |
653 Diary files can contain directives to include the contents of other files; for | |
93791
4ef65ad699dc
Update for diary-lib name changes.
Glenn Morris <rgm@gnu.org>
parents:
93740
diff
changeset
|
654 details, see the documentation for the variable `diary-list-entries-hook'." |
17625
321afd5b0bc5
Add defgroups, and use defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16099
diff
changeset
|
655 :type 'file |
321afd5b0bc5
Add defgroups, and use defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16099
diff
changeset
|
656 :group 'diary) |
628 | 657 |
93026
8e1a78482251
(calendar-today-marker, initial-calendar-window-hook)
Glenn Morris <rgm@gnu.org>
parents:
92988
diff
changeset
|
658 ;; FIXME do these have to be single characters? |
17625
321afd5b0bc5
Add defgroups, and use defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16099
diff
changeset
|
659 (defcustom diary-nonmarking-symbol "&" |
68366
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
660 "Symbol indicating that a diary entry is not to be marked in the calendar." |
17625
321afd5b0bc5
Add defgroups, and use defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16099
diff
changeset
|
661 :type 'string |
321afd5b0bc5
Add defgroups, and use defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16099
diff
changeset
|
662 :group 'diary) |
628 | 663 |
94019
28144b96054e
(calendar-faces): New custom group.
Glenn Morris <rgm@gnu.org>
parents:
93995
diff
changeset
|
664 (define-obsolete-variable-alias 'hebrew-diary-entry-symbol |
28144b96054e
(calendar-faces): New custom group.
Glenn Morris <rgm@gnu.org>
parents:
93995
diff
changeset
|
665 'diary-hebrew-entry-symbol "23.1") |
28144b96054e
(calendar-faces): New custom group.
Glenn Morris <rgm@gnu.org>
parents:
93995
diff
changeset
|
666 |
93730
4228779bdf81
(diary-hebrew-entry-symbol): Rename hebrew-diary-entry-symbol.
Glenn Morris <rgm@gnu.org>
parents:
93719
diff
changeset
|
667 (defcustom diary-hebrew-entry-symbol "H" |
68366
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
668 "Symbol indicating a diary entry according to the Hebrew calendar." |
17625
321afd5b0bc5
Add defgroups, and use defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16099
diff
changeset
|
669 :type 'string |
321afd5b0bc5
Add defgroups, and use defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16099
diff
changeset
|
670 :group 'diary) |
628 | 671 |
94019
28144b96054e
(calendar-faces): New custom group.
Glenn Morris <rgm@gnu.org>
parents:
93995
diff
changeset
|
672 (define-obsolete-variable-alias 'islamic-diary-entry-symbol |
28144b96054e
(calendar-faces): New custom group.
Glenn Morris <rgm@gnu.org>
parents:
93995
diff
changeset
|
673 'diary-islamic-entry-symbol "23.1") |
93730
4228779bdf81
(diary-hebrew-entry-symbol): Rename hebrew-diary-entry-symbol.
Glenn Morris <rgm@gnu.org>
parents:
93719
diff
changeset
|
674 |
4228779bdf81
(diary-hebrew-entry-symbol): Rename hebrew-diary-entry-symbol.
Glenn Morris <rgm@gnu.org>
parents:
93719
diff
changeset
|
675 (defcustom diary-islamic-entry-symbol "I" |
68366
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
676 "Symbol indicating a diary entry according to the Islamic calendar." |
17625
321afd5b0bc5
Add defgroups, and use defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16099
diff
changeset
|
677 :type 'string |
321afd5b0bc5
Add defgroups, and use defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16099
diff
changeset
|
678 :group 'diary) |
628 | 679 |
94019
28144b96054e
(calendar-faces): New custom group.
Glenn Morris <rgm@gnu.org>
parents:
93995
diff
changeset
|
680 (define-obsolete-variable-alias 'bahai-diary-entry-symbol |
28144b96054e
(calendar-faces): New custom group.
Glenn Morris <rgm@gnu.org>
parents:
93995
diff
changeset
|
681 'diary-bahai-entry-symbol "23.1") |
93730
4228779bdf81
(diary-hebrew-entry-symbol): Rename hebrew-diary-entry-symbol.
Glenn Morris <rgm@gnu.org>
parents:
93719
diff
changeset
|
682 |
4228779bdf81
(diary-hebrew-entry-symbol): Rename hebrew-diary-entry-symbol.
Glenn Morris <rgm@gnu.org>
parents:
93719
diff
changeset
|
683 (defcustom diary-bahai-entry-symbol "B" |
68366
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
684 "Symbol indicating a diary entry according to the Baha'i calendar." |
55431
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
54536
diff
changeset
|
685 :type 'string |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
54536
diff
changeset
|
686 :group 'diary) |
b278cb498cc8
2004-05-08 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
54536
diff
changeset
|
687 |
17625
321afd5b0bc5
Add defgroups, and use defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16099
diff
changeset
|
688 (defcustom european-calendar-style nil |
93374
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
689 "Non-nil means use the European style of dates in the diary and display. |
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
690 In this case, a date like 1/2/1990 would be interpreted as |
93808
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
691 February 1, 1990. See `diary-european-date-forms' for the |
93374
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
692 default European diary date styles. |
73176
3dbfd59b44b5
(european-calendar-style): Call european-calendar or american-calendar
Glenn Morris <rgm@gnu.org>
parents:
71569
diff
changeset
|
693 |
3dbfd59b44b5
(european-calendar-style): Call european-calendar or american-calendar
Glenn Morris <rgm@gnu.org>
parents:
71569
diff
changeset
|
694 Setting this variable directly does not take effect (if the |
3dbfd59b44b5
(european-calendar-style): Call european-calendar or american-calendar
Glenn Morris <rgm@gnu.org>
parents:
71569
diff
changeset
|
695 calendar package is already loaded). Rather, use either |
93374
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
696 \\[customize] or the function `calendar-set-date-style'." |
17625
321afd5b0bc5
Add defgroups, and use defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16099
diff
changeset
|
697 :type 'boolean |
73176
3dbfd59b44b5
(european-calendar-style): Call european-calendar or american-calendar
Glenn Morris <rgm@gnu.org>
parents:
71569
diff
changeset
|
698 ;; Without :initialize (require 'calendar) throws an error because |
93374
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
699 ;; calendar-set-date-style is undefined at this point. |
73176
3dbfd59b44b5
(european-calendar-style): Call european-calendar or american-calendar
Glenn Morris <rgm@gnu.org>
parents:
71569
diff
changeset
|
700 :initialize 'custom-initialize-default |
73181
97319c05f531
(european-calendar-style): Tweak previous fix.
Glenn Morris <rgm@gnu.org>
parents:
73176
diff
changeset
|
701 :set (lambda (symbol value) |
97319c05f531
(european-calendar-style): Tweak previous fix.
Glenn Morris <rgm@gnu.org>
parents:
73176
diff
changeset
|
702 (if value |
93374
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
703 (calendar-set-date-style 'european) |
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
704 (calendar-set-date-style 'american))) |
93947
6819f30b721b
(calendar, diary): Add :prefix.
Glenn Morris <rgm@gnu.org>
parents:
93900
diff
changeset
|
705 :group 'calendar) |
628 | 706 |
93374
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
707 (make-obsolete-variable 'european-calendar-style 'calendar-date-style "23.1") |
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
708 |
93846
e4a7737b7ba2
(calendar-date-style): Remove autoload cookie.
Glenn Morris <rgm@gnu.org>
parents:
93844
diff
changeset
|
709 ;; If this is autoloaded, c-d-s gets set before any customization of e-c-s. |
93374
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
710 (defcustom calendar-date-style (if european-calendar-style 'european |
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
711 'american) |
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
712 "Your preferred style for writing dates. |
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
713 The options are: |
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
714 `american' - month/day/year |
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
715 `european' - day/month/year |
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
716 `iso' - year/month/day |
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
717 This affects how dates written in your diary are interpreted. |
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
718 It also affects date display, as well as those calendar and diary |
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
719 functions that take a date as an argument, e.g. `diary-date', by |
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
720 changing the order in which the arguments are interpreted. |
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
721 |
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
722 Setting this variable directly does not take effect (if the |
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
723 calendar package is already loaded). Rather, use either |
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
724 \\[customize] or the function `calendar-set-date-style'." |
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
725 :version "23.1" |
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
726 :type '(choice (const american :tag "Month/Day/Year") |
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
727 (const european :tag "Day/Month/Year") |
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
728 (const iso :tag "Year/Month/Day")) |
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
729 :initialize 'custom-initialize-default |
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
730 :set (lambda (symbol value) |
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
731 (calendar-set-date-style value)) |
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
732 :group 'calendar) |
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
733 |
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
734 ;; Next three are provided to aid in setting diary-date-forms. |
93995
27365ac56ead
(diary, holidays): Move custom groups to other files.
Glenn Morris <rgm@gnu.org>
parents:
93947
diff
changeset
|
735 ;; FIXME move to diary-lib? |
93808
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
736 (defcustom diary-iso-date-forms |
93374
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
737 '((month "[-/]" day "[^-/0-9]") |
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
738 (year "[-/]" month "[-/]" day "[^0-9]") |
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
739 (monthname "-" day "[^-0-9]") |
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
740 (year "-" monthname "-" day "[^0-9]") |
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
741 (dayname "\\W")) |
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
742 "List of pseudo-patterns describing the ISO style of dates. |
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
743 The defaults are: MONTH[-/]DAY; YEAR[-/]MONTH[-/]DAY; MONTHNAME-DAY; |
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
744 YEAR-MONTHNAME-DAY; DAYNAME. Normally you should not customize this, |
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
745 but `diary-date-forms' (which see)." |
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
746 :version "23.1" |
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
747 :type '(repeat (choice (cons :tag "Backup" |
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
748 :value (backup . nil) |
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
749 (const backup) |
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
750 (repeat (list :inline t :format "%v" |
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
751 (symbol :tag "Keyword") |
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
752 (choice symbol regexp)))) |
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
753 (repeat (list :inline t :format "%v" |
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
754 (symbol :tag "Keyword") |
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
755 (choice symbol regexp))))) |
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
756 :group 'diary) |
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
757 |
94019
28144b96054e
(calendar-faces): New custom group.
Glenn Morris <rgm@gnu.org>
parents:
93995
diff
changeset
|
758 (define-obsolete-variable-alias 'american-date-diary-pattern |
28144b96054e
(calendar-faces): New custom group.
Glenn Morris <rgm@gnu.org>
parents:
93995
diff
changeset
|
759 'diary-american-date-forms "23.1") |
28144b96054e
(calendar-faces): New custom group.
Glenn Morris <rgm@gnu.org>
parents:
93995
diff
changeset
|
760 |
93808
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
761 (defcustom diary-american-date-forms |
628 | 762 '((month "/" day "[^/0-9]") |
763 (month "/" day "/" year "[^0-9]") | |
764 (monthname " *" day "[^,0-9]") | |
765 (monthname " *" day ", *" year "[^0-9]") | |
766 (dayname "\\W")) | |
93374
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
767 "List of pseudo-patterns describing the American style of dates. |
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
768 The defaults are: MONTH/DAY; MONTH/DAY/YEAR; MONTHNAME DAY; |
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
769 MONTHNAME DAY, YEAR; DAYNAME. Normally you should not customize this, |
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
770 but `diary-date-forms' (which see)." |
17625
321afd5b0bc5
Add defgroups, and use defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16099
diff
changeset
|
771 :type '(repeat (choice (cons :tag "Backup" |
92858 | 772 :value (backup . nil) |
773 (const backup) | |
774 (repeat (list :inline t :format "%v" | |
775 (symbol :tag "Keyword") | |
776 (choice symbol regexp)))) | |
777 (repeat (list :inline t :format "%v" | |
778 (symbol :tag "Keyword") | |
779 (choice symbol regexp))))) | |
17625
321afd5b0bc5
Add defgroups, and use defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16099
diff
changeset
|
780 :group 'diary) |
628 | 781 |
94019
28144b96054e
(calendar-faces): New custom group.
Glenn Morris <rgm@gnu.org>
parents:
93995
diff
changeset
|
782 (define-obsolete-variable-alias 'european-date-diary-pattern |
28144b96054e
(calendar-faces): New custom group.
Glenn Morris <rgm@gnu.org>
parents:
93995
diff
changeset
|
783 'diary-european-date-forms "23.1") |
93808
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
784 |
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
785 (defcustom diary-european-date-forms |
628 | 786 '((day "/" month "[^/0-9]") |
787 (day "/" month "/" year "[^0-9]") | |
25154
4c873bb645d8
(european-date-diary-pattern): Fix pattern so it
Richard M. Stallman <rms@gnu.org>
parents:
24891
diff
changeset
|
788 (backup day " *" monthname "\\W+\\<\\([^*0-9]\\|\\([0-9]+[:aApP]\\)\\)") |
628 | 789 (day " *" monthname " *" year "[^0-9]") |
790 (dayname "\\W")) | |
93374
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
791 "List of pseudo-patterns describing the European style of dates. |
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
792 The defaults are: DAY/MONTH; DAY/MONTH/YEAR; DAY MONTHNAME; |
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
793 DAY MONTHNAME YEAR; DAYNAME. Normally you should not customize this, but |
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
794 `diary-date-forms' (which see)." |
17625
321afd5b0bc5
Add defgroups, and use defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16099
diff
changeset
|
795 :type '(repeat (choice (cons :tag "Backup" |
92858 | 796 :value (backup . nil) |
797 (const backup) | |
798 (repeat (list :inline t :format "%v" | |
799 (symbol :tag "Keyword") | |
800 (choice symbol regexp)))) | |
801 (repeat (list :inline t :format "%v" | |
802 (symbol :tag "Keyword") | |
803 (choice symbol regexp))))) | |
17625
321afd5b0bc5
Add defgroups, and use defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16099
diff
changeset
|
804 :group 'diary) |
628 | 805 |
77044
e0a720fbf325
(diary-font-lock-keywords, diary-live-p): Autoload these functions.
Glenn Morris <rgm@gnu.org>
parents:
76752
diff
changeset
|
806 (defvar diary-font-lock-keywords) |
e0a720fbf325
(diary-font-lock-keywords, diary-live-p): Autoload these functions.
Glenn Morris <rgm@gnu.org>
parents:
76752
diff
changeset
|
807 |
93374
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
808 (defcustom diary-date-forms (cond ((eq calendar-date-style 'iso) |
93808
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
809 diary-iso-date-forms) |
93374
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
810 ((eq calendar-date-style 'european) |
93808
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
811 diary-european-date-forms) |
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
812 (t diary-american-date-forms)) |
68366
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
813 "List of pseudo-patterns describing the forms of date used in the diary. |
44371 | 814 The patterns on the list must be MUTUALLY EXCLUSIVE and should not match |
628 | 815 any portion of the diary entry itself, just the date component. |
816 | |
817 A pseudo-pattern is a list of regular expressions and the keywords `month', | |
818 `day', `year', `monthname', and `dayname'. The keyword `monthname' will | |
52115
60ffdeba6e0e
(diary-file, diary-file-name-prefix)
Glenn Morris <rgm@gnu.org>
parents:
49828
diff
changeset
|
819 match the name of the month (see `calendar-month-name-array'), capitalized |
60ffdeba6e0e
(diary-file, diary-file-name-prefix)
Glenn Morris <rgm@gnu.org>
parents:
49828
diff
changeset
|
820 or not, or its user-specified abbreviation (see `calendar-month-abbrev-array'), |
60ffdeba6e0e
(diary-file, diary-file-name-prefix)
Glenn Morris <rgm@gnu.org>
parents:
49828
diff
changeset
|
821 followed by a period or not; it will also match `*'. Similarly, `dayname' |
60ffdeba6e0e
(diary-file, diary-file-name-prefix)
Glenn Morris <rgm@gnu.org>
parents:
49828
diff
changeset
|
822 will match the name of the day (see `calendar-day-name-array'), capitalized or |
60ffdeba6e0e
(diary-file, diary-file-name-prefix)
Glenn Morris <rgm@gnu.org>
parents:
49828
diff
changeset
|
823 not, or its user-specified abbreviation (see `calendar-day-abbrev-array'), |
60ffdeba6e0e
(diary-file, diary-file-name-prefix)
Glenn Morris <rgm@gnu.org>
parents:
49828
diff
changeset
|
824 followed by a period or not. The keywords `month', `day', and `year' will |
60ffdeba6e0e
(diary-file, diary-file-name-prefix)
Glenn Morris <rgm@gnu.org>
parents:
49828
diff
changeset
|
825 match those numerical values, preceded by arbitrarily many zeros; they will |
60ffdeba6e0e
(diary-file, diary-file-name-prefix)
Glenn Morris <rgm@gnu.org>
parents:
49828
diff
changeset
|
826 also match `*'. |
628 | 827 |
828 The matching of the diary entries with the date forms is done with the | |
829 standard syntax table from Fundamental mode, but with the `*' changed so | |
830 that it is a word constituent. | |
831 | |
832 If, to be mutually exclusive, a pseudo-pattern must match a portion of the | |
833 diary entry itself, the first element of the pattern MUST be `backup'. This | |
957 | 834 directive causes the date recognizer to back up to the beginning of the |
835 current word of the diary entry, so in no case can the pattern match more than | |
93374
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
836 a portion of the first word of the diary entry. |
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
837 |
93808
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
838 For examples of three common styles, see `diary-american-date-forms', |
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
839 `diary-european-date-forms', and `diary-iso-date-forms'." |
17625
321afd5b0bc5
Add defgroups, and use defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16099
diff
changeset
|
840 :type '(repeat (choice (cons :tag "Backup" |
92858 | 841 :value (backup . nil) |
842 (const backup) | |
843 (repeat (list :inline t :format "%v" | |
844 (symbol :tag "Keyword") | |
845 (choice symbol regexp)))) | |
846 (repeat (list :inline t :format "%v" | |
847 (symbol :tag "Keyword") | |
848 (choice symbol regexp))))) | |
102354
3206ad427d3c
(diary-date-forms, calendar-date-display-form):
Glenn Morris <rgm@gnu.org>
parents:
101938
diff
changeset
|
849 :set-after '(calendar-date-style diary-iso-date-forms |
3206ad427d3c
(diary-date-forms, calendar-date-display-form):
Glenn Morris <rgm@gnu.org>
parents:
101938
diff
changeset
|
850 diary-european-date-forms |
3206ad427d3c
(diary-date-forms, calendar-date-display-form):
Glenn Morris <rgm@gnu.org>
parents:
101938
diff
changeset
|
851 diary-american-date-forms) |
77044
e0a720fbf325
(diary-font-lock-keywords, diary-live-p): Autoload these functions.
Glenn Morris <rgm@gnu.org>
parents:
76752
diff
changeset
|
852 :initialize 'custom-initialize-default |
e0a720fbf325
(diary-font-lock-keywords, diary-live-p): Autoload these functions.
Glenn Morris <rgm@gnu.org>
parents:
76752
diff
changeset
|
853 :set (lambda (symbol value) |
e0a720fbf325
(diary-font-lock-keywords, diary-live-p): Autoload these functions.
Glenn Morris <rgm@gnu.org>
parents:
76752
diff
changeset
|
854 (unless (equal value (eval symbol)) |
e0a720fbf325
(diary-font-lock-keywords, diary-live-p): Autoload these functions.
Glenn Morris <rgm@gnu.org>
parents:
76752
diff
changeset
|
855 (custom-set-default symbol value) |
e0a720fbf325
(diary-font-lock-keywords, diary-live-p): Autoload these functions.
Glenn Morris <rgm@gnu.org>
parents:
76752
diff
changeset
|
856 (setq diary-font-lock-keywords (diary-font-lock-keywords)) |
e0a720fbf325
(diary-font-lock-keywords, diary-live-p): Autoload these functions.
Glenn Morris <rgm@gnu.org>
parents:
76752
diff
changeset
|
857 ;; Need to redraw not just to get new font-locking, but also |
e0a720fbf325
(diary-font-lock-keywords, diary-live-p): Autoload these functions.
Glenn Morris <rgm@gnu.org>
parents:
76752
diff
changeset
|
858 ;; to pick up any newly recognized entries. |
e0a720fbf325
(diary-font-lock-keywords, diary-live-p): Autoload these functions.
Glenn Morris <rgm@gnu.org>
parents:
76752
diff
changeset
|
859 (and (diary-live-p) |
e0a720fbf325
(diary-font-lock-keywords, diary-live-p): Autoload these functions.
Glenn Morris <rgm@gnu.org>
parents:
76752
diff
changeset
|
860 (diary)))) |
17625
321afd5b0bc5
Add defgroups, and use defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16099
diff
changeset
|
861 :group 'diary) |
957 | 862 |
93374
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
863 ;; Next three are provided to aid in setting calendar-date-display-form. |
93808
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
864 (defcustom calendar-iso-date-display-form '((format "%s-%.2d-%.2d" year |
93374
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
865 (string-to-number month) |
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
866 (string-to-number day))) |
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
867 "Pseudo-pattern governing the way a date appears in the ISO style. |
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
868 Normally you should not customize this, but `calendar-date-display-form' |
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
869 \(which see)." |
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
870 :type 'sexp |
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
871 :version "23.1" |
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
872 :group 'calendar) |
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
873 |
94019
28144b96054e
(calendar-faces): New custom group.
Glenn Morris <rgm@gnu.org>
parents:
93995
diff
changeset
|
874 (define-obsolete-variable-alias 'european-calendar-display-form |
28144b96054e
(calendar-faces): New custom group.
Glenn Morris <rgm@gnu.org>
parents:
93995
diff
changeset
|
875 'calendar-european-date-display-form "23.1") |
28144b96054e
(calendar-faces): New custom group.
Glenn Morris <rgm@gnu.org>
parents:
93995
diff
changeset
|
876 |
93808
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
877 (defcustom calendar-european-date-display-form |
957 | 878 '((if dayname (concat dayname ", ")) day " " monthname " " year) |
68366
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
879 "Pseudo-pattern governing the way a date appears in the European style. |
93374
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
880 Normally you should not customize this, but `calendar-date-display-form' |
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
881 \(which see)." |
17625
321afd5b0bc5
Add defgroups, and use defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16099
diff
changeset
|
882 :type 'sexp |
321afd5b0bc5
Add defgroups, and use defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16099
diff
changeset
|
883 :group 'calendar) |
628 | 884 |
94019
28144b96054e
(calendar-faces): New custom group.
Glenn Morris <rgm@gnu.org>
parents:
93995
diff
changeset
|
885 (define-obsolete-variable-alias 'american-calendar-display-form |
28144b96054e
(calendar-faces): New custom group.
Glenn Morris <rgm@gnu.org>
parents:
93995
diff
changeset
|
886 'calendar-american-date-display-form "23.1") |
93808
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
887 |
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
888 (defcustom calendar-american-date-display-form |
957 | 889 '((if dayname (concat dayname ", ")) monthname " " day ", " year) |
68366
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
890 "Pseudo-pattern governing the way a date appears in the American style. |
93374
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
891 Normally you should not customize this, but `calendar-date-display-form' |
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
892 \(which see)." |
17625
321afd5b0bc5
Add defgroups, and use defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16099
diff
changeset
|
893 :type 'sexp |
321afd5b0bc5
Add defgroups, and use defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16099
diff
changeset
|
894 :group 'calendar) |
628 | 895 |
93808
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
896 (defcustom calendar-date-display-form |
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
897 (cond ((eq calendar-date-style 'iso) |
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
898 calendar-iso-date-display-form) |
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
899 ((eq calendar-date-style 'european) |
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
900 calendar-european-date-display-form) |
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
901 (t calendar-american-date-display-form)) |
93374
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
902 "Pseudo-pattern governing the way a calendar date appears. |
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
903 Used by the function `calendar-date-string' (which see), a pseudo-pattern |
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
904 is a list of expressions that can involve the keywords `month', `day', |
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
905 and `year' (all numbers in string form), and `monthname' and `dayname' |
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
906 \(both alphabetic strings). For example, a typical American form would be |
628 | 907 |
908 '(month \"/\" day \"/\" (substring year -2)) | |
909 | |
93374
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
910 whereas |
628 | 911 |
912 '((format \"%9s, %9s %2s, %4s\" dayname monthname day year)) | |
913 | |
93374
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
914 would give the usual American style in fixed-length fields. The variables |
93808
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
915 `calendar-iso-date-display-form', `calendar-european-date-display-form', and |
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
916 `calendar-american-date-display-form' provide some defaults for three common |
93374
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
917 styles." |
17625
321afd5b0bc5
Add defgroups, and use defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16099
diff
changeset
|
918 :type 'sexp |
102354
3206ad427d3c
(diary-date-forms, calendar-date-display-form):
Glenn Morris <rgm@gnu.org>
parents:
101938
diff
changeset
|
919 :set-after '(calendar-date-style calendar-iso-date-display-form |
3206ad427d3c
(diary-date-forms, calendar-date-display-form):
Glenn Morris <rgm@gnu.org>
parents:
101938
diff
changeset
|
920 calendar-european-date-display-form |
3206ad427d3c
(diary-date-forms, calendar-date-display-form):
Glenn Morris <rgm@gnu.org>
parents:
101938
diff
changeset
|
921 calendar-american-date-display-form) |
17625
321afd5b0bc5
Add defgroups, and use defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16099
diff
changeset
|
922 :group 'calendar) |
628 | 923 |
93374
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
924 (defun calendar-set-date-style (style) |
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
925 "Set the style of calendar and diary dates to STYLE (a symbol). |
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
926 The valid styles are described in the documentation of `calendar-date-style'." |
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
927 (interactive (list (intern |
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
928 (completing-read "Date style: " |
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
929 '("american" "european" "iso") nil t |
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
930 nil nil "american")))) |
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
931 (or (memq style '(american european iso)) |
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
932 (setq style 'american)) |
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
933 (setq calendar-date-style style |
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
934 calendar-date-display-form |
93808
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
935 (symbol-value (intern-soft |
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
936 (format "calendar-%s-date-display-form" style))) |
93374
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
937 diary-date-forms |
93808
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
938 (symbol-value (intern-soft (format "diary-%s-date-forms" style)))) |
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
939 (calendar-update-mode-line)) |
93374
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
940 |
628 | 941 (defun european-calendar () |
942 "Set the interpretation and display of dates to the European style." | |
943 (interactive) | |
93374
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
944 (calendar-set-date-style 'european)) |
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
945 |
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
946 (make-obsolete 'european-calendar 'calendar-set-date-style "23.1") |
628 | 947 |
948 (defun american-calendar () | |
949 "Set the interpretation and display of dates to the American style." | |
950 (interactive) | |
93374
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
951 (calendar-set-date-style 'american)) |
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
952 |
4e21455e4410
(diary-file, american-date-diary-pattern)
Glenn Morris <rgm@gnu.org>
parents:
93330
diff
changeset
|
953 (make-obsolete 'american-calendar 'calendar-set-date-style "23.1") |
628 | 954 |
94019
28144b96054e
(calendar-faces): New custom group.
Glenn Morris <rgm@gnu.org>
parents:
93995
diff
changeset
|
955 (define-obsolete-variable-alias 'holidays-in-diary-buffer |
28144b96054e
(calendar-faces): New custom group.
Glenn Morris <rgm@gnu.org>
parents:
93995
diff
changeset
|
956 'diary-show-holidays-flag "23.1") |
28144b96054e
(calendar-faces): New custom group.
Glenn Morris <rgm@gnu.org>
parents:
93995
diff
changeset
|
957 |
93808
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
958 (defcustom diary-show-holidays-flag t |
68366
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
959 "Non-nil means include holidays in the diary display. |
6737 | 960 The holidays appear in the mode line of the diary buffer, or in the |
3865
2c6883d0a1b2
* calendar.el (calendar-version): Update to 5.1. Fixed a variety
Jim Blandy <jimb@redhat.com>
parents:
3778
diff
changeset
|
961 fancy diary buffer next to the date. This slows down the diary functions |
17625
321afd5b0bc5
Add defgroups, and use defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16099
diff
changeset
|
962 somewhat; setting it to nil makes the diary display faster." |
321afd5b0bc5
Add defgroups, and use defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16099
diff
changeset
|
963 :type 'boolean |
321afd5b0bc5
Add defgroups, and use defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
16099
diff
changeset
|
964 :group 'holidays) |
628 | 965 |
92594
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
966 (defcustom calendar-debug-sexp nil |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
967 "Turn debugging on when evaluating a sexp in the diary or holiday list." |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
968 :type 'boolean |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
969 :group 'calendar) |
3448
b7d345eaae47
(calendar-mode): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
2997
diff
changeset
|
970 |
94019
28144b96054e
(calendar-faces): New custom group.
Glenn Morris <rgm@gnu.org>
parents:
93995
diff
changeset
|
971 (define-obsolete-variable-alias 'all-hebrew-calendar-holidays |
28144b96054e
(calendar-faces): New custom group.
Glenn Morris <rgm@gnu.org>
parents:
93995
diff
changeset
|
972 'calendar-hebrew-all-holidays-flag "23.1") |
28144b96054e
(calendar-faces): New custom group.
Glenn Morris <rgm@gnu.org>
parents:
93995
diff
changeset
|
973 |
93630
8f16c93afd23
(calendar-hebrew-all-holidays-flag):
Glenn Morris <rgm@gnu.org>
parents:
93585
diff
changeset
|
974 (defcustom calendar-hebrew-all-holidays-flag nil |
92594
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
975 "If nil, show only major holidays from the Hebrew calendar. |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
976 This means only those Jewish holidays that appear on secular calendars. |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
977 Otherwise, show all the holidays that would appear in a complete Hebrew |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
978 calendar." |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
979 :type 'boolean |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
980 :group 'holidays) |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
981 |
94019
28144b96054e
(calendar-faces): New custom group.
Glenn Morris <rgm@gnu.org>
parents:
93995
diff
changeset
|
982 (define-obsolete-variable-alias 'all-christian-calendar-holidays |
28144b96054e
(calendar-faces): New custom group.
Glenn Morris <rgm@gnu.org>
parents:
93995
diff
changeset
|
983 'calendar-christian-all-holidays-flag "23.1") |
93630
8f16c93afd23
(calendar-hebrew-all-holidays-flag):
Glenn Morris <rgm@gnu.org>
parents:
93585
diff
changeset
|
984 |
8f16c93afd23
(calendar-hebrew-all-holidays-flag):
Glenn Morris <rgm@gnu.org>
parents:
93585
diff
changeset
|
985 (defcustom calendar-christian-all-holidays-flag nil |
92594
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
986 "If nil, show only major holidays from the Christian calendar. |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
987 This means only those Christian holidays that appear on secular calendars. |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
988 Otherwise, show all the holidays that would appear in a complete Christian |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
989 calendar." |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
990 :type 'boolean |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
991 :group 'holidays) |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
992 |
94019
28144b96054e
(calendar-faces): New custom group.
Glenn Morris <rgm@gnu.org>
parents:
93995
diff
changeset
|
993 (define-obsolete-variable-alias 'all-islamic-calendar-holidays |
28144b96054e
(calendar-faces): New custom group.
Glenn Morris <rgm@gnu.org>
parents:
93995
diff
changeset
|
994 'calendar-islamic-all-holidays-flag "23.1") |
93630
8f16c93afd23
(calendar-hebrew-all-holidays-flag):
Glenn Morris <rgm@gnu.org>
parents:
93585
diff
changeset
|
995 |
8f16c93afd23
(calendar-hebrew-all-holidays-flag):
Glenn Morris <rgm@gnu.org>
parents:
93585
diff
changeset
|
996 (defcustom calendar-islamic-all-holidays-flag nil |
92594
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
997 "If nil, show only major holidays from the Islamic calendar. |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
998 This means only those Islamic holidays that appear on secular calendars. |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
999 Otherwise, show all the holidays that would appear in a complete Islamic |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
1000 calendar." |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
1001 :type 'boolean |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
1002 :group 'holidays) |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
1003 |
94019
28144b96054e
(calendar-faces): New custom group.
Glenn Morris <rgm@gnu.org>
parents:
93995
diff
changeset
|
1004 (define-obsolete-variable-alias 'all-bahai-calendar-holidays |
28144b96054e
(calendar-faces): New custom group.
Glenn Morris <rgm@gnu.org>
parents:
93995
diff
changeset
|
1005 'calendar-bahai-all-holidays-flag "23.1") |
93630
8f16c93afd23
(calendar-hebrew-all-holidays-flag):
Glenn Morris <rgm@gnu.org>
parents:
93585
diff
changeset
|
1006 |
8f16c93afd23
(calendar-hebrew-all-holidays-flag):
Glenn Morris <rgm@gnu.org>
parents:
93585
diff
changeset
|
1007 (defcustom calendar-bahai-all-holidays-flag nil |
92594
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
1008 "If nil, show only major holidays from the Baha'i calendar. |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
1009 These are the days on which work and school must be suspended. |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
1010 Otherwise, show all the holidays that would appear in a complete Baha'i |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
1011 calendar." |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
1012 :type 'boolean |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
1013 :group 'holidays) |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
1014 |
94280
746fc66b809d
(calendar-chinese-all-holidays-flag): New.
Glenn Morris <rgm@gnu.org>
parents:
94019
diff
changeset
|
1015 (defcustom calendar-chinese-all-holidays-flag nil |
746fc66b809d
(calendar-chinese-all-holidays-flag): New.
Glenn Morris <rgm@gnu.org>
parents:
94019
diff
changeset
|
1016 "If nil, show only the major holidays from the Chinese calendar." |
746fc66b809d
(calendar-chinese-all-holidays-flag): New.
Glenn Morris <rgm@gnu.org>
parents:
94019
diff
changeset
|
1017 :version "23.1" |
746fc66b809d
(calendar-chinese-all-holidays-flag): New.
Glenn Morris <rgm@gnu.org>
parents:
94019
diff
changeset
|
1018 :type 'boolean |
746fc66b809d
(calendar-chinese-all-holidays-flag): New.
Glenn Morris <rgm@gnu.org>
parents:
94019
diff
changeset
|
1019 :group 'holidays) |
746fc66b809d
(calendar-chinese-all-holidays-flag): New.
Glenn Morris <rgm@gnu.org>
parents:
94019
diff
changeset
|
1020 |
92594
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
1021 ;;; End of user options. |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
1022 |
96158
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
1023 (calendar-recompute-layout-variables) |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
1024 |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
1025 (defconst calendar-first-date-row 3 |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
1026 "First row in the calendar with actual dates.") |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
1027 |
92594
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
1028 (defconst calendar-buffer "*Calendar*" |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
1029 "Name of the buffer used for the calendar.") |
628 | 1030 |
1031 (defconst holiday-buffer "*Holidays*" | |
1032 "Name of the buffer used for the displaying the holidays.") | |
1033 | |
93808
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
1034 (defconst diary-fancy-buffer "*Fancy Diary Entries*" |
628 | 1035 "Name of the buffer used for the optional fancy display of the diary.") |
1036 | |
93808
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
1037 (define-obsolete-variable-alias 'fancy-diary-buffer 'diary-fancy-buffer "23.1") |
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
1038 |
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
1039 (defconst calendar-other-calendars-buffer "*Other Calendars*" |
22261
329f546a73ec
Add function to show equivalent date on all available calendars (in parallel
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
22028
diff
changeset
|
1040 "Name of the buffer used for the display of date on other calendars.") |
329f546a73ec
Add function to show equivalent date on all available calendars (in parallel
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
22028
diff
changeset
|
1041 |
9709
3ece524b8ea3
Lots of minor fixes and code polishing. Exit-calendar code rewritten.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
9417
diff
changeset
|
1042 (defconst lunar-phases-buffer "*Phases of Moon*" |
3ece524b8ea3
Lots of minor fixes and code polishing. Exit-calendar code rewritten.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
9417
diff
changeset
|
1043 "Name of the buffer used for the lunar phases.") |
3ece524b8ea3
Lots of minor fixes and code polishing. Exit-calendar code rewritten.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
9417
diff
changeset
|
1044 |
98372
dfb0ac991c30
Peter Dyballa <Peter_Dyballa at Freenet.DE>
Glenn Morris <rgm@gnu.org>
parents:
97422
diff
changeset
|
1045 (defconst solar-sunrises-buffer "*Sunrise/Sunset Times*" |
96346
775f65dc9776
(solar-sunrises-buffer): New constant.
Glenn Morris <rgm@gnu.org>
parents:
96315
diff
changeset
|
1046 "Name of buffer used for sunrise/sunset times.") |
775f65dc9776
(solar-sunrises-buffer): New constant.
Glenn Morris <rgm@gnu.org>
parents:
96315
diff
changeset
|
1047 |
93808
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
1048 (defconst calendar-hebrew-yahrzeit-buffer "*Yahrzeits*" |
92823
8fb3c7b3e53a
(cal-hebrew-yahrzeit-buffer): New constant.
Glenn Morris <rgm@gnu.org>
parents:
92716
diff
changeset
|
1049 "Name of the buffer used by `list-yahrzeit-dates'.") |
8fb3c7b3e53a
(cal-hebrew-yahrzeit-buffer): New constant.
Glenn Morris <rgm@gnu.org>
parents:
92716
diff
changeset
|
1050 |
93808
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
1051 (defmacro calendar-increment-month (mon yr n &optional nmonths) |
52723
f33d2cba6bb7
(increment-calendar-month, calendar-leap-year-p)
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
1052 "Increment the variables MON and YR by N months. |
f33d2cba6bb7
(increment-calendar-month, calendar-leap-year-p)
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
1053 Forward if N is positive or backward if N is negative. |
93449
64521597b7dd
(increment-calendar-month): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
93374
diff
changeset
|
1054 A negative YR is interpreted as BC; -1 being 1 BC, and so on. |
93464
4d4a9542d49c
(increment-calendar-month): Optionally handle systems without 12
Glenn Morris <rgm@gnu.org>
parents:
93449
diff
changeset
|
1055 Optional NMONTHS is the number of months per year (default 12)." |
4d4a9542d49c
(increment-calendar-month): Optionally handle systems without 12
Glenn Morris <rgm@gnu.org>
parents:
93449
diff
changeset
|
1056 ;; Can view this as a form of base-nmonths arithmetic, in which "a |
4d4a9542d49c
(increment-calendar-month): Optionally handle systems without 12
Glenn Morris <rgm@gnu.org>
parents:
93449
diff
changeset
|
1057 ;; year" = "ten", and we never bother to use hundreds. |
4d4a9542d49c
(increment-calendar-month): Optionally handle systems without 12
Glenn Morris <rgm@gnu.org>
parents:
93449
diff
changeset
|
1058 `(let ((nmonths (or ,nmonths 12)) |
4d4a9542d49c
(increment-calendar-month): Optionally handle systems without 12
Glenn Morris <rgm@gnu.org>
parents:
93449
diff
changeset
|
1059 macro-y) |
52723
f33d2cba6bb7
(increment-calendar-month, calendar-leap-year-p)
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
1060 (if (< ,yr 0) (setq ,yr (1+ ,yr))) ; -1 BC -> 0 AD, etc |
93464
4d4a9542d49c
(increment-calendar-month): Optionally handle systems without 12
Glenn Morris <rgm@gnu.org>
parents:
93449
diff
changeset
|
1061 (setq macro-y (+ (* ,yr nmonths) ,mon -1 ,n) |
4d4a9542d49c
(increment-calendar-month): Optionally handle systems without 12
Glenn Morris <rgm@gnu.org>
parents:
93449
diff
changeset
|
1062 ,mon (1+ (mod macro-y nmonths)) |
4d4a9542d49c
(increment-calendar-month): Optionally handle systems without 12
Glenn Morris <rgm@gnu.org>
parents:
93449
diff
changeset
|
1063 ,yr (/ macro-y nmonths)) |
4d4a9542d49c
(increment-calendar-month): Optionally handle systems without 12
Glenn Morris <rgm@gnu.org>
parents:
93449
diff
changeset
|
1064 ;; Alternative: |
4d4a9542d49c
(increment-calendar-month): Optionally handle systems without 12
Glenn Morris <rgm@gnu.org>
parents:
93449
diff
changeset
|
1065 ;;; (setq macro-y (+ (* ,yr nmonths) ,mon -1 ,n) |
4d4a9542d49c
(increment-calendar-month): Optionally handle systems without 12
Glenn Morris <rgm@gnu.org>
parents:
93449
diff
changeset
|
1066 ;;; ,yr (/ macro-y nmonths) |
4d4a9542d49c
(increment-calendar-month): Optionally handle systems without 12
Glenn Morris <rgm@gnu.org>
parents:
93449
diff
changeset
|
1067 ;;; ,mon (- macro-y (* ,yr nmonths))) |
52723
f33d2cba6bb7
(increment-calendar-month, calendar-leap-year-p)
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
1068 (and (< macro-y 0) (> ,mon 1) (setq ,yr (1- ,yr))) |
f33d2cba6bb7
(increment-calendar-month, calendar-leap-year-p)
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
1069 (if (< ,yr 1) (setq ,yr (1- ,yr))))) ; 0 AD -> -1 BC, etc |
628 | 1070 |
93808
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
1071 (define-obsolete-function-alias 'increment-calendar-month |
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
1072 'calendar-increment-month "23.1") |
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
1073 |
92697
001682fd0516
(diary-file, hebrew-holidays-1)
Glenn Morris <rgm@gnu.org>
parents:
92681
diff
changeset
|
1074 (defvar displayed-month) |
001682fd0516
(diary-file, hebrew-holidays-1)
Glenn Morris <rgm@gnu.org>
parents:
92681
diff
changeset
|
1075 (defvar displayed-year) |
001682fd0516
(diary-file, hebrew-holidays-1)
Glenn Morris <rgm@gnu.org>
parents:
92681
diff
changeset
|
1076 |
93808
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
1077 (defun calendar-increment-month-cons (n &optional mon yr) |
68366
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
1078 "Return the Nth month after MON/YR. |
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
1079 The return value is a pair (MONTH . YEAR). |
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
1080 MON defaults to `displayed-month'. YR defaults to `displayed-year'." |
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
1081 (unless mon (setq mon displayed-month)) |
68655
3d624f4184ec
(calendar-increment-month): Typo in last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68366
diff
changeset
|
1082 (unless yr (setq yr displayed-year)) |
93808
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
1083 (calendar-increment-month mon yr n) |
68366
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
1084 (cons mon yr)) |
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
1085 |
628 | 1086 (defmacro calendar-for-loop (var from init to final do &rest body) |
82086
1ee19eca3bfc
(generate-calendar, (generate-calendar-month): Use dotimes rather than
Glenn Morris <rgm@gnu.org>
parents:
78145
diff
changeset
|
1087 "Execute a for loop. |
1ee19eca3bfc
(generate-calendar, (generate-calendar-month): Use dotimes rather than
Glenn Morris <rgm@gnu.org>
parents:
78145
diff
changeset
|
1088 Evaluate BODY with VAR bound to successive integers from INIT to FINAL, |
92969
bb4fc128d00d
(european-calendar-style, calendar-for-loop)
Glenn Morris <rgm@gnu.org>
parents:
92930
diff
changeset
|
1089 inclusive. The standard macro `dotimes' is preferable in most cases." |
92988 | 1090 (declare (debug (symbolp "from" form "to" form "do" body)) |
1091 (indent defun)) | |
26427
3b6cf16f3633
* calendar/calendar.el (calendar-remove-frame-by-deleting):
Sam Steingold <sds@gnu.org>
parents:
26329
diff
changeset
|
1092 `(let ((,var (1- ,init))) |
3b6cf16f3633
* calendar/calendar.el (calendar-remove-frame-by-deleting):
Sam Steingold <sds@gnu.org>
parents:
26329
diff
changeset
|
1093 (while (>= ,final (setq ,var (1+ ,var))) |
3b6cf16f3633
* calendar/calendar.el (calendar-remove-frame-by-deleting):
Sam Steingold <sds@gnu.org>
parents:
26329
diff
changeset
|
1094 ,@body))) |
628 | 1095 |
93528
6fb229e96593
(diary-entry-marker, calendar-today-marker, calendar-holiday-marker)
Glenn Morris <rgm@gnu.org>
parents:
93510
diff
changeset
|
1096 (make-obsolete 'calendar-for-loop "use `dotimes' or `while' instead." "23.1") |
6fb229e96593
(diary-entry-marker, calendar-today-marker, calendar-holiday-marker)
Glenn Morris <rgm@gnu.org>
parents:
93510
diff
changeset
|
1097 |
628 | 1098 (defmacro calendar-sum (index initial condition expression) |
92969
bb4fc128d00d
(european-calendar-style, calendar-for-loop)
Glenn Morris <rgm@gnu.org>
parents:
92930
diff
changeset
|
1099 "For INDEX = INITIAL, +1, ... (as long as CONDITION holds), sum EXPRESSION." |
68366
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
1100 (declare (debug (symbolp form form form))) |
26427
3b6cf16f3633
* calendar/calendar.el (calendar-remove-frame-by-deleting):
Sam Steingold <sds@gnu.org>
parents:
26329
diff
changeset
|
1101 `(let ((,index ,initial) |
3b6cf16f3633
* calendar/calendar.el (calendar-remove-frame-by-deleting):
Sam Steingold <sds@gnu.org>
parents:
26329
diff
changeset
|
1102 (sum 0)) |
3b6cf16f3633
* calendar/calendar.el (calendar-remove-frame-by-deleting):
Sam Steingold <sds@gnu.org>
parents:
26329
diff
changeset
|
1103 (while ,condition |
92969
bb4fc128d00d
(european-calendar-style, calendar-for-loop)
Glenn Morris <rgm@gnu.org>
parents:
92930
diff
changeset
|
1104 (setq sum (+ sum ,expression) |
bb4fc128d00d
(european-calendar-style, calendar-for-loop)
Glenn Morris <rgm@gnu.org>
parents:
92930
diff
changeset
|
1105 ,index (1+ ,index))) |
26427
3b6cf16f3633
* calendar/calendar.el (calendar-remove-frame-by-deleting):
Sam Steingold <sds@gnu.org>
parents:
26329
diff
changeset
|
1106 sum)) |
628 | 1107 |
93449
64521597b7dd
(increment-calendar-month): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
93374
diff
changeset
|
1108 ;; FIXME bind q to bury-buffer? |
93026
8e1a78482251
(calendar-today-marker, initial-calendar-window-hook)
Glenn Morris <rgm@gnu.org>
parents:
92988
diff
changeset
|
1109 (defmacro calendar-in-read-only-buffer (buffer &rest body) |
8e1a78482251
(calendar-today-marker, initial-calendar-window-hook)
Glenn Morris <rgm@gnu.org>
parents:
92988
diff
changeset
|
1110 "Switch to BUFFER and executes the forms in BODY. |
8e1a78482251
(calendar-today-marker, initial-calendar-window-hook)
Glenn Morris <rgm@gnu.org>
parents:
92988
diff
changeset
|
1111 First creates or erases BUFFER as needed. Leaves BUFFER read-only, |
8e1a78482251
(calendar-today-marker, initial-calendar-window-hook)
Glenn Morris <rgm@gnu.org>
parents:
92988
diff
changeset
|
1112 with disabled undo. Leaves point at point-min, displays BUFFER." |
8e1a78482251
(calendar-today-marker, initial-calendar-window-hook)
Glenn Morris <rgm@gnu.org>
parents:
92988
diff
changeset
|
1113 (declare (indent 1) (debug t)) |
8e1a78482251
(calendar-today-marker, initial-calendar-window-hook)
Glenn Morris <rgm@gnu.org>
parents:
92988
diff
changeset
|
1114 `(progn |
8e1a78482251
(calendar-today-marker, initial-calendar-window-hook)
Glenn Morris <rgm@gnu.org>
parents:
92988
diff
changeset
|
1115 (set-buffer (get-buffer-create ,buffer)) |
8e1a78482251
(calendar-today-marker, initial-calendar-window-hook)
Glenn Morris <rgm@gnu.org>
parents:
92988
diff
changeset
|
1116 (setq buffer-read-only nil |
8e1a78482251
(calendar-today-marker, initial-calendar-window-hook)
Glenn Morris <rgm@gnu.org>
parents:
92988
diff
changeset
|
1117 buffer-undo-list t) |
8e1a78482251
(calendar-today-marker, initial-calendar-window-hook)
Glenn Morris <rgm@gnu.org>
parents:
92988
diff
changeset
|
1118 (erase-buffer) |
8e1a78482251
(calendar-today-marker, initial-calendar-window-hook)
Glenn Morris <rgm@gnu.org>
parents:
92988
diff
changeset
|
1119 ,@body |
8e1a78482251
(calendar-today-marker, initial-calendar-window-hook)
Glenn Morris <rgm@gnu.org>
parents:
92988
diff
changeset
|
1120 (goto-char (point-min)) |
8e1a78482251
(calendar-today-marker, initial-calendar-window-hook)
Glenn Morris <rgm@gnu.org>
parents:
92988
diff
changeset
|
1121 (set-buffer-modified-p nil) |
8e1a78482251
(calendar-today-marker, initial-calendar-window-hook)
Glenn Morris <rgm@gnu.org>
parents:
92988
diff
changeset
|
1122 (setq buffer-read-only t) |
8e1a78482251
(calendar-today-marker, initial-calendar-window-hook)
Glenn Morris <rgm@gnu.org>
parents:
92988
diff
changeset
|
1123 (display-buffer ,buffer))) |
8e1a78482251
(calendar-today-marker, initial-calendar-window-hook)
Glenn Morris <rgm@gnu.org>
parents:
92988
diff
changeset
|
1124 |
9709
3ece524b8ea3
Lots of minor fixes and code polishing. Exit-calendar code rewritten.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
9417
diff
changeset
|
1125 ;; The following are in-line for speed; they can be called thousands of times |
3ece524b8ea3
Lots of minor fixes and code polishing. Exit-calendar code rewritten.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
9417
diff
changeset
|
1126 ;; when looking up holidays or processing the diary. Here, for example, are |
3ece524b8ea3
Lots of minor fixes and code polishing. Exit-calendar code rewritten.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
9417
diff
changeset
|
1127 ;; the numbers of calls to calendar/diary/holiday functions in preparing the |
732 | 1128 ;; fancy diary display, for a moderately complex diary file, with functions |
1129 ;; used instead of macros. There were a total of 10000 such calls: | |
1130 ;; | |
93808
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
1131 ;; 1934 calendar-extract-month |
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
1132 ;; 1852 calendar-extract-year |
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
1133 ;; 1819 calendar-extract-day |
732 | 1134 ;; 845 calendar-leap-year-p |
1135 ;; 837 calendar-day-number | |
1136 ;; 775 calendar-absolute-from-gregorian | |
1137 ;; 346 calendar-last-day-of-month | |
93740
61bda7ffa0b8
Update for chinese and hebrew name changes.
Glenn Morris <rgm@gnu.org>
parents:
93730
diff
changeset
|
1138 ;; 286 calendar-hebrew-last-day-of-month |
61bda7ffa0b8
Update for chinese and hebrew name changes.
Glenn Morris <rgm@gnu.org>
parents:
93730
diff
changeset
|
1139 ;; 188 calendar-hebrew-leap-year-p |
61bda7ffa0b8
Update for chinese and hebrew name changes.
Glenn Morris <rgm@gnu.org>
parents:
93730
diff
changeset
|
1140 ;; 180 calendar-hebrew-elapsed-days |
61bda7ffa0b8
Update for chinese and hebrew name changes.
Glenn Morris <rgm@gnu.org>
parents:
93730
diff
changeset
|
1141 ;; 163 calendar-hebrew-last-month-of-year |
732 | 1142 ;; 66 calendar-date-compare |
93740
61bda7ffa0b8
Update for chinese and hebrew name changes.
Glenn Morris <rgm@gnu.org>
parents:
93730
diff
changeset
|
1143 ;; 65 calendar-hebrew-days-in-year |
93647
447b30ba4c57
Update for iso, islamic, julian, mayan, persian name changes.
Glenn Morris <rgm@gnu.org>
parents:
93630
diff
changeset
|
1144 ;; 60 calendar-julian-to-absolute |
93740
61bda7ffa0b8
Update for chinese and hebrew name changes.
Glenn Morris <rgm@gnu.org>
parents:
93730
diff
changeset
|
1145 ;; 50 calendar-hebrew-to-absolute |
732 | 1146 ;; 43 calendar-date-equal |
1147 ;; 38 calendar-gregorian-from-absolute | |
1148 ;; . | |
1149 ;; | |
1150 ;; The use of these seven macros eliminates the overhead of 92% of the function | |
9709
3ece524b8ea3
Lots of minor fixes and code polishing. Exit-calendar code rewritten.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
9417
diff
changeset
|
1151 ;; calls; it's faster this way. |
732 | 1152 |
93808
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
1153 (defsubst calendar-extract-month (date) |
628 | 1154 "Extract the month part of DATE which has the form (month day year)." |
9709
3ece524b8ea3
Lots of minor fixes and code polishing. Exit-calendar code rewritten.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
9417
diff
changeset
|
1155 (car date)) |
628 | 1156 |
93808
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
1157 (define-obsolete-function-alias 'extract-calendar-month |
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
1158 'calendar-extract-month "23.1") |
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
1159 |
93026
8e1a78482251
(calendar-today-marker, initial-calendar-window-hook)
Glenn Morris <rgm@gnu.org>
parents:
92988
diff
changeset
|
1160 ;; Note gives wrong answer for result of (calendar-read-date 'noday), |
8e1a78482251
(calendar-today-marker, initial-calendar-window-hook)
Glenn Morris <rgm@gnu.org>
parents:
92988
diff
changeset
|
1161 ;; but that is only used by `calendar-other-month'. |
93808
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
1162 (defsubst calendar-extract-day (date) |
628 | 1163 "Extract the day part of DATE which has the form (month day year)." |
92969
bb4fc128d00d
(european-calendar-style, calendar-for-loop)
Glenn Morris <rgm@gnu.org>
parents:
92930
diff
changeset
|
1164 (cadr date)) |
628 | 1165 |
93808
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
1166 (define-obsolete-function-alias 'extract-calendar-day |
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
1167 'calendar-extract-day "23.1") |
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
1168 |
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
1169 (defsubst calendar-extract-year (date) |
628 | 1170 "Extract the year part of DATE which has the form (month day year)." |
92969
bb4fc128d00d
(european-calendar-style, calendar-for-loop)
Glenn Morris <rgm@gnu.org>
parents:
92930
diff
changeset
|
1171 (nth 2 date)) |
628 | 1172 |
93808
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
1173 (define-obsolete-function-alias 'extract-calendar-year |
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
1174 'calendar-extract-year "23.1") |
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
1175 |
9709
3ece524b8ea3
Lots of minor fixes and code polishing. Exit-calendar code rewritten.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
9417
diff
changeset
|
1176 (defsubst calendar-leap-year-p (year) |
52723
f33d2cba6bb7
(increment-calendar-month, calendar-leap-year-p)
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
1177 "Return t if YEAR is a Gregorian leap year. |
f33d2cba6bb7
(increment-calendar-month, calendar-leap-year-p)
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
1178 A negative year is interpreted as BC; -1 being 1 BC, and so on." |
f33d2cba6bb7
(increment-calendar-month, calendar-leap-year-p)
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
1179 ;; 1 BC = 0 AD, 2 BC acts like 1 AD, etc. |
f33d2cba6bb7
(increment-calendar-month, calendar-leap-year-p)
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
1180 (if (< year 0) (setq year (1- (abs year)))) |
9709
3ece524b8ea3
Lots of minor fixes and code polishing. Exit-calendar code rewritten.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
9417
diff
changeset
|
1181 (and (zerop (% year 4)) |
3ece524b8ea3
Lots of minor fixes and code polishing. Exit-calendar code rewritten.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
9417
diff
changeset
|
1182 (or (not (zerop (% year 100))) |
3ece524b8ea3
Lots of minor fixes and code polishing. Exit-calendar code rewritten.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
9417
diff
changeset
|
1183 (zerop (% year 400))))) |
3ece524b8ea3
Lots of minor fixes and code polishing. Exit-calendar code rewritten.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
9417
diff
changeset
|
1184 |
3865
2c6883d0a1b2
* calendar.el (calendar-version): Update to 5.1. Fixed a variety
Jim Blandy <jimb@redhat.com>
parents:
3778
diff
changeset
|
1185 ;; The foregoing is a bit faster, but not as clear as the following: |
2c6883d0a1b2
* calendar.el (calendar-version): Update to 5.1. Fixed a variety
Jim Blandy <jimb@redhat.com>
parents:
3778
diff
changeset
|
1186 ;; |
9709
3ece524b8ea3
Lots of minor fixes and code polishing. Exit-calendar code rewritten.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
9417
diff
changeset
|
1187 ;;(defsubst calendar-leap-year-p (year) |
92697
001682fd0516
(diary-file, hebrew-holidays-1)
Glenn Morris <rgm@gnu.org>
parents:
92681
diff
changeset
|
1188 ;; "Return t if YEAR is a Gregorian leap year." |
957 | 1189 ;; (or |
92697
001682fd0516
(diary-file, hebrew-holidays-1)
Glenn Morris <rgm@gnu.org>
parents:
92681
diff
changeset
|
1190 ;; (and (zerop (% year 4)) |
001682fd0516
(diary-file, hebrew-holidays-1)
Glenn Morris <rgm@gnu.org>
parents:
92681
diff
changeset
|
1191 ;; (not (zerop (% year 100)))) |
001682fd0516
(diary-file, hebrew-holidays-1)
Glenn Morris <rgm@gnu.org>
parents:
92681
diff
changeset
|
1192 ;; (zerop (% year 400))) |
732 | 1193 |
9709
3ece524b8ea3
Lots of minor fixes and code polishing. Exit-calendar code rewritten.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
9417
diff
changeset
|
1194 (defsubst calendar-last-day-of-month (month year) |
732 | 1195 "The last day in MONTH during YEAR." |
9709
3ece524b8ea3
Lots of minor fixes and code polishing. Exit-calendar code rewritten.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
9417
diff
changeset
|
1196 (if (and (= month 2) (calendar-leap-year-p year)) |
3ece524b8ea3
Lots of minor fixes and code polishing. Exit-calendar code rewritten.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
9417
diff
changeset
|
1197 29 |
3ece524b8ea3
Lots of minor fixes and code polishing. Exit-calendar code rewritten.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
9417
diff
changeset
|
1198 (aref [31 28 31 30 31 30 31 31 30 31 30 31] (1- month)))) |
732 | 1199 |
9709
3ece524b8ea3
Lots of minor fixes and code polishing. Exit-calendar code rewritten.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
9417
diff
changeset
|
1200 ;; An explanation of the calculation can be found in PascAlgorithms by |
3ece524b8ea3
Lots of minor fixes and code polishing. Exit-calendar code rewritten.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
9417
diff
changeset
|
1201 ;; Edward and Ruth Reingold, Scott-Foresman/Little, Brown, 1988. |
3ece524b8ea3
Lots of minor fixes and code polishing. Exit-calendar code rewritten.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
9417
diff
changeset
|
1202 |
3ece524b8ea3
Lots of minor fixes and code polishing. Exit-calendar code rewritten.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
9417
diff
changeset
|
1203 (defsubst calendar-day-number (date) |
732 | 1204 "Return the day number within the year of the date DATE. |
1205 For example, (calendar-day-number '(1 1 1987)) returns the value 1, | |
1206 while (calendar-day-number '(12 31 1980)) returns 366." | |
93808
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
1207 (let* ((month (calendar-extract-month date)) |
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
1208 (day (calendar-extract-day date)) |
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
1209 (year (calendar-extract-year date)) |
9709
3ece524b8ea3
Lots of minor fixes and code polishing. Exit-calendar code rewritten.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
9417
diff
changeset
|
1210 (day-of-year (+ day (* 31 (1- month))))) |
92969
bb4fc128d00d
(european-calendar-style, calendar-for-loop)
Glenn Morris <rgm@gnu.org>
parents:
92930
diff
changeset
|
1211 (when (> month 2) |
bb4fc128d00d
(european-calendar-style, calendar-for-loop)
Glenn Morris <rgm@gnu.org>
parents:
92930
diff
changeset
|
1212 (setq day-of-year (- day-of-year (/ (+ 23 (* 4 month)) 10))) |
bb4fc128d00d
(european-calendar-style, calendar-for-loop)
Glenn Morris <rgm@gnu.org>
parents:
92930
diff
changeset
|
1213 (if (calendar-leap-year-p year) |
bb4fc128d00d
(european-calendar-style, calendar-for-loop)
Glenn Morris <rgm@gnu.org>
parents:
92930
diff
changeset
|
1214 (setq day-of-year (1+ day-of-year)))) |
bb4fc128d00d
(european-calendar-style, calendar-for-loop)
Glenn Morris <rgm@gnu.org>
parents:
92930
diff
changeset
|
1215 day-of-year)) |
732 | 1216 |
9709
3ece524b8ea3
Lots of minor fixes and code polishing. Exit-calendar code rewritten.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
9417
diff
changeset
|
1217 (defsubst calendar-absolute-from-gregorian (date) |
732 | 1218 "The number of days elapsed between the Gregorian date 12/31/1 BC and DATE. |
52723
f33d2cba6bb7
(increment-calendar-month, calendar-leap-year-p)
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
1219 The Gregorian date Sunday, December 31, 1 BC is imaginary. |
f33d2cba6bb7
(increment-calendar-month, calendar-leap-year-p)
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
1220 DATE is a list of the form (month day year). A negative year is |
f33d2cba6bb7
(increment-calendar-month, calendar-leap-year-p)
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
1221 interpreted as BC; -1 being 1 BC, and so on. Dates before 12/31/1 BC |
f33d2cba6bb7
(increment-calendar-month, calendar-leap-year-p)
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
1222 return negative results." |
93808
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
1223 (let ((year (calendar-extract-year date)) |
52723
f33d2cba6bb7
(increment-calendar-month, calendar-leap-year-p)
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
1224 offset-years) |
92697
001682fd0516
(diary-file, hebrew-holidays-1)
Glenn Morris <rgm@gnu.org>
parents:
92681
diff
changeset
|
1225 (cond ((zerop year) |
52723
f33d2cba6bb7
(increment-calendar-month, calendar-leap-year-p)
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
1226 (error "There was no year zero")) |
f33d2cba6bb7
(increment-calendar-month, calendar-leap-year-p)
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
1227 ((> year 0) |
f33d2cba6bb7
(increment-calendar-month, calendar-leap-year-p)
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
1228 (setq offset-years (1- year)) |
92697
001682fd0516
(diary-file, hebrew-holidays-1)
Glenn Morris <rgm@gnu.org>
parents:
92681
diff
changeset
|
1229 (+ (calendar-day-number date) ; days this year |
001682fd0516
(diary-file, hebrew-holidays-1)
Glenn Morris <rgm@gnu.org>
parents:
92681
diff
changeset
|
1230 (* 365 offset-years) ; + days in prior years |
52723
f33d2cba6bb7
(increment-calendar-month, calendar-leap-year-p)
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
1231 (/ offset-years 4) ; + Julian leap years |
f33d2cba6bb7
(increment-calendar-month, calendar-leap-year-p)
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
1232 (- (/ offset-years 100)) ; - century years |
f33d2cba6bb7
(increment-calendar-month, calendar-leap-year-p)
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
1233 (/ offset-years 400))) ; + Gregorian leap years |
f33d2cba6bb7
(increment-calendar-month, calendar-leap-year-p)
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
1234 (t |
f33d2cba6bb7
(increment-calendar-month, calendar-leap-year-p)
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
1235 ;; Years between date and 1 BC, excluding 1 BC (1 for 2 BC, etc). |
f33d2cba6bb7
(increment-calendar-month, calendar-leap-year-p)
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
1236 (setq offset-years (abs (1+ year))) |
f33d2cba6bb7
(increment-calendar-month, calendar-leap-year-p)
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
1237 (- (calendar-day-number date) |
f33d2cba6bb7
(increment-calendar-month, calendar-leap-year-p)
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
1238 (* 365 offset-years) |
f33d2cba6bb7
(increment-calendar-month, calendar-leap-year-p)
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
1239 (/ offset-years 4) |
f33d2cba6bb7
(increment-calendar-month, calendar-leap-year-p)
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
1240 (- (/ offset-years 100)) |
f33d2cba6bb7
(increment-calendar-month, calendar-leap-year-p)
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
1241 (/ offset-years 400) |
f33d2cba6bb7
(increment-calendar-month, calendar-leap-year-p)
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
1242 (calendar-day-number '(12 31 -1))))))) ; days in year 1 BC |
732 | 1243 |
675
85fd29f25c75
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
628
diff
changeset
|
1244 ;;;###autoload |
628 | 1245 (defun calendar (&optional arg) |
93187
c68684b0a2d1
(calendar-remove-frame-by-deleting): Default to t. Add to 'calendar group.
Glenn Morris <rgm@gnu.org>
parents:
93091
diff
changeset
|
1246 "Display a three-month Gregorian calendar. |
c68684b0a2d1
(calendar-remove-frame-by-deleting): Default to t. Add to 'calendar group.
Glenn Morris <rgm@gnu.org>
parents:
93091
diff
changeset
|
1247 The three months appear side by side, with the current month in |
c68684b0a2d1
(calendar-remove-frame-by-deleting): Default to t. Add to 'calendar group.
Glenn Morris <rgm@gnu.org>
parents:
93091
diff
changeset
|
1248 the middle surrounded by the previous and next months. The |
c68684b0a2d1
(calendar-remove-frame-by-deleting): Default to t. Add to 'calendar group.
Glenn Morris <rgm@gnu.org>
parents:
93091
diff
changeset
|
1249 cursor is put on today's date. If optional prefix argument ARG |
c68684b0a2d1
(calendar-remove-frame-by-deleting): Default to t. Add to 'calendar group.
Glenn Morris <rgm@gnu.org>
parents:
93091
diff
changeset
|
1250 is non-nil, prompts for the central month and year. |
13042
03ef030c9e75
Many functions moved to other files, some rewritten. See ChangeLog entry.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
12061
diff
changeset
|
1251 |
93187
c68684b0a2d1
(calendar-remove-frame-by-deleting): Default to t. Add to 'calendar group.
Glenn Morris <rgm@gnu.org>
parents:
93091
diff
changeset
|
1252 Once in the calendar window, future or past months can be moved |
c68684b0a2d1
(calendar-remove-frame-by-deleting): Default to t. Add to 'calendar group.
Glenn Morris <rgm@gnu.org>
parents:
93091
diff
changeset
|
1253 into view. Arbitrary months can be displayed, or the calendar |
c68684b0a2d1
(calendar-remove-frame-by-deleting): Default to t. Add to 'calendar group.
Glenn Morris <rgm@gnu.org>
parents:
93091
diff
changeset
|
1254 can be scrolled forward or backward. The cursor can be moved |
c68684b0a2d1
(calendar-remove-frame-by-deleting): Default to t. Add to 'calendar group.
Glenn Morris <rgm@gnu.org>
parents:
93091
diff
changeset
|
1255 forward or backward by one day, one week, one month, or one year. |
c68684b0a2d1
(calendar-remove-frame-by-deleting): Default to t. Add to 'calendar group.
Glenn Morris <rgm@gnu.org>
parents:
93091
diff
changeset
|
1256 All of these commands take prefix arguments which, when negative, |
c68684b0a2d1
(calendar-remove-frame-by-deleting): Default to t. Add to 'calendar group.
Glenn Morris <rgm@gnu.org>
parents:
93091
diff
changeset
|
1257 cause movement in the opposite direction. For convenience, the |
c68684b0a2d1
(calendar-remove-frame-by-deleting): Default to t. Add to 'calendar group.
Glenn Morris <rgm@gnu.org>
parents:
93091
diff
changeset
|
1258 digit keys and the minus sign are automatically prefixes. Use |
c68684b0a2d1
(calendar-remove-frame-by-deleting): Default to t. Add to 'calendar group.
Glenn Morris <rgm@gnu.org>
parents:
93091
diff
changeset
|
1259 \\[describe-mode] for details of the key bindings in the calendar |
c68684b0a2d1
(calendar-remove-frame-by-deleting): Default to t. Add to 'calendar group.
Glenn Morris <rgm@gnu.org>
parents:
93091
diff
changeset
|
1260 window. |
628 | 1261 |
93187
c68684b0a2d1
(calendar-remove-frame-by-deleting): Default to t. Add to 'calendar group.
Glenn Morris <rgm@gnu.org>
parents:
93091
diff
changeset
|
1262 Displays the calendar in a separate window, or optionally in a |
c68684b0a2d1
(calendar-remove-frame-by-deleting): Default to t. Add to 'calendar group.
Glenn Morris <rgm@gnu.org>
parents:
93091
diff
changeset
|
1263 separate frame, depending on the value of `calendar-setup'. |
628 | 1264 |
93808
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
1265 If `calendar-view-diary-initially-flag' is non-nil, also displays the |
93187
c68684b0a2d1
(calendar-remove-frame-by-deleting): Default to t. Add to 'calendar group.
Glenn Morris <rgm@gnu.org>
parents:
93091
diff
changeset
|
1266 diary entries for the current date (or however many days |
93791
4ef65ad699dc
Update for diary-lib name changes.
Glenn Morris <rgm@gnu.org>
parents:
93740
diff
changeset
|
1267 `diary-number-of-entries' specifies). This variable can be |
93187
c68684b0a2d1
(calendar-remove-frame-by-deleting): Default to t. Add to 'calendar group.
Glenn Morris <rgm@gnu.org>
parents:
93091
diff
changeset
|
1268 overridden by `calendar-setup'. As well as being displayed, |
c68684b0a2d1
(calendar-remove-frame-by-deleting): Default to t. Add to 'calendar group.
Glenn Morris <rgm@gnu.org>
parents:
93091
diff
changeset
|
1269 diary entries can also be marked on the calendar (see |
93808
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
1270 `calendar-mark-diary-entries-flag'). |
628 | 1271 |
93187
c68684b0a2d1
(calendar-remove-frame-by-deleting): Default to t. Add to 'calendar group.
Glenn Morris <rgm@gnu.org>
parents:
93091
diff
changeset
|
1272 Runs the following hooks: |
628 | 1273 |
93187
c68684b0a2d1
(calendar-remove-frame-by-deleting): Default to t. Add to 'calendar group.
Glenn Morris <rgm@gnu.org>
parents:
93091
diff
changeset
|
1274 `calendar-load-hook' - after loading calendar.el |
93808
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
1275 `calendar-today-visible-hook', `calendar-today-invisible-hook' - after |
93187
c68684b0a2d1
(calendar-remove-frame-by-deleting): Default to t. Add to 'calendar group.
Glenn Morris <rgm@gnu.org>
parents:
93091
diff
changeset
|
1276 generating a calendar, if today's date is visible or not, respectively |
93808
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
1277 `calendar-initial-window-hook' - after first creating a calendar |
628 | 1278 |
93187
c68684b0a2d1
(calendar-remove-frame-by-deleting): Default to t. Add to 'calendar group.
Glenn Morris <rgm@gnu.org>
parents:
93091
diff
changeset
|
1279 This function is suitable for execution in a .emacs file." |
c68684b0a2d1
(calendar-remove-frame-by-deleting): Default to t. Add to 'calendar group.
Glenn Morris <rgm@gnu.org>
parents:
93091
diff
changeset
|
1280 (interactive "P") |
c68684b0a2d1
(calendar-remove-frame-by-deleting): Default to t. Add to 'calendar group.
Glenn Morris <rgm@gnu.org>
parents:
93091
diff
changeset
|
1281 ;; Avoid loading cal-x unless it will be used. |
c68684b0a2d1
(calendar-remove-frame-by-deleting): Default to t. Add to 'calendar group.
Glenn Morris <rgm@gnu.org>
parents:
93091
diff
changeset
|
1282 (if (and (memq calendar-setup '(one-frame two-frames calendar-only)) |
c68684b0a2d1
(calendar-remove-frame-by-deleting): Default to t. Add to 'calendar group.
Glenn Morris <rgm@gnu.org>
parents:
93091
diff
changeset
|
1283 (display-multi-frame-p)) |
c68684b0a2d1
(calendar-remove-frame-by-deleting): Default to t. Add to 'calendar group.
Glenn Morris <rgm@gnu.org>
parents:
93091
diff
changeset
|
1284 (calendar-frame-setup calendar-setup arg) |
c68684b0a2d1
(calendar-remove-frame-by-deleting): Default to t. Add to 'calendar group.
Glenn Morris <rgm@gnu.org>
parents:
93091
diff
changeset
|
1285 (calendar-basic-setup arg))) |
628 | 1286 |
93187
c68684b0a2d1
(calendar-remove-frame-by-deleting): Default to t. Add to 'calendar group.
Glenn Morris <rgm@gnu.org>
parents:
93091
diff
changeset
|
1287 (defun calendar-basic-setup (&optional arg nodisplay) |
c68684b0a2d1
(calendar-remove-frame-by-deleting): Default to t. Add to 'calendar group.
Glenn Morris <rgm@gnu.org>
parents:
93091
diff
changeset
|
1288 "Create a three-month calendar. |
c68684b0a2d1
(calendar-remove-frame-by-deleting): Default to t. Add to 'calendar group.
Glenn Morris <rgm@gnu.org>
parents:
93091
diff
changeset
|
1289 If optional prefix argument ARG is non-nil, prompts for the month |
c68684b0a2d1
(calendar-remove-frame-by-deleting): Default to t. Add to 'calendar group.
Glenn Morris <rgm@gnu.org>
parents:
93091
diff
changeset
|
1290 and year, else uses the current date. If NODISPLAY is non-nil, don't |
c68684b0a2d1
(calendar-remove-frame-by-deleting): Default to t. Add to 'calendar group.
Glenn Morris <rgm@gnu.org>
parents:
93091
diff
changeset
|
1291 display the generated calendar." |
628 | 1292 (interactive "P") |
105499
bc225649d1e5
(calendar-basic-setup): In the wide frame case, show the original
Glenn Morris <rgm@gnu.org>
parents:
105478
diff
changeset
|
1293 (let ((buff (current-buffer))) |
bc225649d1e5
(calendar-basic-setup): In the wide frame case, show the original
Glenn Morris <rgm@gnu.org>
parents:
105478
diff
changeset
|
1294 (set-buffer (get-buffer-create calendar-buffer)) |
bc225649d1e5
(calendar-basic-setup): In the wide frame case, show the original
Glenn Morris <rgm@gnu.org>
parents:
105478
diff
changeset
|
1295 (calendar-mode) |
bc225649d1e5
(calendar-basic-setup): In the wide frame case, show the original
Glenn Morris <rgm@gnu.org>
parents:
105478
diff
changeset
|
1296 (let* ((pop-up-windows t) |
bc225649d1e5
(calendar-basic-setup): In the wide frame case, show the original
Glenn Morris <rgm@gnu.org>
parents:
105478
diff
changeset
|
1297 ;; Not really needed now, but means we use exactly the same |
bc225649d1e5
(calendar-basic-setup): In the wide frame case, show the original
Glenn Morris <rgm@gnu.org>
parents:
105478
diff
changeset
|
1298 ;; behavior as before in the non-wide case (see below). |
bc225649d1e5
(calendar-basic-setup): In the wide frame case, show the original
Glenn Morris <rgm@gnu.org>
parents:
105478
diff
changeset
|
1299 (split-height-threshold 1000) |
105539
4886a9e0be01
(calendar-split-width-threshold): New option.
Glenn Morris <rgm@gnu.org>
parents:
105499
diff
changeset
|
1300 (split-width-threshold calendar-split-width-threshold) |
105499
bc225649d1e5
(calendar-basic-setup): In the wide frame case, show the original
Glenn Morris <rgm@gnu.org>
parents:
105478
diff
changeset
|
1301 (date (if arg (calendar-read-date t) |
bc225649d1e5
(calendar-basic-setup): In the wide frame case, show the original
Glenn Morris <rgm@gnu.org>
parents:
105478
diff
changeset
|
1302 (calendar-current-date))) |
bc225649d1e5
(calendar-basic-setup): In the wide frame case, show the original
Glenn Morris <rgm@gnu.org>
parents:
105478
diff
changeset
|
1303 (month (calendar-extract-month date)) |
bc225649d1e5
(calendar-basic-setup): In the wide frame case, show the original
Glenn Morris <rgm@gnu.org>
parents:
105478
diff
changeset
|
1304 (year (calendar-extract-year date))) |
bc225649d1e5
(calendar-basic-setup): In the wide frame case, show the original
Glenn Morris <rgm@gnu.org>
parents:
105478
diff
changeset
|
1305 (calendar-increment-month month year (- calendar-offset)) |
bc225649d1e5
(calendar-basic-setup): In the wide frame case, show the original
Glenn Morris <rgm@gnu.org>
parents:
105478
diff
changeset
|
1306 ;; Display the buffer before calling calendar-generate-window so that it |
bc225649d1e5
(calendar-basic-setup): In the wide frame case, show the original
Glenn Morris <rgm@gnu.org>
parents:
105478
diff
changeset
|
1307 ;; can get a chance to adjust the window sizes to the frame size. |
bc225649d1e5
(calendar-basic-setup): In the wide frame case, show the original
Glenn Morris <rgm@gnu.org>
parents:
105478
diff
changeset
|
1308 (unless nodisplay |
bc225649d1e5
(calendar-basic-setup): In the wide frame case, show the original
Glenn Morris <rgm@gnu.org>
parents:
105478
diff
changeset
|
1309 ;; We want a window configuration that looks something like |
bc225649d1e5
(calendar-basic-setup): In the wide frame case, show the original
Glenn Morris <rgm@gnu.org>
parents:
105478
diff
changeset
|
1310 ;; X X | Y |
bc225649d1e5
(calendar-basic-setup): In the wide frame case, show the original
Glenn Morris <rgm@gnu.org>
parents:
105478
diff
changeset
|
1311 ;; - ----- |
bc225649d1e5
(calendar-basic-setup): In the wide frame case, show the original
Glenn Morris <rgm@gnu.org>
parents:
105478
diff
changeset
|
1312 ;; C Z | C |
bc225649d1e5
(calendar-basic-setup): In the wide frame case, show the original
Glenn Morris <rgm@gnu.org>
parents:
105478
diff
changeset
|
1313 ;; where C is the calendar, and the LHS is the traditional, |
bc225649d1e5
(calendar-basic-setup): In the wide frame case, show the original
Glenn Morris <rgm@gnu.org>
parents:
105478
diff
changeset
|
1314 ;; non-wide frame, and the RHS is the wide frame case. |
bc225649d1e5
(calendar-basic-setup): In the wide frame case, show the original
Glenn Morris <rgm@gnu.org>
parents:
105478
diff
changeset
|
1315 ;; We should end up in the same state regardless of whether the |
bc225649d1e5
(calendar-basic-setup): In the wide frame case, show the original
Glenn Morris <rgm@gnu.org>
parents:
105478
diff
changeset
|
1316 ;; windows were initially split or not. |
bc225649d1e5
(calendar-basic-setup): In the wide frame case, show the original
Glenn Morris <rgm@gnu.org>
parents:
105478
diff
changeset
|
1317 ;; Previously, we only thought about the non-wide case. |
bc225649d1e5
(calendar-basic-setup): In the wide frame case, show the original
Glenn Morris <rgm@gnu.org>
parents:
105478
diff
changeset
|
1318 ;; We could just set split-height-threshold to 1000, relying on |
bc225649d1e5
(calendar-basic-setup): In the wide frame case, show the original
Glenn Morris <rgm@gnu.org>
parents:
105478
diff
changeset
|
1319 ;; the fact that the window splitting treated a single window as |
bc225649d1e5
(calendar-basic-setup): In the wide frame case, show the original
Glenn Morris <rgm@gnu.org>
parents:
105478
diff
changeset
|
1320 ;; a special case and would always split it (vertically). The |
bc225649d1e5
(calendar-basic-setup): In the wide frame case, show the original
Glenn Morris <rgm@gnu.org>
parents:
105478
diff
changeset
|
1321 ;; same thing does not work in the wide-frame case, so now we do |
bc225649d1e5
(calendar-basic-setup): In the wide frame case, show the original
Glenn Morris <rgm@gnu.org>
parents:
105478
diff
changeset
|
1322 ;; the splitting by hand. |
bc225649d1e5
(calendar-basic-setup): In the wide frame case, show the original
Glenn Morris <rgm@gnu.org>
parents:
105478
diff
changeset
|
1323 ;; See discussion in bug#1806. |
bc225649d1e5
(calendar-basic-setup): In the wide frame case, show the original
Glenn Morris <rgm@gnu.org>
parents:
105478
diff
changeset
|
1324 ;; Actually, this still does not do quite the right thing in the |
bc225649d1e5
(calendar-basic-setup): In the wide frame case, show the original
Glenn Morris <rgm@gnu.org>
parents:
105478
diff
changeset
|
1325 ;; wide frame case if started from a configuration like the LHS. |
bc225649d1e5
(calendar-basic-setup): In the wide frame case, show the original
Glenn Morris <rgm@gnu.org>
parents:
105478
diff
changeset
|
1326 ;; Eg if you start with a non-wide frame, call calendar, then |
bc225649d1e5
(calendar-basic-setup): In the wide frame case, show the original
Glenn Morris <rgm@gnu.org>
parents:
105478
diff
changeset
|
1327 ;; make the frame wider. This one is problematic because you |
bc225649d1e5
(calendar-basic-setup): In the wide frame case, show the original
Glenn Morris <rgm@gnu.org>
parents:
105478
diff
changeset
|
1328 ;; might need to split a totally unrelated window. Oh well, it |
bc225649d1e5
(calendar-basic-setup): In the wide frame case, show the original
Glenn Morris <rgm@gnu.org>
parents:
105478
diff
changeset
|
1329 ;; seems unlikely, and perhaps respecting the original layout is |
bc225649d1e5
(calendar-basic-setup): In the wide frame case, show the original
Glenn Morris <rgm@gnu.org>
parents:
105478
diff
changeset
|
1330 ;; the right thing in that case. |
bc225649d1e5
(calendar-basic-setup): In the wide frame case, show the original
Glenn Morris <rgm@gnu.org>
parents:
105478
diff
changeset
|
1331 ;; |
bc225649d1e5
(calendar-basic-setup): In the wide frame case, show the original
Glenn Morris <rgm@gnu.org>
parents:
105478
diff
changeset
|
1332 ;; Is this a wide frame? If so, split it horizontally. |
bc225649d1e5
(calendar-basic-setup): In the wide frame case, show the original
Glenn Morris <rgm@gnu.org>
parents:
105478
diff
changeset
|
1333 (if (window-splittable-p t) (split-window-horizontally)) |
bc225649d1e5
(calendar-basic-setup): In the wide frame case, show the original
Glenn Morris <rgm@gnu.org>
parents:
105478
diff
changeset
|
1334 (pop-to-buffer calendar-buffer) |
bc225649d1e5
(calendar-basic-setup): In the wide frame case, show the original
Glenn Morris <rgm@gnu.org>
parents:
105478
diff
changeset
|
1335 ;; Has the window already been split vertically? |
bc225649d1e5
(calendar-basic-setup): In the wide frame case, show the original
Glenn Morris <rgm@gnu.org>
parents:
105478
diff
changeset
|
1336 (when (and (not (window-dedicated-p)) |
bc225649d1e5
(calendar-basic-setup): In the wide frame case, show the original
Glenn Morris <rgm@gnu.org>
parents:
105478
diff
changeset
|
1337 (window-full-height-p)) |
bc225649d1e5
(calendar-basic-setup): In the wide frame case, show the original
Glenn Morris <rgm@gnu.org>
parents:
105478
diff
changeset
|
1338 (let ((win (split-window-vertically))) |
bc225649d1e5
(calendar-basic-setup): In the wide frame case, show the original
Glenn Morris <rgm@gnu.org>
parents:
105478
diff
changeset
|
1339 ;; In the upper window, show whatever was visible before. |
bc225649d1e5
(calendar-basic-setup): In the wide frame case, show the original
Glenn Morris <rgm@gnu.org>
parents:
105478
diff
changeset
|
1340 ;; This looks better than using other-buffer. |
bc225649d1e5
(calendar-basic-setup): In the wide frame case, show the original
Glenn Morris <rgm@gnu.org>
parents:
105478
diff
changeset
|
1341 (switch-to-buffer buff) |
bc225649d1e5
(calendar-basic-setup): In the wide frame case, show the original
Glenn Morris <rgm@gnu.org>
parents:
105478
diff
changeset
|
1342 ;; Switch to the lower window with the calendar buffer. |
bc225649d1e5
(calendar-basic-setup): In the wide frame case, show the original
Glenn Morris <rgm@gnu.org>
parents:
105478
diff
changeset
|
1343 (select-window win)))) |
bc225649d1e5
(calendar-basic-setup): In the wide frame case, show the original
Glenn Morris <rgm@gnu.org>
parents:
105478
diff
changeset
|
1344 (calendar-generate-window month year) |
bc225649d1e5
(calendar-basic-setup): In the wide frame case, show the original
Glenn Morris <rgm@gnu.org>
parents:
105478
diff
changeset
|
1345 (if (and calendar-view-diary-initially-flag |
bc225649d1e5
(calendar-basic-setup): In the wide frame case, show the original
Glenn Morris <rgm@gnu.org>
parents:
105478
diff
changeset
|
1346 (calendar-date-is-visible-p date)) |
bc225649d1e5
(calendar-basic-setup): In the wide frame case, show the original
Glenn Morris <rgm@gnu.org>
parents:
105478
diff
changeset
|
1347 (diary-view-entries)))) |
93808
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
1348 (if calendar-view-holidays-initially-flag |
93026
8e1a78482251
(calendar-today-marker, initial-calendar-window-hook)
Glenn Morris <rgm@gnu.org>
parents:
92988
diff
changeset
|
1349 (let* ((diary-buffer (get-file-buffer diary-file)) |
8e1a78482251
(calendar-today-marker, initial-calendar-window-hook)
Glenn Morris <rgm@gnu.org>
parents:
92988
diff
changeset
|
1350 (diary-window (if diary-buffer (get-buffer-window diary-buffer))) |
8e1a78482251
(calendar-today-marker, initial-calendar-window-hook)
Glenn Morris <rgm@gnu.org>
parents:
92988
diff
changeset
|
1351 (split-height-threshold (if diary-window 2 1000))) |
8e1a78482251
(calendar-today-marker, initial-calendar-window-hook)
Glenn Morris <rgm@gnu.org>
parents:
92988
diff
changeset
|
1352 ;; FIXME display buffer? |
84554
5bd5d06e4cf2
Rename all list-calendar-holidays callers to calendar-list-holidays,
Glenn Morris <rgm@gnu.org>
parents:
82365
diff
changeset
|
1353 (calendar-list-holidays))) |
93808
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
1354 (run-hooks 'calendar-initial-window-hook)) |
628 | 1355 |
93808
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
1356 (defun calendar-generate-window (&optional mon yr) |
957 | 1357 "Generate the calendar window for the current date. |
93187
c68684b0a2d1
(calendar-remove-frame-by-deleting): Default to t. Add to 'calendar group.
Glenn Morris <rgm@gnu.org>
parents:
93091
diff
changeset
|
1358 Optional integers MON and YR are used instead of today's date." |
82203
3d0d3af343ac
(calendar-mode): Make sure displayed-(month|year) are set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82151
diff
changeset
|
1359 (let* ((inhibit-read-only t) |
628 | 1360 (today (calendar-current-date)) |
93808
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
1361 (month (calendar-extract-month today)) |
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
1362 (day (calendar-extract-day today)) |
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
1363 (year (calendar-extract-year today)) |
93528
6fb229e96593
(diary-entry-marker, calendar-today-marker, calendar-holiday-marker)
Glenn Morris <rgm@gnu.org>
parents:
93510
diff
changeset
|
1364 (today-visible (or (not mon) |
6fb229e96593
(diary-entry-marker, calendar-today-marker, calendar-holiday-marker)
Glenn Morris <rgm@gnu.org>
parents:
93510
diff
changeset
|
1365 (<= (abs (calendar-interval mon yr month year)) 1))) |
60292
b8747b7d8e2a
From Matt Hodges <MPHodges@member.fsf.org>:
Glenn Morris <rgm@gnu.org>
parents:
59044
diff
changeset
|
1366 (day-in-week (calendar-day-of-week today)) |
b8747b7d8e2a
From Matt Hodges <MPHodges@member.fsf.org>:
Glenn Morris <rgm@gnu.org>
parents:
59044
diff
changeset
|
1367 (in-calendar-window (eq (window-buffer (selected-window)) |
b8747b7d8e2a
From Matt Hodges <MPHodges@member.fsf.org>:
Glenn Morris <rgm@gnu.org>
parents:
59044
diff
changeset
|
1368 (get-buffer calendar-buffer)))) |
93808
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
1369 (calendar-generate (or mon month) (or yr year)) |
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
1370 (calendar-update-mode-line) |
628 | 1371 (calendar-cursor-to-visible-date |
1372 (if today-visible today (list displayed-month 1 displayed-year))) | |
1373 (set-buffer-modified-p nil) | |
60292
b8747b7d8e2a
From Matt Hodges <MPHodges@member.fsf.org>:
Glenn Morris <rgm@gnu.org>
parents:
59044
diff
changeset
|
1374 ;; Don't do any window-related stuff if we weren't called from a |
92697
001682fd0516
(diary-file, hebrew-holidays-1)
Glenn Morris <rgm@gnu.org>
parents:
92681
diff
changeset
|
1375 ;; window displaying the calendar. |
60292
b8747b7d8e2a
From Matt Hodges <MPHodges@member.fsf.org>:
Glenn Morris <rgm@gnu.org>
parents:
59044
diff
changeset
|
1376 (when in-calendar-window |
105398
3fec4318d760
(calendar-basic-setup): Handle the case where the frame is wide.
Glenn Morris <rgm@gnu.org>
parents:
105141
diff
changeset
|
1377 ;; The second test used to be window-full-width-p. |
3fec4318d760
(calendar-basic-setup): Handle the case where the frame is wide.
Glenn Morris <rgm@gnu.org>
parents:
105141
diff
changeset
|
1378 ;; Not sure what it was/is for, except perhaps some way of saying |
3fec4318d760
(calendar-basic-setup): Handle the case where the frame is wide.
Glenn Morris <rgm@gnu.org>
parents:
105141
diff
changeset
|
1379 ;; "try not to mess with existing configurations". |
3fec4318d760
(calendar-basic-setup): Handle the case where the frame is wide.
Glenn Morris <rgm@gnu.org>
parents:
105141
diff
changeset
|
1380 ;; If did the wrong thing on wide frames, where we have done a |
3fec4318d760
(calendar-basic-setup): Handle the case where the frame is wide.
Glenn Morris <rgm@gnu.org>
parents:
105141
diff
changeset
|
1381 ;; horizontal split in calendar-basic-setup. |
3fec4318d760
(calendar-basic-setup): Handle the case where the frame is wide.
Glenn Morris <rgm@gnu.org>
parents:
105141
diff
changeset
|
1382 (if (or (one-window-p t) (not (window-safely-shrinkable-p))) |
60292
b8747b7d8e2a
From Matt Hodges <MPHodges@member.fsf.org>:
Glenn Morris <rgm@gnu.org>
parents:
59044
diff
changeset
|
1383 ;; Don't mess with the window size, but ensure that the first |
92697
001682fd0516
(diary-file, hebrew-holidays-1)
Glenn Morris <rgm@gnu.org>
parents:
92681
diff
changeset
|
1384 ;; line is fully visible. |
60292
b8747b7d8e2a
From Matt Hodges <MPHodges@member.fsf.org>:
Glenn Morris <rgm@gnu.org>
parents:
59044
diff
changeset
|
1385 (set-window-vscroll nil 0) |
92697
001682fd0516
(diary-file, hebrew-holidays-1)
Glenn Morris <rgm@gnu.org>
parents:
92681
diff
changeset
|
1386 ;; Adjust the window to exactly fit the displayed calendar. |
60292
b8747b7d8e2a
From Matt Hodges <MPHodges@member.fsf.org>:
Glenn Morris <rgm@gnu.org>
parents:
59044
diff
changeset
|
1387 (fit-window-to-buffer nil nil calendar-minimum-window-height)) |
b8747b7d8e2a
From Matt Hodges <MPHodges@member.fsf.org>:
Glenn Morris <rgm@gnu.org>
parents:
59044
diff
changeset
|
1388 (sit-for 0)) |
93578
14c23c86b7aa
(hebrew-holidays-1, hebrew-holidays-2, hebrew-holidays-3, hebrew-holidays-4):
Glenn Morris <rgm@gnu.org>
parents:
93528
diff
changeset
|
1389 (and (bound-and-true-p font-lock-mode) |
14c23c86b7aa
(hebrew-holidays-1, hebrew-holidays-2, hebrew-holidays-3, hebrew-holidays-4):
Glenn Morris <rgm@gnu.org>
parents:
93528
diff
changeset
|
1390 (font-lock-fontify-buffer)) |
93808
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
1391 (and calendar-mark-holidays-flag |
92530
04183df0b71f
(calendar-date-is-legal-p): New obsolete alias.
Juanma Barranquero <lekktu@gmail.com>
parents:
87649
diff
changeset
|
1392 ;;; (calendar-date-is-valid-p today) ; useful for BC dates |
92844
f5f51a11e3da
Remove explicit autoloads now in cal-loaddefs.
Glenn Morris <rgm@gnu.org>
parents:
92823
diff
changeset
|
1393 (calendar-mark-holidays) |
60292
b8747b7d8e2a
From Matt Hodges <MPHodges@member.fsf.org>:
Glenn Morris <rgm@gnu.org>
parents:
59044
diff
changeset
|
1394 (and in-calendar-window (sit-for 0))) |
628 | 1395 (unwind-protect |
93808
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
1396 (if calendar-mark-diary-entries-flag (diary-mark-entries)) |
628 | 1397 (if today-visible |
93808
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
1398 (run-hooks 'calendar-today-visible-hook) |
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
1399 (run-hooks 'calendar-today-invisible-hook))))) |
628 | 1400 |
93808
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
1401 (defun calendar-generate (month year) |
54128 | 1402 "Generate a three-month Gregorian calendar centered around MONTH, YEAR." |
82118
baffe86b0c44
(calendar-mode-map): Move initialization into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82086
diff
changeset
|
1403 ;; A negative YEAR is interpreted as BC; -1 being 1 BC, and so on. |
baffe86b0c44
(calendar-mode-map): Move initialization into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82086
diff
changeset
|
1404 ;; Note that while calendars for years BC could be displayed as it |
baffe86b0c44
(calendar-mode-map): Move initialization into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82086
diff
changeset
|
1405 ;; stands, almost all other calendar functions (eg holidays) would |
baffe86b0c44
(calendar-mode-map): Move initialization into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82086
diff
changeset
|
1406 ;; at best have unpredictable results for such dates. |
54128 | 1407 (if (< (+ month (* 12 (1- year))) 2) |
60292
b8747b7d8e2a
From Matt Hodges <MPHodges@member.fsf.org>:
Glenn Morris <rgm@gnu.org>
parents:
59044
diff
changeset
|
1408 (error "Months before January, 1 AD cannot be displayed")) |
54128 | 1409 (setq displayed-month month |
1410 displayed-year year) | |
628 | 1411 (erase-buffer) |
93808
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
1412 (calendar-increment-month month year -1) |
82086
1ee19eca3bfc
(generate-calendar, (generate-calendar-month): Use dotimes rather than
Glenn Morris <rgm@gnu.org>
parents:
78145
diff
changeset
|
1413 (dotimes (i 3) |
96158
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
1414 (calendar-generate-month month year |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
1415 (+ calendar-left-margin |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
1416 (* calendar-month-width i))) |
93808
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
1417 (calendar-increment-month month year 1))) |
628 | 1418 |
96158
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
1419 (defun calendar-move-to-column (indent) |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
1420 "Like `move-to-column', but indents if the line is too short." |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
1421 (if (< (move-to-column indent) indent) |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
1422 (indent-to indent))) |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
1423 |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
1424 (defun calendar-ensure-newline () |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
1425 "Move to the next line, adding a newline if necessary." |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
1426 (or (zerop (forward-line 1)) |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
1427 (insert "\n"))) |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
1428 |
96295
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
1429 (defun calendar-insert-at-column (indent string truncate) |
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
1430 "Move to column INDENT, adding spaces as needed. |
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
1431 Inserts STRING so that it ends at INDENT. STRING is either a |
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
1432 literal string, or a sexp to evaluate to return such. Truncates |
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
1433 STRING to length TRUNCATE, ensure a trailing space." |
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
1434 (if (not (ignore-errors (stringp (setq string (eval string))))) |
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
1435 (calendar-move-to-column indent) |
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
1436 (if (> (length string) truncate) |
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
1437 (setq string (substring string 0 truncate))) |
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
1438 (or (string-match " $" string) |
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
1439 (if (= (length string) truncate) |
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
1440 (aset string (1- truncate) ?\s) |
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
1441 (setq string (concat string " ")))) |
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
1442 (calendar-move-to-column (- indent (length string))) |
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
1443 (insert string))) |
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
1444 |
93808
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
1445 (defun calendar-generate-month (month year indent) |
628 | 1446 "Produce a calendar for MONTH, YEAR on the Gregorian calendar. |
43010
f3f6fc83e6d1
(generate-calendar-month): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
42924
diff
changeset
|
1447 The calendar is inserted at the top of the buffer in which point is currently |
f3f6fc83e6d1
(generate-calendar-month): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
42924
diff
changeset
|
1448 located, but indented INDENT spaces. The indentation is done from the first |
f3f6fc83e6d1
(generate-calendar-month): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
42924
diff
changeset
|
1449 character on the line and does not disturb the first INDENT characters on the |
54128 | 1450 line." |
92969
bb4fc128d00d
(european-calendar-style, calendar-for-loop)
Glenn Morris <rgm@gnu.org>
parents:
92930
diff
changeset
|
1451 (let ((blank-days ; at start of month |
bb4fc128d00d
(european-calendar-style, calendar-for-loop)
Glenn Morris <rgm@gnu.org>
parents:
92930
diff
changeset
|
1452 (mod |
bb4fc128d00d
(european-calendar-style, calendar-for-loop)
Glenn Morris <rgm@gnu.org>
parents:
92930
diff
changeset
|
1453 (- (calendar-day-of-week (list month 1 year)) |
bb4fc128d00d
(european-calendar-style, calendar-for-loop)
Glenn Morris <rgm@gnu.org>
parents:
92930
diff
changeset
|
1454 calendar-week-start-day) |
bb4fc128d00d
(european-calendar-style, calendar-for-loop)
Glenn Morris <rgm@gnu.org>
parents:
92930
diff
changeset
|
1455 7)) |
93528
6fb229e96593
(diary-entry-marker, calendar-today-marker, calendar-holiday-marker)
Glenn Morris <rgm@gnu.org>
parents:
93510
diff
changeset
|
1456 (last (calendar-last-day-of-month month year)) |
96295
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
1457 (trunc (min calendar-intermonth-spacing |
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
1458 (1- calendar-left-margin))) |
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
1459 (day 1) |
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
1460 string) |
4861
924486090b27
(calendar-week-start-day): New var (autoloaded) to
Richard M. Stallman <rms@gnu.org>
parents:
4658
diff
changeset
|
1461 (goto-char (point-min)) |
96158
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
1462 (calendar-move-to-column indent) |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
1463 (insert |
4861
924486090b27
(calendar-week-start-day): New var (autoloaded) to
Richard M. Stallman <rms@gnu.org>
parents:
4658
diff
changeset
|
1464 (calendar-string-spread |
96158
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
1465 (list (format "%s %d" (calendar-month-name month) year)) |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
1466 ?\s calendar-month-digit-width)) |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
1467 (calendar-ensure-newline) |
96295
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
1468 (calendar-insert-at-column indent calendar-intermonth-header trunc) |
52115
60ffdeba6e0e
(diary-file, diary-file-name-prefix)
Glenn Morris <rgm@gnu.org>
parents:
49828
diff
changeset
|
1469 ;; Use the first two characters of each day to head the columns. |
82086
1ee19eca3bfc
(generate-calendar, (generate-calendar-month): Use dotimes rather than
Glenn Morris <rgm@gnu.org>
parents:
78145
diff
changeset
|
1470 (dotimes (i 7) |
1ee19eca3bfc
(generate-calendar, (generate-calendar-month): Use dotimes rather than
Glenn Morris <rgm@gnu.org>
parents:
78145
diff
changeset
|
1471 (insert |
93528
6fb229e96593
(diary-entry-marker, calendar-today-marker, calendar-holiday-marker)
Glenn Morris <rgm@gnu.org>
parents:
93510
diff
changeset
|
1472 (progn |
6fb229e96593
(diary-entry-marker, calendar-today-marker, calendar-holiday-marker)
Glenn Morris <rgm@gnu.org>
parents:
93510
diff
changeset
|
1473 (setq string |
6fb229e96593
(diary-entry-marker, calendar-today-marker, calendar-holiday-marker)
Glenn Morris <rgm@gnu.org>
parents:
93510
diff
changeset
|
1474 (calendar-day-name (mod (+ calendar-week-start-day i) 7) nil t)) |
82086
1ee19eca3bfc
(generate-calendar, (generate-calendar-month): Use dotimes rather than
Glenn Morris <rgm@gnu.org>
parents:
78145
diff
changeset
|
1475 (if enable-multibyte-characters |
96158
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
1476 (truncate-string-to-width string calendar-day-header-width) |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
1477 (substring string 0 calendar-day-header-width))) |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
1478 (make-string (- calendar-column-width calendar-day-header-width) ?\s))) |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
1479 (calendar-ensure-newline) |
96295
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
1480 (calendar-insert-at-column indent calendar-intermonth-text trunc) |
92697
001682fd0516
(diary-file, hebrew-holidays-1)
Glenn Morris <rgm@gnu.org>
parents:
92681
diff
changeset
|
1481 ;; Add blank days before the first of the month. |
96158
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
1482 (insert (make-string (* blank-days calendar-column-width) ?\s)) |
92697
001682fd0516
(diary-file, hebrew-holidays-1)
Glenn Morris <rgm@gnu.org>
parents:
92681
diff
changeset
|
1483 ;; Put in the days of the month. |
92969
bb4fc128d00d
(european-calendar-style, calendar-for-loop)
Glenn Morris <rgm@gnu.org>
parents:
92930
diff
changeset
|
1484 (dotimes (i last) |
96031
edf0549afd4a
(calendar-move-hook):Add calendar-update-mode-line as an option.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
1485 (setq day (1+ i)) |
96364
c5e50585b044
American English spelling fix.
Glenn Morris <rgm@gnu.org>
parents:
96350
diff
changeset
|
1486 ;; TODO should numbers be left-justified, centered...? |
96158
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
1487 (insert (format (format "%%%dd%%s" calendar-day-digit-width) day |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
1488 (make-string |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
1489 (- calendar-column-width calendar-day-digit-width) ?\s))) |
96295
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
1490 ;; 'date property prevents intermonth text confusing re-searches. |
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
1491 ;; (Tried intangible, it did not really work.) |
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
1492 (set-text-properties |
96158
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
1493 (- (point) (1+ calendar-day-digit-width)) (1- (point)) |
96295
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
1494 `(mouse-face highlight help-echo ,(eval calendar-date-echo-text) |
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
1495 date t)) |
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
1496 (when (and (zerop (mod (+ day blank-days) 7)) |
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
1497 (/= day last)) |
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
1498 (calendar-ensure-newline) |
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
1499 (setq day (1+ day)) ; first day of next week |
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
1500 (calendar-insert-at-column indent calendar-intermonth-text trunc))))) |
628 | 1501 |
93808
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
1502 (defun calendar-redraw () |
60322
ae2850fc74dc
(redraw-calendar): Work from any buffer, not just the calendar.
Glenn Morris <rgm@gnu.org>
parents:
60292
diff
changeset
|
1503 "Redraw the calendar display, if `calendar-buffer' is live." |
628 | 1504 (interactive) |
60322
ae2850fc74dc
(redraw-calendar): Work from any buffer, not just the calendar.
Glenn Morris <rgm@gnu.org>
parents:
60292
diff
changeset
|
1505 (if (get-buffer calendar-buffer) |
60568
e2cd8a11381a
(calendar-redrawing): New internal variable.
Glenn Morris <rgm@gnu.org>
parents:
60528
diff
changeset
|
1506 (with-current-buffer calendar-buffer |
60649 | 1507 (let ((cursor-date (calendar-cursor-to-nearest-date))) |
93808
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
1508 (calendar-generate-window displayed-month displayed-year) |
60568
e2cd8a11381a
(calendar-redrawing): New internal variable.
Glenn Morris <rgm@gnu.org>
parents:
60528
diff
changeset
|
1509 (calendar-cursor-to-visible-date cursor-date))))) |
60528
952103a61e35
(redraw-calendar): Preserve point. Reported by Matt Hodges
Glenn Morris <rgm@gnu.org>
parents:
60322
diff
changeset
|
1510 |
82118
baffe86b0c44
(calendar-mode-map): Move initialization into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82086
diff
changeset
|
1511 (defvar calendar-mode-map |
68366
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
1512 (let ((map (make-keymap))) |
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
1513 (suppress-keymap map) |
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
1514 (dolist (c '(narrow-to-region mark-word mark-sexp mark-paragraph |
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
1515 mark-defun mark-whole-buffer mark-page |
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
1516 downcase-region upcase-region kill-region |
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
1517 copy-region-as-kill capitalize-region write-region)) |
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
1518 (define-key map (vector 'remap c) 'calendar-not-implemented)) |
82151
7b6bc42d5f2c
(calendar-mode-map): Use new calendar-scroll-* names.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
1519 (define-key map "<" 'calendar-scroll-right) |
7b6bc42d5f2c
(calendar-mode-map): Use new calendar-scroll-* names.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
1520 (define-key map "\C-x<" 'calendar-scroll-right) |
7b6bc42d5f2c
(calendar-mode-map): Use new calendar-scroll-* names.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
1521 (define-key map [prior] 'calendar-scroll-right-three-months) |
7b6bc42d5f2c
(calendar-mode-map): Use new calendar-scroll-* names.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
1522 (define-key map "\ev" 'calendar-scroll-right-three-months) |
7b6bc42d5f2c
(calendar-mode-map): Use new calendar-scroll-* names.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
1523 (define-key map ">" 'calendar-scroll-left) |
7b6bc42d5f2c
(calendar-mode-map): Use new calendar-scroll-* names.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
1524 (define-key map "\C-x>" 'calendar-scroll-left) |
7b6bc42d5f2c
(calendar-mode-map): Use new calendar-scroll-* names.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
1525 (define-key map [next] 'calendar-scroll-left-three-months) |
7b6bc42d5f2c
(calendar-mode-map): Use new calendar-scroll-* names.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
1526 (define-key map "\C-v" 'calendar-scroll-left-three-months) |
68366
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
1527 (define-key map "\C-b" 'calendar-backward-day) |
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
1528 (define-key map "\C-p" 'calendar-backward-week) |
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
1529 (define-key map "\e{" 'calendar-backward-month) |
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
1530 (define-key map "\C-x[" 'calendar-backward-year) |
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
1531 (define-key map "\C-f" 'calendar-forward-day) |
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
1532 (define-key map "\C-n" 'calendar-forward-week) |
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
1533 (define-key map [left] 'calendar-backward-day) |
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
1534 (define-key map [up] 'calendar-backward-week) |
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
1535 (define-key map [right] 'calendar-forward-day) |
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
1536 (define-key map [down] 'calendar-forward-week) |
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
1537 (define-key map "\e}" 'calendar-forward-month) |
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
1538 (define-key map "\C-x]" 'calendar-forward-year) |
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
1539 (define-key map "\C-a" 'calendar-beginning-of-week) |
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
1540 (define-key map "\C-e" 'calendar-end-of-week) |
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
1541 (define-key map "\ea" 'calendar-beginning-of-month) |
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
1542 (define-key map "\ee" 'calendar-end-of-month) |
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
1543 (define-key map "\e<" 'calendar-beginning-of-year) |
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
1544 (define-key map "\e>" 'calendar-end-of-year) |
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
1545 (define-key map "\C-@" 'calendar-set-mark) |
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
1546 ;; Many people are used to typing C-SPC and getting C-@. |
82118
baffe86b0c44
(calendar-mode-map): Move initialization into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82086
diff
changeset
|
1547 (define-key map [?\C-\s] 'calendar-set-mark) |
68366
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
1548 (define-key map "\C-x\C-x" 'calendar-exchange-point-and-mark) |
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
1549 (define-key map "\e=" 'calendar-count-days-region) |
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
1550 (define-key map "gd" 'calendar-goto-date) |
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
1551 (define-key map "gD" 'calendar-goto-day-of-year) |
93647
447b30ba4c57
Update for iso, islamic, julian, mayan, persian name changes.
Glenn Morris <rgm@gnu.org>
parents:
93630
diff
changeset
|
1552 (define-key map "gj" 'calendar-julian-goto-date) |
447b30ba4c57
Update for iso, islamic, julian, mayan, persian name changes.
Glenn Morris <rgm@gnu.org>
parents:
93630
diff
changeset
|
1553 (define-key map "ga" 'calendar-astro-goto-day-number) |
93740
61bda7ffa0b8
Update for chinese and hebrew name changes.
Glenn Morris <rgm@gnu.org>
parents:
93730
diff
changeset
|
1554 (define-key map "gh" 'calendar-hebrew-goto-date) |
93647
447b30ba4c57
Update for iso, islamic, julian, mayan, persian name changes.
Glenn Morris <rgm@gnu.org>
parents:
93630
diff
changeset
|
1555 (define-key map "gi" 'calendar-islamic-goto-date) |
84593
6a5b534dceee
Following cal-bahai renaming, update all
Glenn Morris <rgm@gnu.org>
parents:
84554
diff
changeset
|
1556 (define-key map "gb" 'calendar-bahai-goto-date) |
93740
61bda7ffa0b8
Update for chinese and hebrew name changes.
Glenn Morris <rgm@gnu.org>
parents:
93730
diff
changeset
|
1557 (define-key map "gC" 'calendar-chinese-goto-date) |
93719
5673edec9392
Update for coptic and french name changes.
Glenn Morris <rgm@gnu.org>
parents:
93714
diff
changeset
|
1558 (define-key map "gk" 'calendar-coptic-goto-date) |
5673edec9392
Update for coptic and french name changes.
Glenn Morris <rgm@gnu.org>
parents:
93714
diff
changeset
|
1559 (define-key map "ge" 'calendar-ethiopic-goto-date) |
93647
447b30ba4c57
Update for iso, islamic, julian, mayan, persian name changes.
Glenn Morris <rgm@gnu.org>
parents:
93630
diff
changeset
|
1560 (define-key map "gp" 'calendar-persian-goto-date) |
447b30ba4c57
Update for iso, islamic, julian, mayan, persian name changes.
Glenn Morris <rgm@gnu.org>
parents:
93630
diff
changeset
|
1561 (define-key map "gc" 'calendar-iso-goto-date) |
447b30ba4c57
Update for iso, islamic, julian, mayan, persian name changes.
Glenn Morris <rgm@gnu.org>
parents:
93630
diff
changeset
|
1562 (define-key map "gw" 'calendar-iso-goto-week) |
93719
5673edec9392
Update for coptic and french name changes.
Glenn Morris <rgm@gnu.org>
parents:
93714
diff
changeset
|
1563 (define-key map "gf" 'calendar-french-goto-date) |
93647
447b30ba4c57
Update for iso, islamic, julian, mayan, persian name changes.
Glenn Morris <rgm@gnu.org>
parents:
93630
diff
changeset
|
1564 (define-key map "gml" 'calendar-mayan-goto-long-count-date) |
447b30ba4c57
Update for iso, islamic, julian, mayan, persian name changes.
Glenn Morris <rgm@gnu.org>
parents:
93630
diff
changeset
|
1565 (define-key map "gmpc" 'calendar-mayan-previous-round-date) |
447b30ba4c57
Update for iso, islamic, julian, mayan, persian name changes.
Glenn Morris <rgm@gnu.org>
parents:
93630
diff
changeset
|
1566 (define-key map "gmnc" 'calendar-mayan-next-round-date) |
447b30ba4c57
Update for iso, islamic, julian, mayan, persian name changes.
Glenn Morris <rgm@gnu.org>
parents:
93630
diff
changeset
|
1567 (define-key map "gmph" 'calendar-mayan-previous-haab-date) |
447b30ba4c57
Update for iso, islamic, julian, mayan, persian name changes.
Glenn Morris <rgm@gnu.org>
parents:
93630
diff
changeset
|
1568 (define-key map "gmnh" 'calendar-mayan-next-haab-date) |
447b30ba4c57
Update for iso, islamic, julian, mayan, persian name changes.
Glenn Morris <rgm@gnu.org>
parents:
93630
diff
changeset
|
1569 (define-key map "gmpt" 'calendar-mayan-previous-tzolkin-date) |
447b30ba4c57
Update for iso, islamic, julian, mayan, persian name changes.
Glenn Morris <rgm@gnu.org>
parents:
93630
diff
changeset
|
1570 (define-key map "gmnt" 'calendar-mayan-next-tzolkin-date) |
68366
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
1571 (define-key map "Aa" 'appt-add) |
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
1572 (define-key map "Ad" 'appt-delete) |
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
1573 (define-key map "S" 'calendar-sunrise-sunset) |
96350
96074e8d2af6
(calendar-mode-map): Update for name change.
Glenn Morris <rgm@gnu.org>
parents:
96346
diff
changeset
|
1574 (define-key map "M" 'calendar-lunar-phases) |
68366
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
1575 (define-key map " " 'scroll-other-window) |
93815
f25074f90473
(calendar-mode-map): Replace use of kbd.
Glenn Morris <rgm@gnu.org>
parents:
93808
diff
changeset
|
1576 (define-key map "\d" 'scroll-other-window-down) |
93808
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
1577 (define-key map "\C-c\C-l" 'calendar-redraw) |
68366
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
1578 (define-key map "." 'calendar-goto-today) |
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
1579 (define-key map "o" 'calendar-other-month) |
93808
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
1580 (define-key map "q" 'calendar-exit) |
84554
5bd5d06e4cf2
Rename all list-calendar-holidays callers to calendar-list-holidays,
Glenn Morris <rgm@gnu.org>
parents:
82365
diff
changeset
|
1581 (define-key map "a" 'calendar-list-holidays) |
68366
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
1582 (define-key map "h" 'calendar-cursor-holidays) |
93492
2fe1b51b8771
(calendar-mode-map): Use calendar-mark-holidays rather than obsolete alias.
Glenn Morris <rgm@gnu.org>
parents:
93464
diff
changeset
|
1583 (define-key map "x" 'calendar-mark-holidays) |
68366
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
1584 (define-key map "u" 'calendar-unmark) |
93791
4ef65ad699dc
Update for diary-lib name changes.
Glenn Morris <rgm@gnu.org>
parents:
93740
diff
changeset
|
1585 (define-key map "m" 'diary-mark-entries) |
68366
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
1586 (define-key map "d" 'diary-view-entries) |
93791
4ef65ad699dc
Update for diary-lib name changes.
Glenn Morris <rgm@gnu.org>
parents:
93740
diff
changeset
|
1587 (define-key map "D" 'diary-view-other-diary-entries) |
70632
2c9ec59f776a
(calendar-mode-map): Refer to diary-show-all-entries rather than alias
Glenn Morris <rgm@gnu.org>
parents:
70600
diff
changeset
|
1588 (define-key map "s" 'diary-show-all-entries) |
68366
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
1589 (define-key map "pd" 'calendar-print-day-of-year) |
93740
61bda7ffa0b8
Update for chinese and hebrew name changes.
Glenn Morris <rgm@gnu.org>
parents:
93730
diff
changeset
|
1590 (define-key map "pC" 'calendar-chinese-print-date) |
93719
5673edec9392
Update for coptic and french name changes.
Glenn Morris <rgm@gnu.org>
parents:
93714
diff
changeset
|
1591 (define-key map "pk" 'calendar-coptic-print-date) |
5673edec9392
Update for coptic and french name changes.
Glenn Morris <rgm@gnu.org>
parents:
93714
diff
changeset
|
1592 (define-key map "pe" 'calendar-ethiopic-print-date) |
93647
447b30ba4c57
Update for iso, islamic, julian, mayan, persian name changes.
Glenn Morris <rgm@gnu.org>
parents:
93630
diff
changeset
|
1593 (define-key map "pp" 'calendar-persian-print-date) |
447b30ba4c57
Update for iso, islamic, julian, mayan, persian name changes.
Glenn Morris <rgm@gnu.org>
parents:
93630
diff
changeset
|
1594 (define-key map "pc" 'calendar-iso-print-date) |
447b30ba4c57
Update for iso, islamic, julian, mayan, persian name changes.
Glenn Morris <rgm@gnu.org>
parents:
93630
diff
changeset
|
1595 (define-key map "pj" 'calendar-julian-print-date) |
447b30ba4c57
Update for iso, islamic, julian, mayan, persian name changes.
Glenn Morris <rgm@gnu.org>
parents:
93630
diff
changeset
|
1596 (define-key map "pa" 'calendar-astro-print-day-number) |
93740
61bda7ffa0b8
Update for chinese and hebrew name changes.
Glenn Morris <rgm@gnu.org>
parents:
93730
diff
changeset
|
1597 (define-key map "ph" 'calendar-hebrew-print-date) |
93647
447b30ba4c57
Update for iso, islamic, julian, mayan, persian name changes.
Glenn Morris <rgm@gnu.org>
parents:
93630
diff
changeset
|
1598 (define-key map "pi" 'calendar-islamic-print-date) |
84593
6a5b534dceee
Following cal-bahai renaming, update all
Glenn Morris <rgm@gnu.org>
parents:
84554
diff
changeset
|
1599 (define-key map "pb" 'calendar-bahai-print-date) |
93719
5673edec9392
Update for coptic and french name changes.
Glenn Morris <rgm@gnu.org>
parents:
93714
diff
changeset
|
1600 (define-key map "pf" 'calendar-french-print-date) |
93647
447b30ba4c57
Update for iso, islamic, julian, mayan, persian name changes.
Glenn Morris <rgm@gnu.org>
parents:
93630
diff
changeset
|
1601 (define-key map "pm" 'calendar-mayan-print-date) |
68366
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
1602 (define-key map "po" 'calendar-print-other-dates) |
93791
4ef65ad699dc
Update for diary-lib name changes.
Glenn Morris <rgm@gnu.org>
parents:
93740
diff
changeset
|
1603 (define-key map "id" 'diary-insert-entry) |
4ef65ad699dc
Update for diary-lib name changes.
Glenn Morris <rgm@gnu.org>
parents:
93740
diff
changeset
|
1604 (define-key map "iw" 'diary-insert-weekly-entry) |
4ef65ad699dc
Update for diary-lib name changes.
Glenn Morris <rgm@gnu.org>
parents:
93740
diff
changeset
|
1605 (define-key map "im" 'diary-insert-monthly-entry) |
4ef65ad699dc
Update for diary-lib name changes.
Glenn Morris <rgm@gnu.org>
parents:
93740
diff
changeset
|
1606 (define-key map "iy" 'diary-insert-yearly-entry) |
4ef65ad699dc
Update for diary-lib name changes.
Glenn Morris <rgm@gnu.org>
parents:
93740
diff
changeset
|
1607 (define-key map "ia" 'diary-insert-anniversary-entry) |
4ef65ad699dc
Update for diary-lib name changes.
Glenn Morris <rgm@gnu.org>
parents:
93740
diff
changeset
|
1608 (define-key map "ib" 'diary-insert-block-entry) |
4ef65ad699dc
Update for diary-lib name changes.
Glenn Morris <rgm@gnu.org>
parents:
93740
diff
changeset
|
1609 (define-key map "ic" 'diary-insert-cyclic-entry) |
93740
61bda7ffa0b8
Update for chinese and hebrew name changes.
Glenn Morris <rgm@gnu.org>
parents:
93730
diff
changeset
|
1610 (define-key map "ihd" 'diary-hebrew-insert-entry) |
61bda7ffa0b8
Update for chinese and hebrew name changes.
Glenn Morris <rgm@gnu.org>
parents:
93730
diff
changeset
|
1611 (define-key map "ihm" 'diary-hebrew-insert-monthly-entry) |
94311
d550d8d3e7f3
(calendar-mode-map): Fix typo.
Glenn Morris <rgm@gnu.org>
parents:
94287
diff
changeset
|
1612 (define-key map "ihy" 'diary-hebrew-insert-yearly-entry) |
93647
447b30ba4c57
Update for iso, islamic, julian, mayan, persian name changes.
Glenn Morris <rgm@gnu.org>
parents:
93630
diff
changeset
|
1613 (define-key map "iid" 'diary-islamic-insert-entry) |
447b30ba4c57
Update for iso, islamic, julian, mayan, persian name changes.
Glenn Morris <rgm@gnu.org>
parents:
93630
diff
changeset
|
1614 (define-key map "iim" 'diary-islamic-insert-monthly-entry) |
447b30ba4c57
Update for iso, islamic, julian, mayan, persian name changes.
Glenn Morris <rgm@gnu.org>
parents:
93630
diff
changeset
|
1615 (define-key map "iiy" 'diary-islamic-insert-yearly-entry) |
84593
6a5b534dceee
Following cal-bahai renaming, update all
Glenn Morris <rgm@gnu.org>
parents:
84554
diff
changeset
|
1616 (define-key map "iBd" 'diary-bahai-insert-entry) |
6a5b534dceee
Following cal-bahai renaming, update all
Glenn Morris <rgm@gnu.org>
parents:
84554
diff
changeset
|
1617 (define-key map "iBm" 'diary-bahai-insert-monthly-entry) |
6a5b534dceee
Following cal-bahai renaming, update all
Glenn Morris <rgm@gnu.org>
parents:
84554
diff
changeset
|
1618 (define-key map "iBy" 'diary-bahai-insert-yearly-entry) |
68366
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
1619 (define-key map "?" 'calendar-goto-info-node) |
73518
099deb7b2cbd
(cal-html-cursor-month, cal-html-cursor-year): Add autoloads for this
Glenn Morris <rgm@gnu.org>
parents:
73181
diff
changeset
|
1620 (define-key map "Hm" 'cal-html-cursor-month) |
099deb7b2cbd
(cal-html-cursor-month, cal-html-cursor-year): Add autoloads for this
Glenn Morris <rgm@gnu.org>
parents:
73181
diff
changeset
|
1621 (define-key map "Hy" 'cal-html-cursor-year) |
68366
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
1622 (define-key map "tm" 'cal-tex-cursor-month) |
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
1623 (define-key map "tM" 'cal-tex-cursor-month-landscape) |
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
1624 (define-key map "td" 'cal-tex-cursor-day) |
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
1625 (define-key map "tw1" 'cal-tex-cursor-week) |
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
1626 (define-key map "tw2" 'cal-tex-cursor-week2) |
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
1627 (define-key map "tw3" 'cal-tex-cursor-week-iso) |
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
1628 (define-key map "tw4" 'cal-tex-cursor-week-monday) |
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
1629 (define-key map "tfd" 'cal-tex-cursor-filofax-daily) |
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
1630 (define-key map "tfw" 'cal-tex-cursor-filofax-2week) |
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
1631 (define-key map "tfW" 'cal-tex-cursor-filofax-week) |
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
1632 (define-key map "tfy" 'cal-tex-cursor-filofax-year) |
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
1633 (define-key map "ty" 'cal-tex-cursor-year) |
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
1634 (define-key map "tY" 'cal-tex-cursor-year-landscape) |
82118
baffe86b0c44
(calendar-mode-map): Move initialization into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82086
diff
changeset
|
1635 |
baffe86b0c44
(calendar-mode-map): Move initialization into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82086
diff
changeset
|
1636 (define-key map [menu-bar edit] 'undefined) |
baffe86b0c44
(calendar-mode-map): Move initialization into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82086
diff
changeset
|
1637 (define-key map [menu-bar search] 'undefined) |
baffe86b0c44
(calendar-mode-map): Move initialization into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82086
diff
changeset
|
1638 |
96346
775f65dc9776
(solar-sunrises-buffer): New constant.
Glenn Morris <rgm@gnu.org>
parents:
96315
diff
changeset
|
1639 (easy-menu-define nil map nil cal-menu-sunmoon-menu) |
82118
baffe86b0c44
(calendar-mode-map): Move initialization into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82086
diff
changeset
|
1640 (easy-menu-define nil map nil cal-menu-diary-menu) |
baffe86b0c44
(calendar-mode-map): Move initialization into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82086
diff
changeset
|
1641 (easy-menu-define nil map nil cal-menu-holidays-menu) |
baffe86b0c44
(calendar-mode-map): Move initialization into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82086
diff
changeset
|
1642 (easy-menu-define nil map nil cal-menu-goto-menu) |
baffe86b0c44
(calendar-mode-map): Move initialization into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82086
diff
changeset
|
1643 (easy-menu-define nil map nil cal-menu-scroll-menu) |
92530
04183df0b71f
(calendar-date-is-legal-p): New obsolete alias.
Juanma Barranquero <lekktu@gmail.com>
parents:
87649
diff
changeset
|
1644 |
96031
edf0549afd4a
(calendar-move-hook):Add calendar-update-mode-line as an option.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
1645 ;; These are referenced in the default calendar-date-echo-text. |
82118
baffe86b0c44
(calendar-mode-map): Move initialization into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82086
diff
changeset
|
1646 (define-key map [down-mouse-3] |
baffe86b0c44
(calendar-mode-map): Move initialization into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82086
diff
changeset
|
1647 (easy-menu-binding cal-menu-context-mouse-menu)) |
baffe86b0c44
(calendar-mode-map): Move initialization into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82086
diff
changeset
|
1648 (define-key map [down-mouse-2] |
baffe86b0c44
(calendar-mode-map): Move initialization into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82086
diff
changeset
|
1649 (easy-menu-binding cal-menu-global-mouse-menu)) |
baffe86b0c44
(calendar-mode-map): Move initialization into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82086
diff
changeset
|
1650 |
105141
c9587468d637
(calendar-mode-map): Make mouse-1 and 3 clicks on the scroll-bar
Glenn Morris <rgm@gnu.org>
parents:
104754
diff
changeset
|
1651 ;; Left-click moves us forward in time, right-click backwards. |
c9587468d637
(calendar-mode-map): Make mouse-1 and 3 clicks on the scroll-bar
Glenn Morris <rgm@gnu.org>
parents:
104754
diff
changeset
|
1652 ;; cf scroll-bar.el. |
c9587468d637
(calendar-mode-map): Make mouse-1 and 3 clicks on the scroll-bar
Glenn Morris <rgm@gnu.org>
parents:
104754
diff
changeset
|
1653 (define-key map [vertical-scroll-bar mouse-1] 'calendar-scroll-left) |
c9587468d637
(calendar-mode-map): Make mouse-1 and 3 clicks on the scroll-bar
Glenn Morris <rgm@gnu.org>
parents:
104754
diff
changeset
|
1654 (define-key map [vertical-scroll-bar drag-mouse-1] 'calendar-scroll-left) |
c9587468d637
(calendar-mode-map): Make mouse-1 and 3 clicks on the scroll-bar
Glenn Morris <rgm@gnu.org>
parents:
104754
diff
changeset
|
1655 ;; down-mouse-2 stays as scroll-bar-drag. |
c9587468d637
(calendar-mode-map): Make mouse-1 and 3 clicks on the scroll-bar
Glenn Morris <rgm@gnu.org>
parents:
104754
diff
changeset
|
1656 (define-key map [vertical-scroll-bar mouse-3] 'calendar-scroll-right) |
c9587468d637
(calendar-mode-map): Make mouse-1 and 3 clicks on the scroll-bar
Glenn Morris <rgm@gnu.org>
parents:
104754
diff
changeset
|
1657 (define-key map [vertical-scroll-bar drag-mouse-3] 'calendar-scroll-right) |
c9587468d637
(calendar-mode-map): Make mouse-1 and 3 clicks on the scroll-bar
Glenn Morris <rgm@gnu.org>
parents:
104754
diff
changeset
|
1658 |
92697
001682fd0516
(diary-file, hebrew-holidays-1)
Glenn Morris <rgm@gnu.org>
parents:
92681
diff
changeset
|
1659 map) |
001682fd0516
(diary-file, hebrew-holidays-1)
Glenn Morris <rgm@gnu.org>
parents:
92681
diff
changeset
|
1660 "Keymap for `calendar-mode'.") |
628 | 1661 |
1662 ;; Calendar mode is suitable only for specially formatted data. | |
1663 (put 'calendar-mode 'mode-class 'special) | |
1664 | |
96031
edf0549afd4a
(calendar-move-hook):Add calendar-update-mode-line as an option.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
1665 (defun calendar-mode-line-entry (command echo &optional key string) |
edf0549afd4a
(calendar-move-hook):Add calendar-update-mode-line as an option.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
1666 "Return a propertized string for `calendar-mode-line-format'. |
edf0549afd4a
(calendar-move-hook):Add calendar-update-mode-line as an option.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
1667 COMMAND is a command to run, ECHO is the help-echo text, KEY |
edf0549afd4a
(calendar-move-hook):Add calendar-update-mode-line as an option.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
1668 is COMMAND's keybinding, STRING describes the binding." |
edf0549afd4a
(calendar-move-hook):Add calendar-update-mode-line as an option.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
1669 (propertize (or key |
edf0549afd4a
(calendar-move-hook):Add calendar-update-mode-line as an option.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
1670 (substitute-command-keys |
edf0549afd4a
(calendar-move-hook):Add calendar-update-mode-line as an option.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
1671 (format "\\<calendar-mode-map>\\[%s] %s" command string))) |
edf0549afd4a
(calendar-move-hook):Add calendar-update-mode-line as an option.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
1672 'help-echo (format "mouse-1: %s" echo) |
edf0549afd4a
(calendar-move-hook):Add calendar-update-mode-line as an option.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
1673 'mouse-face 'mode-line-highlight |
edf0549afd4a
(calendar-move-hook):Add calendar-update-mode-line as an option.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
1674 'keymap (make-mode-line-mouse-map 'mouse-1 command))) |
edf0549afd4a
(calendar-move-hook):Add calendar-update-mode-line as an option.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
1675 |
92697
001682fd0516
(diary-file, hebrew-holidays-1)
Glenn Morris <rgm@gnu.org>
parents:
92681
diff
changeset
|
1676 ;; After calendar-mode-map. |
001682fd0516
(diary-file, hebrew-holidays-1)
Glenn Morris <rgm@gnu.org>
parents:
92681
diff
changeset
|
1677 (defcustom calendar-mode-line-format |
957 | 1678 (list |
96031
edf0549afd4a
(calendar-move-hook):Add calendar-update-mode-line as an option.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
1679 (calendar-mode-line-entry 'calendar-scroll-right "previous month" "<") |
957 | 1680 "Calendar" |
31669
ec8ce5820488
(calendar-mode-line-format): Make fields
Dave Love <fx@gnu.org>
parents:
26530
diff
changeset
|
1681 (concat |
96031
edf0549afd4a
(calendar-move-hook):Add calendar-update-mode-line as an option.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
1682 (calendar-mode-line-entry 'calendar-goto-info-node "read Info on Calendar" |
edf0549afd4a
(calendar-move-hook):Add calendar-update-mode-line as an option.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
1683 nil "info") |
74851
4b70fa58f083
(calendar-mode-map): Switch < and >.
Chong Yidong <cyd@stupidchicken.com>
parents:
73518
diff
changeset
|
1684 " / " |
96031
edf0549afd4a
(calendar-move-hook):Add calendar-update-mode-line as an option.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
1685 (calendar-mode-line-entry 'calendar-other-month "choose another month" |
edf0549afd4a
(calendar-move-hook):Add calendar-update-mode-line as an option.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
1686 nil "other") |
74851
4b70fa58f083
(calendar-mode-map): Switch < and >.
Chong Yidong <cyd@stupidchicken.com>
parents:
73518
diff
changeset
|
1687 " / " |
96031
edf0549afd4a
(calendar-move-hook):Add calendar-update-mode-line as an option.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
1688 (calendar-mode-line-entry 'calendar-goto-today "go to today's date" |
edf0549afd4a
(calendar-move-hook):Add calendar-update-mode-line as an option.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
1689 nil "today")) |
957 | 1690 '(calendar-date-string (calendar-current-date) t) |
96031
edf0549afd4a
(calendar-move-hook):Add calendar-update-mode-line as an option.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
1691 (calendar-mode-line-entry 'calendar-scroll-left "next month" ">")) |
44369
72939dbe7b7b
(update-calendar-mode-line): Force mode-line update.
Richard M. Stallman <rms@gnu.org>
parents:
44084
diff
changeset
|
1692 "The mode line of the calendar buffer. |
96031
edf0549afd4a
(calendar-move-hook):Add calendar-update-mode-line as an option.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
1693 This is a list of items that evaluate to strings. The elements |
edf0549afd4a
(calendar-move-hook):Add calendar-update-mode-line as an option.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
1694 are evaluated and concatenated, evenly separated by blanks. |
edf0549afd4a
(calendar-move-hook):Add calendar-update-mode-line as an option.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
1695 During evaluation, the variable `date' is available as the date |
edf0549afd4a
(calendar-move-hook):Add calendar-update-mode-line as an option.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
1696 nearest the cursor (or today's date if that fails). To update |
edf0549afd4a
(calendar-move-hook):Add calendar-update-mode-line as an option.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
1697 the mode-line as the cursor moves, add `calendar-update-mode-line' |
edf0549afd4a
(calendar-move-hook):Add calendar-update-mode-line as an option.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
1698 to `calendar-move-hook'. Here is an example that has the Hebrew date, |
edf0549afd4a
(calendar-move-hook):Add calendar-update-mode-line as an option.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
1699 the day number/days remaining in the year, and the ISO week/year numbers: |
44369
72939dbe7b7b
(update-calendar-mode-line): Force mode-line update.
Richard M. Stallman <rms@gnu.org>
parents:
44084
diff
changeset
|
1700 |
96031
edf0549afd4a
(calendar-move-hook):Add calendar-update-mode-line as an option.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
1701 (list |
edf0549afd4a
(calendar-move-hook):Add calendar-update-mode-line as an option.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
1702 \"\" |
edf0549afd4a
(calendar-move-hook):Add calendar-update-mode-line as an option.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
1703 '(calendar-hebrew-date-string date) |
edf0549afd4a
(calendar-move-hook):Add calendar-update-mode-line as an option.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
1704 '(let* ((year (calendar-extract-year date)) |
edf0549afd4a
(calendar-move-hook):Add calendar-update-mode-line as an option.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
1705 (d (calendar-day-number date)) |
edf0549afd4a
(calendar-move-hook):Add calendar-update-mode-line as an option.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
1706 (days-remaining |
edf0549afd4a
(calendar-move-hook):Add calendar-update-mode-line as an option.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
1707 (- (calendar-day-number (list 12 31 year)) d))) |
edf0549afd4a
(calendar-move-hook):Add calendar-update-mode-line as an option.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
1708 (format \"%d/%d\" d days-remaining)) |
edf0549afd4a
(calendar-move-hook):Add calendar-update-mode-line as an option.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
1709 '(let* ((d (calendar-absolute-from-gregorian date)) |
edf0549afd4a
(calendar-move-hook):Add calendar-update-mode-line as an option.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
1710 (iso-date (calendar-iso-from-absolute d))) |
edf0549afd4a
(calendar-move-hook):Add calendar-update-mode-line as an option.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
1711 (format \"ISO week %d of %d\" |
edf0549afd4a
(calendar-move-hook):Add calendar-update-mode-line as an option.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
1712 (calendar-extract-month iso-date) |
edf0549afd4a
(calendar-move-hook):Add calendar-update-mode-line as an option.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
1713 (calendar-extract-year iso-date))) |
edf0549afd4a
(calendar-move-hook):Add calendar-update-mode-line as an option.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
1714 \"\"))" |
edf0549afd4a
(calendar-move-hook):Add calendar-update-mode-line as an option.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
1715 :risky t |
92697
001682fd0516
(diary-file, hebrew-holidays-1)
Glenn Morris <rgm@gnu.org>
parents:
92681
diff
changeset
|
1716 :type 'sexp |
001682fd0516
(diary-file, hebrew-holidays-1)
Glenn Morris <rgm@gnu.org>
parents:
92681
diff
changeset
|
1717 :group 'calendar) |
47333
79920a7d8018
(mouse-scroll-calendar-left)
Richard M. Stallman <rms@gnu.org>
parents:
44371
diff
changeset
|
1718 |
9709
3ece524b8ea3
Lots of minor fixes and code polishing. Exit-calendar code rewritten.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
9417
diff
changeset
|
1719 (defun calendar-goto-info-node () |
3ece524b8ea3
Lots of minor fixes and code polishing. Exit-calendar code rewritten.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
9417
diff
changeset
|
1720 "Go to the info node for the calendar." |
3ece524b8ea3
Lots of minor fixes and code polishing. Exit-calendar code rewritten.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
9417
diff
changeset
|
1721 (interactive) |
96031
edf0549afd4a
(calendar-move-hook):Add calendar-update-mode-line as an option.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
1722 (info "(emacs)Calendar/Diary") |
edf0549afd4a
(calendar-move-hook):Add calendar-update-mode-line as an option.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
1723 (fit-window-to-buffer)) |
48366
9dad713d153a
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47333
diff
changeset
|
1724 |
92594
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
1725 (defvar calendar-mark-ring nil |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
1726 "Used by `calendar-set-mark'.") |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
1727 |
96031
edf0549afd4a
(calendar-move-hook):Add calendar-update-mode-line as an option.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
1728 (define-derived-mode calendar-mode nil "Calendar" |
957 | 1729 "A major mode for the calendar window. |
96031
edf0549afd4a
(calendar-move-hook):Add calendar-update-mode-line as an option.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
1730 For a complete description, see the info node `Calendar/Diary'. |
628 | 1731 |
9709
3ece524b8ea3
Lots of minor fixes and code polishing. Exit-calendar code rewritten.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
9417
diff
changeset
|
1732 \\<calendar-mode-map>\\{calendar-mode-map}" |
96031
edf0549afd4a
(calendar-move-hook):Add calendar-update-mode-line as an option.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
1733 (setq buffer-read-only t |
93492
2fe1b51b8771
(calendar-mode-map): Use calendar-mark-holidays rather than obsolete alias.
Glenn Morris <rgm@gnu.org>
parents:
93464
diff
changeset
|
1734 buffer-undo-list t |
92594
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
1735 indent-tabs-mode nil) |
93808
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
1736 (calendar-update-mode-line) |
628 | 1737 (make-local-variable 'calendar-mark-ring) |
92697
001682fd0516
(diary-file, hebrew-holidays-1)
Glenn Morris <rgm@gnu.org>
parents:
92681
diff
changeset
|
1738 (make-local-variable 'displayed-month) ; month in middle of window |
001682fd0516
(diary-file, hebrew-holidays-1)
Glenn Morris <rgm@gnu.org>
parents:
92681
diff
changeset
|
1739 (make-local-variable 'displayed-year) ; year in middle of window |
82203
3d0d3af343ac
(calendar-mode): Make sure displayed-(month|year) are set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82151
diff
changeset
|
1740 ;; Most functions only work if displayed-month and displayed-year are set, |
3d0d3af343ac
(calendar-mode): Make sure displayed-(month|year) are set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82151
diff
changeset
|
1741 ;; so let's make sure they're always set. Most likely, this will be reset |
93808
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
1742 ;; soon in calendar-generate, but better safe than sorry. |
82203
3d0d3af343ac
(calendar-mode): Make sure displayed-(month|year) are set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82151
diff
changeset
|
1743 (unless (boundp 'displayed-month) (setq displayed-month 1)) |
3d0d3af343ac
(calendar-mode): Make sure displayed-(month|year) are set.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82151
diff
changeset
|
1744 (unless (boundp 'displayed-year) (setq displayed-year 2001)) |
48366
9dad713d153a
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47333
diff
changeset
|
1745 (set (make-local-variable 'font-lock-defaults) |
96031
edf0549afd4a
(calendar-move-hook):Add calendar-update-mode-line as an option.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
1746 '(calendar-font-lock-keywords t))) |
628 | 1747 |
957 | 1748 (defun calendar-string-spread (strings char length) |
12061
017af11017a0
Fixed calendar-string-spread to allow 0 or 1 string; this simplified several
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
10459
diff
changeset
|
1749 "Concatenate list of STRINGS separated with copies of CHAR to fill LENGTH. |
017af11017a0
Fixed calendar-string-spread to allow 0 or 1 string; this simplified several
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
10459
diff
changeset
|
1750 The effect is like mapconcat but the separating pieces are as balanced as |
017af11017a0
Fixed calendar-string-spread to allow 0 or 1 string; this simplified several
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
10459
diff
changeset
|
1751 possible. Each item of STRINGS is evaluated before concatenation so it can |
017af11017a0
Fixed calendar-string-spread to allow 0 or 1 string; this simplified several
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
10459
diff
changeset
|
1752 actually be an expression that evaluates to a string. If LENGTH is too short, |
017af11017a0
Fixed calendar-string-spread to allow 0 or 1 string; this simplified several
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
10459
diff
changeset
|
1753 the STRINGS are just concatenated and the result truncated." |
957 | 1754 ;; The algorithm is based on equation (3.25) on page 85 of Concrete |
1755 ;; Mathematics by Ronald L. Graham, Donald E. Knuth, and Oren Patashnik, | |
92697
001682fd0516
(diary-file, hebrew-holidays-1)
Glenn Morris <rgm@gnu.org>
parents:
92681
diff
changeset
|
1756 ;; Addison-Wesley, Reading, MA, 1989. |
12061
017af11017a0
Fixed calendar-string-spread to allow 0 or 1 string; this simplified several
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
10459
diff
changeset
|
1757 (let* ((strings (mapcar 'eval |
017af11017a0
Fixed calendar-string-spread to allow 0 or 1 string; this simplified several
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
10459
diff
changeset
|
1758 (if (< (length strings) 2) |
017af11017a0
Fixed calendar-string-spread to allow 0 or 1 string; this simplified several
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
10459
diff
changeset
|
1759 (append (list "") strings (list "")) |
017af11017a0
Fixed calendar-string-spread to allow 0 or 1 string; this simplified several
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
10459
diff
changeset
|
1760 strings))) |
957 | 1761 (n (- length (length (apply 'concat strings)))) |
1762 (m (1- (length strings))) | |
1763 (s (car strings)) | |
1764 (strings (cdr strings)) | |
1765 (i 0)) | |
68366
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
1766 (dolist (string strings) |
957 | 1767 (setq s (concat s |
1768 (make-string (max 0 (/ (+ n i) m)) char) | |
92988 | 1769 string) |
1770 i (1+ i))) | |
957 | 1771 (substring s 0 length))) |
1772 | |
93808
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
1773 (defun calendar-update-mode-line () |
628 | 1774 "Update the calendar mode line with the current date and date style." |
1775 (if (bufferp (get-buffer calendar-buffer)) | |
65477
a08c0922f1c4
(calendar-for-loop): Add edebug info.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64826
diff
changeset
|
1776 (with-current-buffer calendar-buffer |
96158
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
1777 (let ((start (- calendar-left-margin 2)) |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
1778 (date (condition-case nil |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
1779 (calendar-cursor-to-nearest-date) |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
1780 (error (calendar-current-date))))) |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
1781 (setq mode-line-format |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
1782 (concat (make-string (max 0 (+ start |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
1783 (- (car (window-inside-edges)) |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
1784 (car (window-edges))))) ?\s) |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
1785 (calendar-string-spread |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
1786 (mapcar 'eval calendar-mode-line-format) |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
1787 ?\s (- calendar-right-margin (1- start)))))) |
44369
72939dbe7b7b
(update-calendar-mode-line): Force mode-line update.
Richard M. Stallman <rms@gnu.org>
parents:
44084
diff
changeset
|
1788 (force-mode-line-update)))) |
628 | 1789 |
9709
3ece524b8ea3
Lots of minor fixes and code polishing. Exit-calendar code rewritten.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
9417
diff
changeset
|
1790 (defun calendar-window-list () |
3ece524b8ea3
Lots of minor fixes and code polishing. Exit-calendar code rewritten.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
9417
diff
changeset
|
1791 "List of all calendar-related windows." |
3ece524b8ea3
Lots of minor fixes and code polishing. Exit-calendar code rewritten.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
9417
diff
changeset
|
1792 (let ((calendar-buffers (calendar-buffer-list)) |
3ece524b8ea3
Lots of minor fixes and code polishing. Exit-calendar code rewritten.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
9417
diff
changeset
|
1793 list) |
101938
0c901689da73
(calendar-window-list): Ignore invisible windows.
Glenn Morris <rgm@gnu.org>
parents:
101910
diff
changeset
|
1794 ;; Using 0 rather than t for last argument - see bug#2199. |
0c901689da73
(calendar-window-list): Ignore invisible windows.
Glenn Morris <rgm@gnu.org>
parents:
101910
diff
changeset
|
1795 ;; This is only used with calendar-hide-window, which ignores |
0c901689da73
(calendar-window-list): Ignore invisible windows.
Glenn Morris <rgm@gnu.org>
parents:
101910
diff
changeset
|
1796 ;; iconified frames anyway, so could use 'visible rather than 0. |
31669
ec8ce5820488
(calendar-mode-line-format): Make fields
Dave Love <fx@gnu.org>
parents:
26530
diff
changeset
|
1797 (walk-windows (lambda (w) |
92858 | 1798 (if (memq (window-buffer w) calendar-buffers) |
1799 (push w list))) | |
101938
0c901689da73
(calendar-window-list): Ignore invisible windows.
Glenn Morris <rgm@gnu.org>
parents:
101910
diff
changeset
|
1800 nil 0) |
9709
3ece524b8ea3
Lots of minor fixes and code polishing. Exit-calendar code rewritten.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
9417
diff
changeset
|
1801 list)) |
3ece524b8ea3
Lots of minor fixes and code polishing. Exit-calendar code rewritten.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
9417
diff
changeset
|
1802 |
3ece524b8ea3
Lots of minor fixes and code polishing. Exit-calendar code rewritten.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
9417
diff
changeset
|
1803 (defun calendar-buffer-list () |
92895 | 1804 "List of all calendar-related buffers (as buffers, not strings)." |
92823
8fb3c7b3e53a
(cal-hebrew-yahrzeit-buffer): New constant.
Glenn Morris <rgm@gnu.org>
parents:
92716
diff
changeset
|
1805 (let (buffs) |
93808
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
1806 (dolist (b (list calendar-hebrew-yahrzeit-buffer lunar-phases-buffer |
96346
775f65dc9776
(solar-sunrises-buffer): New constant.
Glenn Morris <rgm@gnu.org>
parents:
96315
diff
changeset
|
1807 holiday-buffer diary-fancy-buffer solar-sunrises-buffer |
92823
8fb3c7b3e53a
(cal-hebrew-yahrzeit-buffer): New constant.
Glenn Morris <rgm@gnu.org>
parents:
92716
diff
changeset
|
1808 (get-file-buffer diary-file) |
93808
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
1809 calendar-buffer calendar-other-calendars-buffer)) |
92895 | 1810 (and b (setq b (get-buffer b)) |
92823
8fb3c7b3e53a
(cal-hebrew-yahrzeit-buffer): New constant.
Glenn Morris <rgm@gnu.org>
parents:
92716
diff
changeset
|
1811 (push b buffs))) |
8fb3c7b3e53a
(cal-hebrew-yahrzeit-buffer): New constant.
Glenn Morris <rgm@gnu.org>
parents:
92716
diff
changeset
|
1812 buffs)) |
9709
3ece524b8ea3
Lots of minor fixes and code polishing. Exit-calendar code rewritten.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
9417
diff
changeset
|
1813 |
93808
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
1814 (defun calendar-exit () |
9709
3ece524b8ea3
Lots of minor fixes and code polishing. Exit-calendar code rewritten.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
9417
diff
changeset
|
1815 "Get out of the calendar window and hide it and related buffers." |
628 | 1816 (interactive) |
92969
bb4fc128d00d
(european-calendar-style, calendar-for-loop)
Glenn Morris <rgm@gnu.org>
parents:
92930
diff
changeset
|
1817 (let ((diary-buffer (get-file-buffer diary-file))) |
22028
639be14b80ef
On exiting, don't signal error when user changes mind.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
22027
diff
changeset
|
1818 (if (or (not diary-buffer) |
639be14b80ef
On exiting, don't signal error when user changes mind.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
22027
diff
changeset
|
1819 (not (buffer-modified-p diary-buffer)) |
639be14b80ef
On exiting, don't signal error when user changes mind.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
22027
diff
changeset
|
1820 (yes-or-no-p |
639be14b80ef
On exiting, don't signal error when user changes mind.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
22027
diff
changeset
|
1821 "Diary modified; do you really want to exit the calendar? ")) |
92602
020d7b75c13a
(calendar-insert-indented): Doc fix. Use when rather than if.
Glenn Morris <rgm@gnu.org>
parents:
92594
diff
changeset
|
1822 ;; Need to do this multiple times because one time can replace some |
92697
001682fd0516
(diary-file, hebrew-holidays-1)
Glenn Morris <rgm@gnu.org>
parents:
92681
diff
changeset
|
1823 ;; calendar-related buffers with other calendar-related buffers. |
92602
020d7b75c13a
(calendar-insert-indented): Doc fix. Use when rather than if.
Glenn Morris <rgm@gnu.org>
parents:
92594
diff
changeset
|
1824 (mapc (lambda (x) |
020d7b75c13a
(calendar-insert-indented): Doc fix. Use when rather than if.
Glenn Morris <rgm@gnu.org>
parents:
92594
diff
changeset
|
1825 (mapc 'calendar-hide-window (calendar-window-list))) |
9709
3ece524b8ea3
Lots of minor fixes and code polishing. Exit-calendar code rewritten.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
9417
diff
changeset
|
1826 (calendar-window-list))))) |
3ece524b8ea3
Lots of minor fixes and code polishing. Exit-calendar code rewritten.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
9417
diff
changeset
|
1827 |
93808
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
1828 (define-obsolete-function-alias 'exit-calendar 'calendar-exit "23.1") |
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
1829 |
9709
3ece524b8ea3
Lots of minor fixes and code polishing. Exit-calendar code rewritten.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
9417
diff
changeset
|
1830 (defun calendar-hide-window (window) |
3ece524b8ea3
Lots of minor fixes and code polishing. Exit-calendar code rewritten.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
9417
diff
changeset
|
1831 "Hide WINDOW if it is calendar-related." |
3ece524b8ea3
Lots of minor fixes and code polishing. Exit-calendar code rewritten.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
9417
diff
changeset
|
1832 (let ((buffer (if (window-live-p window) (window-buffer window)))) |
3ece524b8ea3
Lots of minor fixes and code polishing. Exit-calendar code rewritten.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
9417
diff
changeset
|
1833 (if (memq buffer (calendar-buffer-list)) |
3ece524b8ea3
Lots of minor fixes and code polishing. Exit-calendar code rewritten.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
9417
diff
changeset
|
1834 (cond |
37430
a0e805e3a7f1
(diary-entry-marker, calendar-today-marker, calendar-holiday-marker): Use
Eli Zaretskii <eliz@gnu.org>
parents:
37001
diff
changeset
|
1835 ((and (display-multi-frame-p) |
9709
3ece524b8ea3
Lots of minor fixes and code polishing. Exit-calendar code rewritten.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
9417
diff
changeset
|
1836 (eq 'icon (cdr (assoc 'visibility |
3ece524b8ea3
Lots of minor fixes and code polishing. Exit-calendar code rewritten.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
9417
diff
changeset
|
1837 (frame-parameters |
3ece524b8ea3
Lots of minor fixes and code polishing. Exit-calendar code rewritten.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
9417
diff
changeset
|
1838 (window-frame window)))))) |
3ece524b8ea3
Lots of minor fixes and code polishing. Exit-calendar code rewritten.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
9417
diff
changeset
|
1839 nil) |
37430
a0e805e3a7f1
(diary-entry-marker, calendar-today-marker, calendar-holiday-marker): Use
Eli Zaretskii <eliz@gnu.org>
parents:
37001
diff
changeset
|
1840 ((and (display-multi-frame-p) (window-dedicated-p window)) |
26427
3b6cf16f3633
* calendar/calendar.el (calendar-remove-frame-by-deleting):
Sam Steingold <sds@gnu.org>
parents:
26329
diff
changeset
|
1841 (if calendar-remove-frame-by-deleting |
3b6cf16f3633
* calendar/calendar.el (calendar-remove-frame-by-deleting):
Sam Steingold <sds@gnu.org>
parents:
26329
diff
changeset
|
1842 (delete-frame (window-frame window)) |
3b6cf16f3633
* calendar/calendar.el (calendar-remove-frame-by-deleting):
Sam Steingold <sds@gnu.org>
parents:
26329
diff
changeset
|
1843 (iconify-frame (window-frame window)))) |
9709
3ece524b8ea3
Lots of minor fixes and code polishing. Exit-calendar code rewritten.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
9417
diff
changeset
|
1844 ((not (and (select-window window) (one-window-p window))) |
3ece524b8ea3
Lots of minor fixes and code polishing. Exit-calendar code rewritten.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
9417
diff
changeset
|
1845 (delete-window window)) |
3ece524b8ea3
Lots of minor fixes and code polishing. Exit-calendar code rewritten.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
9417
diff
changeset
|
1846 (t (set-buffer buffer) |
3ece524b8ea3
Lots of minor fixes and code polishing. Exit-calendar code rewritten.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
9417
diff
changeset
|
1847 (bury-buffer)))))) |
628 | 1848 |
103770
564ef05eedbc
Ed Reingold <reingold at emr.cs.iit.edu>
Glenn Morris <rgm@gnu.org>
parents:
102354
diff
changeset
|
1849 (defun calendar-current-date (&optional offset) |
564ef05eedbc
Ed Reingold <reingold at emr.cs.iit.edu>
Glenn Morris <rgm@gnu.org>
parents:
102354
diff
changeset
|
1850 "Return the current date in a list (month day year). |
103771
06bd6035d548
(calendar-current-date): Rework previous change.
Glenn Morris <rgm@gnu.org>
parents:
103770
diff
changeset
|
1851 Optional integer OFFSET is a number of days from the current date." |
06bd6035d548
(calendar-current-date): Rework previous change.
Glenn Morris <rgm@gnu.org>
parents:
103770
diff
changeset
|
1852 (let* ((now (decode-time)) |
06bd6035d548
(calendar-current-date): Rework previous change.
Glenn Morris <rgm@gnu.org>
parents:
103770
diff
changeset
|
1853 (now (list (nth 4 now) (nth 3 now) (nth 5 now)))) |
06bd6035d548
(calendar-current-date): Rework previous change.
Glenn Morris <rgm@gnu.org>
parents:
103770
diff
changeset
|
1854 (if (zerop (or offset 0)) |
06bd6035d548
(calendar-current-date): Rework previous change.
Glenn Morris <rgm@gnu.org>
parents:
103770
diff
changeset
|
1855 now |
06bd6035d548
(calendar-current-date): Rework previous change.
Glenn Morris <rgm@gnu.org>
parents:
103770
diff
changeset
|
1856 (calendar-gregorian-from-absolute |
06bd6035d548
(calendar-current-date): Rework previous change.
Glenn Morris <rgm@gnu.org>
parents:
103770
diff
changeset
|
1857 (+ offset (calendar-absolute-from-gregorian now)))))) |
628 | 1858 |
96295
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
1859 (defun calendar-column-to-segment () |
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
1860 "Convert current column to calendar month \"segment\". |
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
1861 The left-most month returns 0, the next right 1, and so on." |
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
1862 (let ((col (max 0 (+ (current-column) |
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
1863 (/ calendar-intermonth-spacing 2) |
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
1864 (- calendar-left-margin))))) |
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
1865 (/ col (+ (* 7 calendar-column-width) calendar-intermonth-spacing)))) |
96158
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
1866 |
96047
65c4c935e492
* calendar/calendar.el (calendar-cursor-to-date): Add argument `event'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
96031
diff
changeset
|
1867 (defun calendar-cursor-to-date (&optional error event) |
31730
719a230f8091
Docstring fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31671
diff
changeset
|
1868 "Return a list (month day year) of current cursor position. |
5829
d266967cc1cc
(calendar-mode-line-format): Change "current" to "today".
Richard M. Stallman <rms@gnu.org>
parents:
5771
diff
changeset
|
1869 If cursor is not on a specific date, signals an error if optional parameter |
96047
65c4c935e492
* calendar/calendar.el (calendar-cursor-to-date): Add argument `event'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
96031
diff
changeset
|
1870 ERROR is non-nil, otherwise just returns nil. |
65c4c935e492
* calendar/calendar.el (calendar-cursor-to-date): Add argument `event'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
96031
diff
changeset
|
1871 If EVENT is non-nil, it's an event indicating the buffer position to |
65c4c935e492
* calendar/calendar.el (calendar-cursor-to-date): Add argument `event'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
96031
diff
changeset
|
1872 use instead of point." |
65c4c935e492
* calendar/calendar.el (calendar-cursor-to-date): Add argument `event'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
96031
diff
changeset
|
1873 (with-current-buffer |
65c4c935e492
* calendar/calendar.el (calendar-cursor-to-date): Add argument `event'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
96031
diff
changeset
|
1874 (if event (window-buffer (posn-window (event-start event))) |
65c4c935e492
* calendar/calendar.el (calendar-cursor-to-date): Add argument `event'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
96031
diff
changeset
|
1875 (current-buffer)) |
65c4c935e492
* calendar/calendar.el (calendar-cursor-to-date): Add argument `event'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
96031
diff
changeset
|
1876 (save-excursion |
96315
3046fb222514
(calendar-cursor-to-date): Handle case where event-start is nil.
Glenn Morris <rgm@gnu.org>
parents:
96313
diff
changeset
|
1877 (and event (setq event (event-start event)) |
3046fb222514
(calendar-cursor-to-date): Handle case where event-start is nil.
Glenn Morris <rgm@gnu.org>
parents:
96313
diff
changeset
|
1878 (goto-char (posn-point event))) |
96295
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
1879 (let* ((segment (calendar-column-to-segment)) |
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
1880 (month (% (+ displayed-month (1- segment)) 12))) |
96158
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
1881 ;; Call with point on either of the two digits in a 2-digit date, |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
1882 ;; or on or before the digit of a 1-digit date. |
96047
65c4c935e492
* calendar/calendar.el (calendar-cursor-to-date): Add argument `event'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
96031
diff
changeset
|
1883 (if (not (and (looking-at "[ 0-9]?[0-9][^0-9]") |
96295
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
1884 (get-text-property (point) 'date))) |
96047
65c4c935e492
* calendar/calendar.el (calendar-cursor-to-date): Add argument `event'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
96031
diff
changeset
|
1885 (if error (error "Not on a date!")) |
96295
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
1886 ;; Convert segment to real month and year. |
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
1887 (if (zerop month) (setq month 12)) |
96158
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
1888 ;; Go back to before the first date digit. |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
1889 (or (looking-at " ") |
82118
baffe86b0c44
(calendar-mode-map): Move initialization into declaration.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82086
diff
changeset
|
1890 (re-search-backward "[^0-9]")) |
6037
324bb3410cfb
Fix calendar-cursor-to-date to handle starred days correctly.
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
6025
diff
changeset
|
1891 (list month |
96158
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
1892 (string-to-number |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
1893 (buffer-substring (1+ (point)) |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
1894 (+ 1 calendar-day-digit-width (point)))) |
96295
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
1895 (cond |
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
1896 ((and (= 12 month) (zerop segment)) (1- displayed-year)) |
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
1897 ((and (= 1 month) (= segment 2)) (1+ displayed-year)) |
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
1898 (t displayed-year)))))))) |
628 | 1899 |
65477
a08c0922f1c4
(calendar-for-loop): Add edebug info.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64826
diff
changeset
|
1900 (add-to-list 'debug-ignored-errors "Not on a date!") |
a08c0922f1c4
(calendar-for-loop): Add edebug info.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64826
diff
changeset
|
1901 |
3865
2c6883d0a1b2
* calendar.el (calendar-version): Update to 5.1. Fixed a variety
Jim Blandy <jimb@redhat.com>
parents:
3778
diff
changeset
|
1902 ;; The following version of calendar-gregorian-from-absolute is preferred for |
2c6883d0a1b2
* calendar.el (calendar-version): Update to 5.1. Fixed a variety
Jim Blandy <jimb@redhat.com>
parents:
3778
diff
changeset
|
1903 ;; reasons of clarity, BUT it's much slower than the version that follows it. |
2c6883d0a1b2
* calendar.el (calendar-version): Update to 5.1. Fixed a variety
Jim Blandy <jimb@redhat.com>
parents:
3778
diff
changeset
|
1904 |
2c6883d0a1b2
* calendar.el (calendar-version): Update to 5.1. Fixed a variety
Jim Blandy <jimb@redhat.com>
parents:
3778
diff
changeset
|
1905 ;;(defun calendar-gregorian-from-absolute (date) |
2c6883d0a1b2
* calendar.el (calendar-version): Update to 5.1. Fixed a variety
Jim Blandy <jimb@redhat.com>
parents:
3778
diff
changeset
|
1906 ;; "Compute the list (month day year) corresponding to the absolute DATE. |
2c6883d0a1b2
* calendar.el (calendar-version): Update to 5.1. Fixed a variety
Jim Blandy <jimb@redhat.com>
parents:
3778
diff
changeset
|
1907 ;;The absolute date is the number of days elapsed since the (imaginary) |
2c6883d0a1b2
* calendar.el (calendar-version): Update to 5.1. Fixed a variety
Jim Blandy <jimb@redhat.com>
parents:
3778
diff
changeset
|
1908 ;;Gregorian date Sunday, December 31, 1 BC." |
92697
001682fd0516
(diary-file, hebrew-holidays-1)
Glenn Morris <rgm@gnu.org>
parents:
92681
diff
changeset
|
1909 ;; (let* ((approx (/ date 366)) ; approximation from below |
001682fd0516
(diary-file, hebrew-holidays-1)
Glenn Morris <rgm@gnu.org>
parents:
92681
diff
changeset
|
1910 ;; (year ; search forward from the approximation |
3865
2c6883d0a1b2
* calendar.el (calendar-version): Update to 5.1. Fixed a variety
Jim Blandy <jimb@redhat.com>
parents:
3778
diff
changeset
|
1911 ;; (+ approx |
2c6883d0a1b2
* calendar.el (calendar-version): Update to 5.1. Fixed a variety
Jim Blandy <jimb@redhat.com>
parents:
3778
diff
changeset
|
1912 ;; (calendar-sum y approx |
2c6883d0a1b2
* calendar.el (calendar-version): Update to 5.1. Fixed a variety
Jim Blandy <jimb@redhat.com>
parents:
3778
diff
changeset
|
1913 ;; (>= date (calendar-absolute-from-gregorian (list 1 1 (1+ y)))) |
2c6883d0a1b2
* calendar.el (calendar-version): Update to 5.1. Fixed a variety
Jim Blandy <jimb@redhat.com>
parents:
3778
diff
changeset
|
1914 ;; 1))) |
92697
001682fd0516
(diary-file, hebrew-holidays-1)
Glenn Morris <rgm@gnu.org>
parents:
92681
diff
changeset
|
1915 ;; (month ; search forward from January |
3865
2c6883d0a1b2
* calendar.el (calendar-version): Update to 5.1. Fixed a variety
Jim Blandy <jimb@redhat.com>
parents:
3778
diff
changeset
|
1916 ;; (1+ (calendar-sum m 1 |
2c6883d0a1b2
* calendar.el (calendar-version): Update to 5.1. Fixed a variety
Jim Blandy <jimb@redhat.com>
parents:
3778
diff
changeset
|
1917 ;; (> date |
2c6883d0a1b2
* calendar.el (calendar-version): Update to 5.1. Fixed a variety
Jim Blandy <jimb@redhat.com>
parents:
3778
diff
changeset
|
1918 ;; (calendar-absolute-from-gregorian |
2c6883d0a1b2
* calendar.el (calendar-version): Update to 5.1. Fixed a variety
Jim Blandy <jimb@redhat.com>
parents:
3778
diff
changeset
|
1919 ;; (list m (calendar-last-day-of-month m year) year))) |
2c6883d0a1b2
* calendar.el (calendar-version): Update to 5.1. Fixed a variety
Jim Blandy <jimb@redhat.com>
parents:
3778
diff
changeset
|
1920 ;; 1))) |
92697
001682fd0516
(diary-file, hebrew-holidays-1)
Glenn Morris <rgm@gnu.org>
parents:
92681
diff
changeset
|
1921 ;; (day ; calculate the day by subtraction |
3865
2c6883d0a1b2
* calendar.el (calendar-version): Update to 5.1. Fixed a variety
Jim Blandy <jimb@redhat.com>
parents:
3778
diff
changeset
|
1922 ;; (- date |
2c6883d0a1b2
* calendar.el (calendar-version): Update to 5.1. Fixed a variety
Jim Blandy <jimb@redhat.com>
parents:
3778
diff
changeset
|
1923 ;; (1- (calendar-absolute-from-gregorian (list month 1 year)))))) |
2c6883d0a1b2
* calendar.el (calendar-version): Update to 5.1. Fixed a variety
Jim Blandy <jimb@redhat.com>
parents:
3778
diff
changeset
|
1924 ;; (list month day year))) |
2c6883d0a1b2
* calendar.el (calendar-version): Update to 5.1. Fixed a variety
Jim Blandy <jimb@redhat.com>
parents:
3778
diff
changeset
|
1925 |
628 | 1926 (defun calendar-gregorian-from-absolute (date) |
1927 "Compute the list (month day year) corresponding to the absolute DATE. | |
1928 The absolute date is the number of days elapsed since the (imaginary) | |
52723
f33d2cba6bb7
(increment-calendar-month, calendar-leap-year-p)
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
1929 Gregorian date Sunday, December 31, 1 BC. This function does not |
f33d2cba6bb7
(increment-calendar-month, calendar-leap-year-p)
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
1930 handle dates in years BC." |
92697
001682fd0516
(diary-file, hebrew-holidays-1)
Glenn Morris <rgm@gnu.org>
parents:
92681
diff
changeset
|
1931 ;; See the footnote on page 384 of ``Calendrical Calculations, Part II: |
001682fd0516
(diary-file, hebrew-holidays-1)
Glenn Morris <rgm@gnu.org>
parents:
92681
diff
changeset
|
1932 ;; Three Historical Calendars'' by E. M. Reingold, N. Dershowitz, and S. M. |
001682fd0516
(diary-file, hebrew-holidays-1)
Glenn Morris <rgm@gnu.org>
parents:
92681
diff
changeset
|
1933 ;; Clamen, Software--Practice and Experience, Volume 23, Number 4 |
001682fd0516
(diary-file, hebrew-holidays-1)
Glenn Morris <rgm@gnu.org>
parents:
92681
diff
changeset
|
1934 ;; (April, 1993), pages 383-404 for an explanation. |
3865
2c6883d0a1b2
* calendar.el (calendar-version): Update to 5.1. Fixed a variety
Jim Blandy <jimb@redhat.com>
parents:
3778
diff
changeset
|
1935 (let* ((d0 (1- date)) |
2c6883d0a1b2
* calendar.el (calendar-version): Update to 5.1. Fixed a variety
Jim Blandy <jimb@redhat.com>
parents:
3778
diff
changeset
|
1936 (n400 (/ d0 146097)) |
2c6883d0a1b2
* calendar.el (calendar-version): Update to 5.1. Fixed a variety
Jim Blandy <jimb@redhat.com>
parents:
3778
diff
changeset
|
1937 (d1 (% d0 146097)) |
2c6883d0a1b2
* calendar.el (calendar-version): Update to 5.1. Fixed a variety
Jim Blandy <jimb@redhat.com>
parents:
3778
diff
changeset
|
1938 (n100 (/ d1 36524)) |
2c6883d0a1b2
* calendar.el (calendar-version): Update to 5.1. Fixed a variety
Jim Blandy <jimb@redhat.com>
parents:
3778
diff
changeset
|
1939 (d2 (% d1 36524)) |
2c6883d0a1b2
* calendar.el (calendar-version): Update to 5.1. Fixed a variety
Jim Blandy <jimb@redhat.com>
parents:
3778
diff
changeset
|
1940 (n4 (/ d2 1461)) |
2c6883d0a1b2
* calendar.el (calendar-version): Update to 5.1. Fixed a variety
Jim Blandy <jimb@redhat.com>
parents:
3778
diff
changeset
|
1941 (d3 (% d2 1461)) |
2c6883d0a1b2
* calendar.el (calendar-version): Update to 5.1. Fixed a variety
Jim Blandy <jimb@redhat.com>
parents:
3778
diff
changeset
|
1942 (n1 (/ d3 365)) |
2c6883d0a1b2
* calendar.el (calendar-version): Update to 5.1. Fixed a variety
Jim Blandy <jimb@redhat.com>
parents:
3778
diff
changeset
|
1943 (day (1+ (% d3 365))) |
93528
6fb229e96593
(diary-entry-marker, calendar-today-marker, calendar-holiday-marker)
Glenn Morris <rgm@gnu.org>
parents:
93510
diff
changeset
|
1944 (year (+ (* 400 n400) (* 100 n100) (* n4 4) n1)) |
6fb229e96593
(diary-entry-marker, calendar-today-marker, calendar-holiday-marker)
Glenn Morris <rgm@gnu.org>
parents:
93510
diff
changeset
|
1945 (month 1) |
6fb229e96593
(diary-entry-marker, calendar-today-marker, calendar-holiday-marker)
Glenn Morris <rgm@gnu.org>
parents:
93510
diff
changeset
|
1946 mdays) |
3865
2c6883d0a1b2
* calendar.el (calendar-version): Update to 5.1. Fixed a variety
Jim Blandy <jimb@redhat.com>
parents:
3778
diff
changeset
|
1947 (if (or (= n100 4) (= n1 4)) |
2c6883d0a1b2
* calendar.el (calendar-version): Update to 5.1. Fixed a variety
Jim Blandy <jimb@redhat.com>
parents:
3778
diff
changeset
|
1948 (list 12 31 year) |
93528
6fb229e96593
(diary-entry-marker, calendar-today-marker, calendar-holiday-marker)
Glenn Morris <rgm@gnu.org>
parents:
93510
diff
changeset
|
1949 (setq year (1+ year)) |
6fb229e96593
(diary-entry-marker, calendar-today-marker, calendar-holiday-marker)
Glenn Morris <rgm@gnu.org>
parents:
93510
diff
changeset
|
1950 (while (< (setq mdays (calendar-last-day-of-month month year)) day) |
6fb229e96593
(diary-entry-marker, calendar-today-marker, calendar-holiday-marker)
Glenn Morris <rgm@gnu.org>
parents:
93510
diff
changeset
|
1951 (setq day (- day mdays) |
6fb229e96593
(diary-entry-marker, calendar-today-marker, calendar-holiday-marker)
Glenn Morris <rgm@gnu.org>
parents:
93510
diff
changeset
|
1952 month (1+ month))) |
6fb229e96593
(diary-entry-marker, calendar-today-marker, calendar-holiday-marker)
Glenn Morris <rgm@gnu.org>
parents:
93510
diff
changeset
|
1953 (list month day year)))) |
628 | 1954 |
96031
edf0549afd4a
(calendar-move-hook):Add calendar-update-mode-line as an option.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
1955 (defun calendar-other-month (month year &optional event) |
edf0549afd4a
(calendar-move-hook):Add calendar-update-mode-line as an option.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
1956 "Display a three-month calendar centered around MONTH and YEAR. |
edf0549afd4a
(calendar-move-hook):Add calendar-update-mode-line as an option.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
1957 EVENT is an event like `last-nonmenu-event'." |
edf0549afd4a
(calendar-move-hook):Add calendar-update-mode-line as an option.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
1958 (interactive (let ((event (list last-nonmenu-event))) |
edf0549afd4a
(calendar-move-hook):Add calendar-update-mode-line as an option.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
1959 (append (calendar-read-date 'noday) event))) |
edf0549afd4a
(calendar-move-hook):Add calendar-update-mode-line as an option.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
1960 (save-selected-window |
edf0549afd4a
(calendar-move-hook):Add calendar-update-mode-line as an option.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
1961 (and event |
edf0549afd4a
(calendar-move-hook):Add calendar-update-mode-line as an option.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
1962 (setq event (event-start event)) |
edf0549afd4a
(calendar-move-hook):Add calendar-update-mode-line as an option.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
1963 (select-window (posn-window event))) |
edf0549afd4a
(calendar-move-hook):Add calendar-update-mode-line as an option.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
1964 (unless (and (= month displayed-month) |
edf0549afd4a
(calendar-move-hook):Add calendar-update-mode-line as an option.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
1965 (= year displayed-year)) |
edf0549afd4a
(calendar-move-hook):Add calendar-update-mode-line as an option.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
1966 (let ((old-date (calendar-cursor-to-date)) |
edf0549afd4a
(calendar-move-hook):Add calendar-update-mode-line as an option.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
1967 (today (calendar-current-date))) |
edf0549afd4a
(calendar-move-hook):Add calendar-update-mode-line as an option.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
1968 (calendar-generate-window month year) |
edf0549afd4a
(calendar-move-hook):Add calendar-update-mode-line as an option.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
1969 (calendar-cursor-to-visible-date |
edf0549afd4a
(calendar-move-hook):Add calendar-update-mode-line as an option.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
1970 (cond |
edf0549afd4a
(calendar-move-hook):Add calendar-update-mode-line as an option.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
1971 ((calendar-date-is-visible-p old-date) old-date) |
edf0549afd4a
(calendar-move-hook):Add calendar-update-mode-line as an option.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
1972 ((calendar-date-is-visible-p today) today) |
edf0549afd4a
(calendar-move-hook):Add calendar-update-mode-line as an option.
Glenn Morris <rgm@gnu.org>
parents:
94653
diff
changeset
|
1973 (t (list month 1 year)))))))) |
628 | 1974 |
96047
65c4c935e492
* calendar/calendar.el (calendar-cursor-to-date): Add argument `event'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
96031
diff
changeset
|
1975 (defun calendar-set-mark (arg &optional event) |
628 | 1976 "Mark the date under the cursor, or jump to marked date. |
1977 With no prefix argument, push current date onto marked date ring. | |
92697
001682fd0516
(diary-file, hebrew-holidays-1)
Glenn Morris <rgm@gnu.org>
parents:
92681
diff
changeset
|
1978 With argument ARG, jump to mark, pop it, and put point at end of ring." |
96047
65c4c935e492
* calendar/calendar.el (calendar-cursor-to-date): Add argument `event'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
96031
diff
changeset
|
1979 (interactive |
65c4c935e492
* calendar/calendar.el (calendar-cursor-to-date): Add argument `event'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
96031
diff
changeset
|
1980 (list current-prefix-arg last-nonmenu-event)) |
65c4c935e492
* calendar/calendar.el (calendar-cursor-to-date): Add argument `event'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
96031
diff
changeset
|
1981 (let ((date (calendar-cursor-to-date t event))) |
92969
bb4fc128d00d
(european-calendar-style, calendar-for-loop)
Glenn Morris <rgm@gnu.org>
parents:
92930
diff
changeset
|
1982 (if arg |
bb4fc128d00d
(european-calendar-style, calendar-for-loop)
Glenn Morris <rgm@gnu.org>
parents:
92930
diff
changeset
|
1983 (if (null calendar-mark-ring) |
bb4fc128d00d
(european-calendar-style, calendar-for-loop)
Glenn Morris <rgm@gnu.org>
parents:
92930
diff
changeset
|
1984 (error "No mark set in this buffer") |
bb4fc128d00d
(european-calendar-style, calendar-for-loop)
Glenn Morris <rgm@gnu.org>
parents:
92930
diff
changeset
|
1985 (calendar-goto-date (car calendar-mark-ring)) |
bb4fc128d00d
(european-calendar-style, calendar-for-loop)
Glenn Morris <rgm@gnu.org>
parents:
92930
diff
changeset
|
1986 (setq calendar-mark-ring |
bb4fc128d00d
(european-calendar-style, calendar-for-loop)
Glenn Morris <rgm@gnu.org>
parents:
92930
diff
changeset
|
1987 (cdr (nconc calendar-mark-ring (list date))))) |
bb4fc128d00d
(european-calendar-style, calendar-for-loop)
Glenn Morris <rgm@gnu.org>
parents:
92930
diff
changeset
|
1988 (push date calendar-mark-ring) |
bb4fc128d00d
(european-calendar-style, calendar-for-loop)
Glenn Morris <rgm@gnu.org>
parents:
92930
diff
changeset
|
1989 ;; Since the top of the mark ring is the marked date in the |
bb4fc128d00d
(european-calendar-style, calendar-for-loop)
Glenn Morris <rgm@gnu.org>
parents:
92930
diff
changeset
|
1990 ;; calendar, the mark ring in the calendar is one longer than |
bb4fc128d00d
(european-calendar-style, calendar-for-loop)
Glenn Morris <rgm@gnu.org>
parents:
92930
diff
changeset
|
1991 ;; in other buffers to get the same effect. |
bb4fc128d00d
(european-calendar-style, calendar-for-loop)
Glenn Morris <rgm@gnu.org>
parents:
92930
diff
changeset
|
1992 (if (> (length calendar-mark-ring) (1+ mark-ring-max)) |
bb4fc128d00d
(european-calendar-style, calendar-for-loop)
Glenn Morris <rgm@gnu.org>
parents:
92930
diff
changeset
|
1993 (setcdr (nthcdr mark-ring-max calendar-mark-ring) nil)) |
bb4fc128d00d
(european-calendar-style, calendar-for-loop)
Glenn Morris <rgm@gnu.org>
parents:
92930
diff
changeset
|
1994 (message "Mark set")))) |
628 | 1995 |
1996 (defun calendar-exchange-point-and-mark () | |
1997 "Exchange the current cursor position with the marked date." | |
1998 (interactive) | |
1999 (let ((mark (car calendar-mark-ring)) | |
5829
d266967cc1cc
(calendar-mode-line-format): Change "current" to "today".
Richard M. Stallman <rms@gnu.org>
parents:
5771
diff
changeset
|
2000 (date (calendar-cursor-to-date t))) |
628 | 2001 (if (null mark) |
2002 (error "No mark set in this buffer") | |
2003 (setq calendar-mark-ring (cons date (cdr calendar-mark-ring))) | |
2004 (calendar-goto-date mark)))) | |
2005 | |
2006 (defun calendar-count-days-region () | |
2007 "Count the number of days (inclusive) between point and the mark." | |
2008 (interactive) | |
2009 (let* ((days (- (calendar-absolute-from-gregorian | |
5829
d266967cc1cc
(calendar-mode-line-format): Change "current" to "today".
Richard M. Stallman <rms@gnu.org>
parents:
5771
diff
changeset
|
2010 (calendar-cursor-to-date t)) |
628 | 2011 (calendar-absolute-from-gregorian |
2012 (or (car calendar-mark-ring) | |
2013 (error "No mark set in this buffer"))))) | |
2014 (days (1+ (if (> days 0) days (- days))))) | |
2015 (message "Region has %d day%s (inclusive)" | |
2016 days (if (> days 1) "s" "")))) | |
2017 | |
2018 (defun calendar-not-implemented () | |
2019 "Not implemented." | |
2020 (interactive) | |
2021 (error "%s not available in the calendar" | |
2022 (global-key-binding (this-command-keys)))) | |
2023 | |
2024 (defun calendar-read (prompt acceptable &optional initial-contents) | |
2025 "Return an object read from the minibuffer. | |
2026 Prompt with the string PROMPT and use the function ACCEPTABLE to decide if | |
2027 entered item is acceptable. If non-nil, optional third arg INITIAL-CONTENTS | |
2028 is a string to insert in the minibuffer before reading." | |
2029 (let ((value (read-minibuffer prompt initial-contents))) | |
2030 (while (not (funcall acceptable value)) | |
2031 (setq value (read-minibuffer prompt initial-contents))) | |
2032 value)) | |
2033 | |
2034 | |
52115
60ffdeba6e0e
(diary-file, diary-file-name-prefix)
Glenn Morris <rgm@gnu.org>
parents:
49828
diff
changeset
|
2035 (defvar calendar-abbrev-length 3 |
60ffdeba6e0e
(diary-file, diary-file-name-prefix)
Glenn Morris <rgm@gnu.org>
parents:
49828
diff
changeset
|
2036 "*Length of abbreviations to be used for day and month names. |
60ffdeba6e0e
(diary-file, diary-file-name-prefix)
Glenn Morris <rgm@gnu.org>
parents:
49828
diff
changeset
|
2037 See also `calendar-day-abbrev-array' and `calendar-month-abbrev-array'.") |
60ffdeba6e0e
(diary-file, diary-file-name-prefix)
Glenn Morris <rgm@gnu.org>
parents:
49828
diff
changeset
|
2038 |
93026
8e1a78482251
(calendar-today-marker, initial-calendar-window-hook)
Glenn Morris <rgm@gnu.org>
parents:
92988
diff
changeset
|
2039 ;; FIXME does it have to start from Sunday? |
8e1a78482251
(calendar-today-marker, initial-calendar-window-hook)
Glenn Morris <rgm@gnu.org>
parents:
92988
diff
changeset
|
2040 (defcustom calendar-day-name-array |
23531
37ae25c77df0
Add doc strings CORRECTLY!
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
23498
diff
changeset
|
2041 ["Sunday" "Monday" "Tuesday" "Wednesday" "Thursday" "Friday" "Saturday"] |
93026
8e1a78482251
(calendar-today-marker, initial-calendar-window-hook)
Glenn Morris <rgm@gnu.org>
parents:
92988
diff
changeset
|
2042 "Array of capitalized strings giving, in order, the day names. |
52115
60ffdeba6e0e
(diary-file, diary-file-name-prefix)
Glenn Morris <rgm@gnu.org>
parents:
49828
diff
changeset
|
2043 The first two characters of each string will be used to head the |
60ffdeba6e0e
(diary-file, diary-file-name-prefix)
Glenn Morris <rgm@gnu.org>
parents:
49828
diff
changeset
|
2044 day columns in the calendar. See also the variable |
93026
8e1a78482251
(calendar-today-marker, initial-calendar-window-hook)
Glenn Morris <rgm@gnu.org>
parents:
92988
diff
changeset
|
2045 `calendar-day-abbrev-array'." |
8e1a78482251
(calendar-today-marker, initial-calendar-window-hook)
Glenn Morris <rgm@gnu.org>
parents:
92988
diff
changeset
|
2046 :group 'calendar |
8e1a78482251
(calendar-today-marker, initial-calendar-window-hook)
Glenn Morris <rgm@gnu.org>
parents:
92988
diff
changeset
|
2047 :type '(vector (string :tag "Sunday") |
8e1a78482251
(calendar-today-marker, initial-calendar-window-hook)
Glenn Morris <rgm@gnu.org>
parents:
92988
diff
changeset
|
2048 (string :tag "Monday") |
8e1a78482251
(calendar-today-marker, initial-calendar-window-hook)
Glenn Morris <rgm@gnu.org>
parents:
92988
diff
changeset
|
2049 (string :tag "Tuesday") |
8e1a78482251
(calendar-today-marker, initial-calendar-window-hook)
Glenn Morris <rgm@gnu.org>
parents:
92988
diff
changeset
|
2050 (string :tag "Wednesday") |
8e1a78482251
(calendar-today-marker, initial-calendar-window-hook)
Glenn Morris <rgm@gnu.org>
parents:
92988
diff
changeset
|
2051 (string :tag "Thursday") |
8e1a78482251
(calendar-today-marker, initial-calendar-window-hook)
Glenn Morris <rgm@gnu.org>
parents:
92988
diff
changeset
|
2052 (string :tag "Friday") |
8e1a78482251
(calendar-today-marker, initial-calendar-window-hook)
Glenn Morris <rgm@gnu.org>
parents:
92988
diff
changeset
|
2053 (string :tag "Saturday"))) |
52115
60ffdeba6e0e
(diary-file, diary-file-name-prefix)
Glenn Morris <rgm@gnu.org>
parents:
49828
diff
changeset
|
2054 |
60ffdeba6e0e
(diary-file, diary-file-name-prefix)
Glenn Morris <rgm@gnu.org>
parents:
49828
diff
changeset
|
2055 (defvar calendar-day-abbrev-array |
60ffdeba6e0e
(diary-file, diary-file-name-prefix)
Glenn Morris <rgm@gnu.org>
parents:
49828
diff
changeset
|
2056 [nil nil nil nil nil nil nil] |
60ffdeba6e0e
(diary-file, diary-file-name-prefix)
Glenn Morris <rgm@gnu.org>
parents:
49828
diff
changeset
|
2057 "*Array of capitalized strings giving the abbreviated day names. |
60ffdeba6e0e
(diary-file, diary-file-name-prefix)
Glenn Morris <rgm@gnu.org>
parents:
49828
diff
changeset
|
2058 The order should be the same as that of the full names specified |
60ffdeba6e0e
(diary-file, diary-file-name-prefix)
Glenn Morris <rgm@gnu.org>
parents:
49828
diff
changeset
|
2059 in `calendar-day-name-array'. These abbreviations may be used |
60ffdeba6e0e
(diary-file, diary-file-name-prefix)
Glenn Morris <rgm@gnu.org>
parents:
49828
diff
changeset
|
2060 instead of the full names in the diary file. Do not include a |
60ffdeba6e0e
(diary-file, diary-file-name-prefix)
Glenn Morris <rgm@gnu.org>
parents:
49828
diff
changeset
|
2061 trailing `.' in the strings specified in this variable, though |
60ffdeba6e0e
(diary-file, diary-file-name-prefix)
Glenn Morris <rgm@gnu.org>
parents:
49828
diff
changeset
|
2062 you may use such in the diary file. If any element of this array |
61148
7f7db25577d9
Update reference to "Calendrical Calculations" book; there's a new edition.
Paul Eggert <eggert@twinsun.com>
parents:
60922
diff
changeset
|
2063 is nil, then the abbreviation will be constructed as the first |
52115
60ffdeba6e0e
(diary-file, diary-file-name-prefix)
Glenn Morris <rgm@gnu.org>
parents:
49828
diff
changeset
|
2064 `calendar-abbrev-length' characters of the corresponding full name.") |
628 | 2065 |
93026
8e1a78482251
(calendar-today-marker, initial-calendar-window-hook)
Glenn Morris <rgm@gnu.org>
parents:
92988
diff
changeset
|
2066 (defcustom calendar-month-name-array |
628 | 2067 ["January" "February" "March" "April" "May" "June" |
23531
37ae25c77df0
Add doc strings CORRECTLY!
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
23498
diff
changeset
|
2068 "July" "August" "September" "October" "November" "December"] |
93026
8e1a78482251
(calendar-today-marker, initial-calendar-window-hook)
Glenn Morris <rgm@gnu.org>
parents:
92988
diff
changeset
|
2069 "Array of capitalized strings giving, in order, the month names. |
8e1a78482251
(calendar-today-marker, initial-calendar-window-hook)
Glenn Morris <rgm@gnu.org>
parents:
92988
diff
changeset
|
2070 See also the variable `calendar-month-abbrev-array'." |
8e1a78482251
(calendar-today-marker, initial-calendar-window-hook)
Glenn Morris <rgm@gnu.org>
parents:
92988
diff
changeset
|
2071 :group 'calendar |
8e1a78482251
(calendar-today-marker, initial-calendar-window-hook)
Glenn Morris <rgm@gnu.org>
parents:
92988
diff
changeset
|
2072 :type '(vector (string :tag "January") |
8e1a78482251
(calendar-today-marker, initial-calendar-window-hook)
Glenn Morris <rgm@gnu.org>
parents:
92988
diff
changeset
|
2073 (string :tag "February") |
8e1a78482251
(calendar-today-marker, initial-calendar-window-hook)
Glenn Morris <rgm@gnu.org>
parents:
92988
diff
changeset
|
2074 (string :tag "March") |
8e1a78482251
(calendar-today-marker, initial-calendar-window-hook)
Glenn Morris <rgm@gnu.org>
parents:
92988
diff
changeset
|
2075 (string :tag "April") |
8e1a78482251
(calendar-today-marker, initial-calendar-window-hook)
Glenn Morris <rgm@gnu.org>
parents:
92988
diff
changeset
|
2076 (string :tag "May") |
8e1a78482251
(calendar-today-marker, initial-calendar-window-hook)
Glenn Morris <rgm@gnu.org>
parents:
92988
diff
changeset
|
2077 (string :tag "June") |
8e1a78482251
(calendar-today-marker, initial-calendar-window-hook)
Glenn Morris <rgm@gnu.org>
parents:
92988
diff
changeset
|
2078 (string :tag "July") |
8e1a78482251
(calendar-today-marker, initial-calendar-window-hook)
Glenn Morris <rgm@gnu.org>
parents:
92988
diff
changeset
|
2079 (string :tag "August") |
8e1a78482251
(calendar-today-marker, initial-calendar-window-hook)
Glenn Morris <rgm@gnu.org>
parents:
92988
diff
changeset
|
2080 (string :tag "September") |
8e1a78482251
(calendar-today-marker, initial-calendar-window-hook)
Glenn Morris <rgm@gnu.org>
parents:
92988
diff
changeset
|
2081 (string :tag "October") |
8e1a78482251
(calendar-today-marker, initial-calendar-window-hook)
Glenn Morris <rgm@gnu.org>
parents:
92988
diff
changeset
|
2082 (string :tag "November") |
8e1a78482251
(calendar-today-marker, initial-calendar-window-hook)
Glenn Morris <rgm@gnu.org>
parents:
92988
diff
changeset
|
2083 (string :tag "December"))) |
52115
60ffdeba6e0e
(diary-file, diary-file-name-prefix)
Glenn Morris <rgm@gnu.org>
parents:
49828
diff
changeset
|
2084 |
60ffdeba6e0e
(diary-file, diary-file-name-prefix)
Glenn Morris <rgm@gnu.org>
parents:
49828
diff
changeset
|
2085 (defvar calendar-month-abbrev-array |
60ffdeba6e0e
(diary-file, diary-file-name-prefix)
Glenn Morris <rgm@gnu.org>
parents:
49828
diff
changeset
|
2086 [nil nil nil nil nil nil nil nil nil nil nil nil] |
60ffdeba6e0e
(diary-file, diary-file-name-prefix)
Glenn Morris <rgm@gnu.org>
parents:
49828
diff
changeset
|
2087 "*Array of capitalized strings giving the abbreviated month names. |
60ffdeba6e0e
(diary-file, diary-file-name-prefix)
Glenn Morris <rgm@gnu.org>
parents:
49828
diff
changeset
|
2088 The order should be the same as that of the full names specified |
60ffdeba6e0e
(diary-file, diary-file-name-prefix)
Glenn Morris <rgm@gnu.org>
parents:
49828
diff
changeset
|
2089 in `calendar-month-name-array'. These abbreviations are used in |
60ffdeba6e0e
(diary-file, diary-file-name-prefix)
Glenn Morris <rgm@gnu.org>
parents:
49828
diff
changeset
|
2090 the calendar menu entries, and can also be used in the diary |
60ffdeba6e0e
(diary-file, diary-file-name-prefix)
Glenn Morris <rgm@gnu.org>
parents:
49828
diff
changeset
|
2091 file. Do not include a trailing `.' in the strings specified in |
60ffdeba6e0e
(diary-file, diary-file-name-prefix)
Glenn Morris <rgm@gnu.org>
parents:
49828
diff
changeset
|
2092 this variable, though you may use such in the diary file. If any |
60ffdeba6e0e
(diary-file, diary-file-name-prefix)
Glenn Morris <rgm@gnu.org>
parents:
49828
diff
changeset
|
2093 element of this array is nil, then the abbreviation will be |
60ffdeba6e0e
(diary-file, diary-file-name-prefix)
Glenn Morris <rgm@gnu.org>
parents:
49828
diff
changeset
|
2094 constructed as the first `calendar-abbrev-length' characters of the |
60ffdeba6e0e
(diary-file, diary-file-name-prefix)
Glenn Morris <rgm@gnu.org>
parents:
49828
diff
changeset
|
2095 corresponding full name.") |
60ffdeba6e0e
(diary-file, diary-file-name-prefix)
Glenn Morris <rgm@gnu.org>
parents:
49828
diff
changeset
|
2096 |
92969
bb4fc128d00d
(european-calendar-style, calendar-for-loop)
Glenn Morris <rgm@gnu.org>
parents:
92930
diff
changeset
|
2097 (defun calendar-make-alist (sequence &optional start-index filter abbrevs) |
bb4fc128d00d
(european-calendar-style, calendar-for-loop)
Glenn Morris <rgm@gnu.org>
parents:
92930
diff
changeset
|
2098 "Make an assoc list corresponding to SEQUENCE. |
bb4fc128d00d
(european-calendar-style, calendar-for-loop)
Glenn Morris <rgm@gnu.org>
parents:
92930
diff
changeset
|
2099 Each element of sequence will be associated with an integer, starting |
bb4fc128d00d
(european-calendar-style, calendar-for-loop)
Glenn Morris <rgm@gnu.org>
parents:
92930
diff
changeset
|
2100 from 1, or from START-INDEX if that is non-nil. If a sequence ABBREVS |
bb4fc128d00d
(european-calendar-style, calendar-for-loop)
Glenn Morris <rgm@gnu.org>
parents:
92930
diff
changeset
|
2101 is supplied, the function `calendar-abbrev-construct' is used to |
bb4fc128d00d
(european-calendar-style, calendar-for-loop)
Glenn Morris <rgm@gnu.org>
parents:
92930
diff
changeset
|
2102 construct abbreviations corresponding to the elements in SEQUENCE. |
bb4fc128d00d
(european-calendar-style, calendar-for-loop)
Glenn Morris <rgm@gnu.org>
parents:
92930
diff
changeset
|
2103 Each abbreviation is entered into the alist with the same |
bb4fc128d00d
(european-calendar-style, calendar-for-loop)
Glenn Morris <rgm@gnu.org>
parents:
92930
diff
changeset
|
2104 association index as the full name it represents. |
bb4fc128d00d
(european-calendar-style, calendar-for-loop)
Glenn Morris <rgm@gnu.org>
parents:
92930
diff
changeset
|
2105 If FILTER is provided, apply it to each key in the alist." |
bb4fc128d00d
(european-calendar-style, calendar-for-loop)
Glenn Morris <rgm@gnu.org>
parents:
92930
diff
changeset
|
2106 (let ((index 0) |
bb4fc128d00d
(european-calendar-style, calendar-for-loop)
Glenn Morris <rgm@gnu.org>
parents:
92930
diff
changeset
|
2107 (offset (or start-index 1)) |
bb4fc128d00d
(european-calendar-style, calendar-for-loop)
Glenn Morris <rgm@gnu.org>
parents:
92930
diff
changeset
|
2108 (aseq (if abbrevs (calendar-abbrev-construct abbrevs sequence))) |
bb4fc128d00d
(european-calendar-style, calendar-for-loop)
Glenn Morris <rgm@gnu.org>
parents:
92930
diff
changeset
|
2109 (aseqp (if abbrevs (calendar-abbrev-construct abbrevs sequence |
bb4fc128d00d
(european-calendar-style, calendar-for-loop)
Glenn Morris <rgm@gnu.org>
parents:
92930
diff
changeset
|
2110 'period))) |
bb4fc128d00d
(european-calendar-style, calendar-for-loop)
Glenn Morris <rgm@gnu.org>
parents:
92930
diff
changeset
|
2111 alist elem) |
bb4fc128d00d
(european-calendar-style, calendar-for-loop)
Glenn Morris <rgm@gnu.org>
parents:
92930
diff
changeset
|
2112 (dotimes (i (length sequence) (reverse alist)) |
bb4fc128d00d
(european-calendar-style, calendar-for-loop)
Glenn Morris <rgm@gnu.org>
parents:
92930
diff
changeset
|
2113 (setq index (+ i offset) |
bb4fc128d00d
(european-calendar-style, calendar-for-loop)
Glenn Morris <rgm@gnu.org>
parents:
92930
diff
changeset
|
2114 elem (elt sequence i) |
bb4fc128d00d
(european-calendar-style, calendar-for-loop)
Glenn Morris <rgm@gnu.org>
parents:
92930
diff
changeset
|
2115 alist |
bb4fc128d00d
(european-calendar-style, calendar-for-loop)
Glenn Morris <rgm@gnu.org>
parents:
92930
diff
changeset
|
2116 (cons (cons (if filter (funcall filter elem) elem) index) alist)) |
bb4fc128d00d
(european-calendar-style, calendar-for-loop)
Glenn Morris <rgm@gnu.org>
parents:
92930
diff
changeset
|
2117 (if aseq |
bb4fc128d00d
(european-calendar-style, calendar-for-loop)
Glenn Morris <rgm@gnu.org>
parents:
92930
diff
changeset
|
2118 (setq elem (elt aseq i) |
bb4fc128d00d
(european-calendar-style, calendar-for-loop)
Glenn Morris <rgm@gnu.org>
parents:
92930
diff
changeset
|
2119 alist (cons (cons (if filter (funcall filter elem) elem) |
bb4fc128d00d
(european-calendar-style, calendar-for-loop)
Glenn Morris <rgm@gnu.org>
parents:
92930
diff
changeset
|
2120 index) alist))) |
bb4fc128d00d
(european-calendar-style, calendar-for-loop)
Glenn Morris <rgm@gnu.org>
parents:
92930
diff
changeset
|
2121 (if aseqp |
bb4fc128d00d
(european-calendar-style, calendar-for-loop)
Glenn Morris <rgm@gnu.org>
parents:
92930
diff
changeset
|
2122 (setq elem (elt aseqp i) |
bb4fc128d00d
(european-calendar-style, calendar-for-loop)
Glenn Morris <rgm@gnu.org>
parents:
92930
diff
changeset
|
2123 alist (cons (cons (if filter (funcall filter elem) elem) |
bb4fc128d00d
(european-calendar-style, calendar-for-loop)
Glenn Morris <rgm@gnu.org>
parents:
92930
diff
changeset
|
2124 index) alist)))))) |
92594
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
2125 |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
2126 (defun calendar-read-date (&optional noday) |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
2127 "Prompt for Gregorian date. Return a list (month day year). |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
2128 If optional NODAY is t, does not ask for day, but just returns |
93026
8e1a78482251
(calendar-today-marker, initial-calendar-window-hook)
Glenn Morris <rgm@gnu.org>
parents:
92988
diff
changeset
|
2129 \(month 1 year); if NODAY is any other non-nil value the value returned is |
92594
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
2130 \(month year)" |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
2131 (let* ((year (calendar-read |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
2132 "Year (>0): " |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
2133 (lambda (x) (> x 0)) |
93844
bf9ef749c23e
Replace int-to-string with number-to-string.
Glenn Morris <rgm@gnu.org>
parents:
93815
diff
changeset
|
2134 (number-to-string (calendar-extract-year |
92594
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
2135 (calendar-current-date))))) |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
2136 (month-array calendar-month-name-array) |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
2137 (completion-ignore-case t) |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
2138 (month (cdr (assoc-string |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
2139 (completing-read |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
2140 "Month name: " |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
2141 (mapcar 'list (append month-array nil)) |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
2142 nil t) |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
2143 (calendar-make-alist month-array 1) t))) |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
2144 (last (calendar-last-day-of-month month year))) |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
2145 (if noday |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
2146 (if (eq noday t) |
93026
8e1a78482251
(calendar-today-marker, initial-calendar-window-hook)
Glenn Morris <rgm@gnu.org>
parents:
92988
diff
changeset
|
2147 (list month 1 year) |
92594
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
2148 (list month year)) |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
2149 (list month |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
2150 (calendar-read (format "Day (1-%d): " last) |
92858 | 2151 (lambda (x) (and (< 0 x) (<= x last)))) |
92594
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
2152 year)))) |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
2153 |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
2154 (defun calendar-interval (mon1 yr1 mon2 yr2) |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
2155 "The number of months difference between MON1, YR1 and MON2, YR2. |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
2156 The result is positive if the second date is later than the first. |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
2157 Negative years are interpreted as years BC; -1 being 1 BC, and so on." |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
2158 (if (< yr1 0) (setq yr1 (1+ yr1))) ; -1 BC -> 0 AD, etc |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
2159 (if (< yr2 0) (setq yr2 (1+ yr2))) |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
2160 (+ (* 12 (- yr2 yr1)) |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
2161 (- mon2 mon1))) |
674c88622bd9
Move many autoloads to separate file, cal-loaddefs.el.
Glenn Morris <rgm@gnu.org>
parents:
92551
diff
changeset
|
2162 |
52115
60ffdeba6e0e
(diary-file, diary-file-name-prefix)
Glenn Morris <rgm@gnu.org>
parents:
49828
diff
changeset
|
2163 (defun calendar-abbrev-construct (abbrev full &optional period) |
60ffdeba6e0e
(diary-file, diary-file-name-prefix)
Glenn Morris <rgm@gnu.org>
parents:
49828
diff
changeset
|
2164 "Internal calendar function to return a complete abbreviation array. |
60ffdeba6e0e
(diary-file, diary-file-name-prefix)
Glenn Morris <rgm@gnu.org>
parents:
49828
diff
changeset
|
2165 ABBREV is an array of abbreviations, FULL the corresponding array |
60ffdeba6e0e
(diary-file, diary-file-name-prefix)
Glenn Morris <rgm@gnu.org>
parents:
49828
diff
changeset
|
2166 of full names. The return value is the ABBREV array, with any nil |
60ffdeba6e0e
(diary-file, diary-file-name-prefix)
Glenn Morris <rgm@gnu.org>
parents:
49828
diff
changeset
|
2167 elements replaced by the first three characters taken from the |
60ffdeba6e0e
(diary-file, diary-file-name-prefix)
Glenn Morris <rgm@gnu.org>
parents:
49828
diff
changeset
|
2168 corresponding element of FULL. If optional argument PERIOD is non-nil, |
60ffdeba6e0e
(diary-file, diary-file-name-prefix)
Glenn Morris <rgm@gnu.org>
parents:
49828
diff
changeset
|
2169 each element returned has a final `.' character." |
52160
833b56d6e12d
(list-diary-entries-hook, diary-display-hook, nongregorian-diary-listing-hook)
Glenn Morris <rgm@gnu.org>
parents:
52115
diff
changeset
|
2170 (let (elem array name) |
52115
60ffdeba6e0e
(diary-file, diary-file-name-prefix)
Glenn Morris <rgm@gnu.org>
parents:
49828
diff
changeset
|
2171 (dotimes (i (length full)) |
52160
833b56d6e12d
(list-diary-entries-hook, diary-display-hook, nongregorian-diary-listing-hook)
Glenn Morris <rgm@gnu.org>
parents:
52115
diff
changeset
|
2172 (setq name (aref full i) |
833b56d6e12d
(list-diary-entries-hook, diary-display-hook, nongregorian-diary-listing-hook)
Glenn Morris <rgm@gnu.org>
parents:
52115
diff
changeset
|
2173 elem (or (aref abbrev i) |
833b56d6e12d
(list-diary-entries-hook, diary-display-hook, nongregorian-diary-listing-hook)
Glenn Morris <rgm@gnu.org>
parents:
52115
diff
changeset
|
2174 (substring name 0 |
833b56d6e12d
(list-diary-entries-hook, diary-display-hook, nongregorian-diary-listing-hook)
Glenn Morris <rgm@gnu.org>
parents:
52115
diff
changeset
|
2175 (min calendar-abbrev-length (length name)))) |
52115
60ffdeba6e0e
(diary-file, diary-file-name-prefix)
Glenn Morris <rgm@gnu.org>
parents:
49828
diff
changeset
|
2176 elem (format "%s%s" elem (if period "." "")) |
60ffdeba6e0e
(diary-file, diary-file-name-prefix)
Glenn Morris <rgm@gnu.org>
parents:
49828
diff
changeset
|
2177 array (append array (list elem)))) |
60ffdeba6e0e
(diary-file, diary-file-name-prefix)
Glenn Morris <rgm@gnu.org>
parents:
49828
diff
changeset
|
2178 (vconcat array))) |
628 | 2179 |
48366
9dad713d153a
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47333
diff
changeset
|
2180 (defvar calendar-font-lock-keywords |
48683
ead34b521994
(facemenu-unlisted-faces): Only update after facemenu was loaded.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48366
diff
changeset
|
2181 `((,(concat (regexp-opt (mapcar 'identity calendar-month-name-array) t) |
92858 | 2182 " -?[0-9]+") |
48683
ead34b521994
(facemenu-unlisted-faces): Only update after facemenu was loaded.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48366
diff
changeset
|
2183 . font-lock-function-name-face) ; month and year |
ead34b521994
(facemenu-unlisted-faces): Only update after facemenu was loaded.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48366
diff
changeset
|
2184 (,(regexp-opt |
96158
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
2185 (list (substring (aref calendar-day-name-array 6) |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
2186 0 calendar-day-header-width) |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
2187 (substring (aref calendar-day-name-array 0) |
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
2188 0 calendar-day-header-width))) |
92697
001682fd0516
(diary-file, hebrew-holidays-1)
Glenn Morris <rgm@gnu.org>
parents:
92681
diff
changeset
|
2189 ;; Saturdays and Sundays are highlighted differently. |
48683
ead34b521994
(facemenu-unlisted-faces): Only update after facemenu was loaded.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48366
diff
changeset
|
2190 . font-lock-comment-face) |
52115
60ffdeba6e0e
(diary-file, diary-file-name-prefix)
Glenn Morris <rgm@gnu.org>
parents:
49828
diff
changeset
|
2191 ;; First two chars of each day are used in the calendar. |
96158
44b22c5bd2a9
Factor out the magic numbers controlling the calendar layout.
Glenn Morris <rgm@gnu.org>
parents:
96047
diff
changeset
|
2192 (,(regexp-opt (mapcar (lambda (x) (substring x 0 calendar-day-header-width)) |
92697
001682fd0516
(diary-file, hebrew-holidays-1)
Glenn Morris <rgm@gnu.org>
parents:
92681
diff
changeset
|
2193 calendar-day-name-array)) |
48683
ead34b521994
(facemenu-unlisted-faces): Only update after facemenu was loaded.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48366
diff
changeset
|
2194 . font-lock-reference-face)) |
48366
9dad713d153a
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47333
diff
changeset
|
2195 "Default keywords to highlight in Calendar mode.") |
9dad713d153a
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47333
diff
changeset
|
2196 |
52115
60ffdeba6e0e
(diary-file, diary-file-name-prefix)
Glenn Morris <rgm@gnu.org>
parents:
49828
diff
changeset
|
2197 (defun calendar-day-name (date &optional abbrev absolute) |
48717
b243692710b4
(calendar-day-name): Move defn down.
Richard M. Stallman <rms@gnu.org>
parents:
48683
diff
changeset
|
2198 "Return a string with the name of the day of the week of DATE. |
52115
60ffdeba6e0e
(diary-file, diary-file-name-prefix)
Glenn Morris <rgm@gnu.org>
parents:
49828
diff
changeset
|
2199 DATE should be a list in the format (MONTH DAY YEAR), unless the |
60ffdeba6e0e
(diary-file, diary-file-name-prefix)
Glenn Morris <rgm@gnu.org>
parents:
49828
diff
changeset
|
2200 optional argument ABSOLUTE is non-nil, in which case DATE should |
60ffdeba6e0e
(diary-file, diary-file-name-prefix)
Glenn Morris <rgm@gnu.org>
parents:
49828
diff
changeset
|
2201 be an integer in the range 0 to 6 corresponding to the day of the |
60ffdeba6e0e
(diary-file, diary-file-name-prefix)
Glenn Morris <rgm@gnu.org>
parents:
49828
diff
changeset
|
2202 week. Day names are taken from the variable `calendar-day-name-array', |
60ffdeba6e0e
(diary-file, diary-file-name-prefix)
Glenn Morris <rgm@gnu.org>
parents:
49828
diff
changeset
|
2203 unless the optional argument ABBREV is non-nil, in which case |
60ffdeba6e0e
(diary-file, diary-file-name-prefix)
Glenn Morris <rgm@gnu.org>
parents:
49828
diff
changeset
|
2204 the variable `calendar-day-abbrev-array' is used." |
60ffdeba6e0e
(diary-file, diary-file-name-prefix)
Glenn Morris <rgm@gnu.org>
parents:
49828
diff
changeset
|
2205 (aref (if abbrev |
60ffdeba6e0e
(diary-file, diary-file-name-prefix)
Glenn Morris <rgm@gnu.org>
parents:
49828
diff
changeset
|
2206 (calendar-abbrev-construct calendar-day-abbrev-array |
60ffdeba6e0e
(diary-file, diary-file-name-prefix)
Glenn Morris <rgm@gnu.org>
parents:
49828
diff
changeset
|
2207 calendar-day-name-array) |
60ffdeba6e0e
(diary-file, diary-file-name-prefix)
Glenn Morris <rgm@gnu.org>
parents:
49828
diff
changeset
|
2208 calendar-day-name-array) |
60ffdeba6e0e
(diary-file, diary-file-name-prefix)
Glenn Morris <rgm@gnu.org>
parents:
49828
diff
changeset
|
2209 (if absolute date (calendar-day-of-week date)))) |
60ffdeba6e0e
(diary-file, diary-file-name-prefix)
Glenn Morris <rgm@gnu.org>
parents:
49828
diff
changeset
|
2210 |
60ffdeba6e0e
(diary-file, diary-file-name-prefix)
Glenn Morris <rgm@gnu.org>
parents:
49828
diff
changeset
|
2211 (defun calendar-month-name (month &optional abbrev) |
60ffdeba6e0e
(diary-file, diary-file-name-prefix)
Glenn Morris <rgm@gnu.org>
parents:
49828
diff
changeset
|
2212 "Return a string with the name of month number MONTH. |
60ffdeba6e0e
(diary-file, diary-file-name-prefix)
Glenn Morris <rgm@gnu.org>
parents:
49828
diff
changeset
|
2213 Months are numbered from one. Month names are taken from the |
60ffdeba6e0e
(diary-file, diary-file-name-prefix)
Glenn Morris <rgm@gnu.org>
parents:
49828
diff
changeset
|
2214 variable `calendar-month-name-array', unless the optional |
60ffdeba6e0e
(diary-file, diary-file-name-prefix)
Glenn Morris <rgm@gnu.org>
parents:
49828
diff
changeset
|
2215 argument ABBREV is non-nil, in which case |
60ffdeba6e0e
(diary-file, diary-file-name-prefix)
Glenn Morris <rgm@gnu.org>
parents:
49828
diff
changeset
|
2216 `calendar-month-abbrev-array' is used." |
60ffdeba6e0e
(diary-file, diary-file-name-prefix)
Glenn Morris <rgm@gnu.org>
parents:
49828
diff
changeset
|
2217 (aref (if abbrev |
60ffdeba6e0e
(diary-file, diary-file-name-prefix)
Glenn Morris <rgm@gnu.org>
parents:
49828
diff
changeset
|
2218 (calendar-abbrev-construct calendar-month-abbrev-array |
60ffdeba6e0e
(diary-file, diary-file-name-prefix)
Glenn Morris <rgm@gnu.org>
parents:
49828
diff
changeset
|
2219 calendar-month-name-array) |
60ffdeba6e0e
(diary-file, diary-file-name-prefix)
Glenn Morris <rgm@gnu.org>
parents:
49828
diff
changeset
|
2220 calendar-month-name-array) |
60ffdeba6e0e
(diary-file, diary-file-name-prefix)
Glenn Morris <rgm@gnu.org>
parents:
49828
diff
changeset
|
2221 (1- month))) |
628 | 2222 |
2223 (defun calendar-day-of-week (date) | |
52723
f33d2cba6bb7
(increment-calendar-month, calendar-leap-year-p)
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
2224 "Return the day-of-the-week index of DATE, 0 for Sunday, 1 for Monday, etc. |
f33d2cba6bb7
(increment-calendar-month, calendar-leap-year-p)
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
2225 DATE is a list of the form (month day year). A negative year is |
f33d2cba6bb7
(increment-calendar-month, calendar-leap-year-p)
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
2226 interpreted as BC; -1 being 1 BC, and so on." |
f33d2cba6bb7
(increment-calendar-month, calendar-leap-year-p)
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
2227 (mod (calendar-absolute-from-gregorian date) 7)) |
628 | 2228 |
2229 (defun calendar-unmark () | |
5694
69471d331d0c
(calendar-version): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5272
diff
changeset
|
2230 "Delete all diary/holiday marks/highlighting from the calendar." |
628 | 2231 (interactive) |
93808
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
2232 (setq calendar-mark-holidays-flag nil |
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
2233 calendar-mark-diary-entries-flag nil) |
93492
2fe1b51b8771
(calendar-mode-map): Use calendar-mark-holidays rather than obsolete alias.
Glenn Morris <rgm@gnu.org>
parents:
93464
diff
changeset
|
2234 (with-current-buffer calendar-buffer |
2fe1b51b8771
(calendar-mode-map): Use calendar-mark-holidays rather than obsolete alias.
Glenn Morris <rgm@gnu.org>
parents:
93464
diff
changeset
|
2235 (mapc 'delete-overlay (overlays-in (point-min) (point-max))))) |
628 | 2236 |
2237 (defun calendar-date-is-visible-p (date) | |
93449
64521597b7dd
(increment-calendar-month): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
93374
diff
changeset
|
2238 "Return non-nil if DATE is valid and is visible in the calendar window." |
64521597b7dd
(increment-calendar-month): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
93374
diff
changeset
|
2239 (and (calendar-date-is-valid-p date) |
64521597b7dd
(increment-calendar-month): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
93374
diff
changeset
|
2240 (< (abs (calendar-interval |
64521597b7dd
(increment-calendar-month): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
93374
diff
changeset
|
2241 displayed-month displayed-year |
93808
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
2242 (calendar-extract-month date) (calendar-extract-year date))) |
93449
64521597b7dd
(increment-calendar-month): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
93374
diff
changeset
|
2243 2))) |
92530
04183df0b71f
(calendar-date-is-legal-p): New obsolete alias.
Juanma Barranquero <lekktu@gmail.com>
parents:
87649
diff
changeset
|
2244 |
94280
746fc66b809d
(calendar-chinese-all-holidays-flag): New.
Glenn Morris <rgm@gnu.org>
parents:
94019
diff
changeset
|
2245 ;; FIXME can this be generalized for holiday-chinese? |
93497
258266315e25
(calendar-nongregorian-visible-p): New function.
Glenn Morris <rgm@gnu.org>
parents:
93492
diff
changeset
|
2246 (defun calendar-nongregorian-visible-p (month day toabs fromabs switch) |
258266315e25
(calendar-nongregorian-visible-p): New function.
Glenn Morris <rgm@gnu.org>
parents:
93492
diff
changeset
|
2247 "Return non-nil if MONTH, DAY is visible in the calendar window. |
258266315e25
(calendar-nongregorian-visible-p): New function.
Glenn Morris <rgm@gnu.org>
parents:
93492
diff
changeset
|
2248 MONTH and DAY are in some non-Gregorian calendar system. The |
258266315e25
(calendar-nongregorian-visible-p): New function.
Glenn Morris <rgm@gnu.org>
parents:
93492
diff
changeset
|
2249 functions TOABS and FROMABS convert that system to and from |
258266315e25
(calendar-nongregorian-visible-p): New function.
Glenn Morris <rgm@gnu.org>
parents:
93492
diff
changeset
|
2250 absolute, respectively. SWITCH is a function that takes a single |
258266315e25
(calendar-nongregorian-visible-p): New function.
Glenn Morris <rgm@gnu.org>
parents:
93492
diff
changeset
|
2251 argument (a local month number). It applies when the local year |
258266315e25
(calendar-nongregorian-visible-p): New function.
Glenn Morris <rgm@gnu.org>
parents:
93492
diff
changeset
|
2252 changes across the calendar window, and returns non-nil if the |
258266315e25
(calendar-nongregorian-visible-p): New function.
Glenn Morris <rgm@gnu.org>
parents:
93492
diff
changeset
|
2253 specified month should be associated with the higher year. |
258266315e25
(calendar-nongregorian-visible-p): New function.
Glenn Morris <rgm@gnu.org>
parents:
93492
diff
changeset
|
2254 Returns the corresponding Gregorian date." |
258266315e25
(calendar-nongregorian-visible-p): New function.
Glenn Morris <rgm@gnu.org>
parents:
93492
diff
changeset
|
2255 ;; We need to choose the local year associated with month and day |
258266315e25
(calendar-nongregorian-visible-p): New function.
Glenn Morris <rgm@gnu.org>
parents:
93492
diff
changeset
|
2256 ;; that might make them visible. |
258266315e25
(calendar-nongregorian-visible-p): New function.
Glenn Morris <rgm@gnu.org>
parents:
93492
diff
changeset
|
2257 (let* ((m1 displayed-month) |
258266315e25
(calendar-nongregorian-visible-p): New function.
Glenn Morris <rgm@gnu.org>
parents:
93492
diff
changeset
|
2258 (y1 displayed-year) |
258266315e25
(calendar-nongregorian-visible-p): New function.
Glenn Morris <rgm@gnu.org>
parents:
93492
diff
changeset
|
2259 (m2 displayed-month) |
258266315e25
(calendar-nongregorian-visible-p): New function.
Glenn Morris <rgm@gnu.org>
parents:
93492
diff
changeset
|
2260 (y2 displayed-year) |
258266315e25
(calendar-nongregorian-visible-p): New function.
Glenn Morris <rgm@gnu.org>
parents:
93492
diff
changeset
|
2261 ;; Absolute date of first/last dates in calendar window. |
258266315e25
(calendar-nongregorian-visible-p): New function.
Glenn Morris <rgm@gnu.org>
parents:
93492
diff
changeset
|
2262 (start-date (progn |
93808
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
2263 (calendar-increment-month m1 y1 -1) |
93497
258266315e25
(calendar-nongregorian-visible-p): New function.
Glenn Morris <rgm@gnu.org>
parents:
93492
diff
changeset
|
2264 (calendar-absolute-from-gregorian (list m1 1 y1)))) |
258266315e25
(calendar-nongregorian-visible-p): New function.
Glenn Morris <rgm@gnu.org>
parents:
93492
diff
changeset
|
2265 (end-date (progn |
93808
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
2266 (calendar-increment-month m2 y2 1) |
93497
258266315e25
(calendar-nongregorian-visible-p): New function.
Glenn Morris <rgm@gnu.org>
parents:
93492
diff
changeset
|
2267 (calendar-absolute-from-gregorian |
258266315e25
(calendar-nongregorian-visible-p): New function.
Glenn Morris <rgm@gnu.org>
parents:
93492
diff
changeset
|
2268 (list m2 (calendar-last-day-of-month m2 y2) y2)))) |
258266315e25
(calendar-nongregorian-visible-p): New function.
Glenn Morris <rgm@gnu.org>
parents:
93492
diff
changeset
|
2269 ;; Local date of first/last date in calendar window. |
258266315e25
(calendar-nongregorian-visible-p): New function.
Glenn Morris <rgm@gnu.org>
parents:
93492
diff
changeset
|
2270 (local-start (funcall fromabs start-date)) |
258266315e25
(calendar-nongregorian-visible-p): New function.
Glenn Morris <rgm@gnu.org>
parents:
93492
diff
changeset
|
2271 (local-end (funcall fromabs end-date)) |
258266315e25
(calendar-nongregorian-visible-p): New function.
Glenn Morris <rgm@gnu.org>
parents:
93492
diff
changeset
|
2272 ;; Local year of first/last dates. |
258266315e25
(calendar-nongregorian-visible-p): New function.
Glenn Morris <rgm@gnu.org>
parents:
93492
diff
changeset
|
2273 ;; Can only differ if displayed-month = 12, 1, 2. |
93808
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
2274 (local-y1 (calendar-extract-year local-start)) |
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
2275 (local-y2 (calendar-extract-year local-end)) |
93497
258266315e25
(calendar-nongregorian-visible-p): New function.
Glenn Morris <rgm@gnu.org>
parents:
93492
diff
changeset
|
2276 ;; Choose which year might be visible in the window. |
258266315e25
(calendar-nongregorian-visible-p): New function.
Glenn Morris <rgm@gnu.org>
parents:
93492
diff
changeset
|
2277 ;; Obviously it only matters when y1 and y2 differ, ie |
258266315e25
(calendar-nongregorian-visible-p): New function.
Glenn Morris <rgm@gnu.org>
parents:
93492
diff
changeset
|
2278 ;; when the _local_ new year is visible. |
258266315e25
(calendar-nongregorian-visible-p): New function.
Glenn Morris <rgm@gnu.org>
parents:
93492
diff
changeset
|
2279 (year (if (funcall switch month) local-y2 local-y1)) |
258266315e25
(calendar-nongregorian-visible-p): New function.
Glenn Morris <rgm@gnu.org>
parents:
93492
diff
changeset
|
2280 (date (calendar-gregorian-from-absolute |
258266315e25
(calendar-nongregorian-visible-p): New function.
Glenn Morris <rgm@gnu.org>
parents:
93492
diff
changeset
|
2281 (funcall toabs (list month day year))))) |
258266315e25
(calendar-nongregorian-visible-p): New function.
Glenn Morris <rgm@gnu.org>
parents:
93492
diff
changeset
|
2282 (if (calendar-date-is-visible-p date) |
258266315e25
(calendar-nongregorian-visible-p): New function.
Glenn Morris <rgm@gnu.org>
parents:
93492
diff
changeset
|
2283 date))) |
258266315e25
(calendar-nongregorian-visible-p): New function.
Glenn Morris <rgm@gnu.org>
parents:
93492
diff
changeset
|
2284 |
92530
04183df0b71f
(calendar-date-is-legal-p): New obsolete alias.
Juanma Barranquero <lekktu@gmail.com>
parents:
87649
diff
changeset
|
2285 (defun calendar-date-is-valid-p (date) |
60922
4e6ed80c0af2
* calendar/calendar.el: Replace `legal' with `valid'.
Werner LEMBERG <wl@gnu.org>
parents:
60649
diff
changeset
|
2286 "Return t if DATE is a valid date." |
93808
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
2287 (let ((month (calendar-extract-month date)) |
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
2288 (day (calendar-extract-day date)) |
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
2289 (year (calendar-extract-year date))) |
628 | 2290 (and (<= 1 month) (<= month 12) |
93026
8e1a78482251
(calendar-today-marker, initial-calendar-window-hook)
Glenn Morris <rgm@gnu.org>
parents:
92988
diff
changeset
|
2291 ;; (calendar-read-date t) used to return a date with day = nil. |
70581
1eaae4fee224
(calendar-basic-setup): Set day to 1 in
Glenn Morris <rgm@gnu.org>
parents:
69356
diff
changeset
|
2292 ;; Should not be valid (?), since many funcs prob assume integer. |
1eaae4fee224
(calendar-basic-setup): Set day to 1 in
Glenn Morris <rgm@gnu.org>
parents:
69356
diff
changeset
|
2293 ;; (calendar-read-date 'noday) returns (month year), which |
93808
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
2294 ;; currently results in calendar-extract-year returning nil. |
70581
1eaae4fee224
(calendar-basic-setup): Set day to 1 in
Glenn Morris <rgm@gnu.org>
parents:
69356
diff
changeset
|
2295 day year (<= 1 day) (<= day (calendar-last-day-of-month month year)) |
60922
4e6ed80c0af2
* calendar/calendar.el: Replace `legal' with `valid'.
Werner LEMBERG <wl@gnu.org>
parents:
60649
diff
changeset
|
2296 ;; BC dates left as non-valid, to suppress errors from |
52723
f33d2cba6bb7
(increment-calendar-month, calendar-leap-year-p)
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
2297 ;; complex holiday algorithms not suitable for years BC. |
f33d2cba6bb7
(increment-calendar-month, calendar-leap-year-p)
Glenn Morris <rgm@gnu.org>
parents:
52401
diff
changeset
|
2298 ;; Note there are side effects on calendar navigation. |
628 | 2299 (<= 1 year)))) |
2300 | |
92530
04183df0b71f
(calendar-date-is-legal-p): New obsolete alias.
Juanma Barranquero <lekktu@gmail.com>
parents:
87649
diff
changeset
|
2301 (define-obsolete-function-alias 'calendar-date-is-legal-p |
04183df0b71f
(calendar-date-is-legal-p): New obsolete alias.
Juanma Barranquero <lekktu@gmail.com>
parents:
87649
diff
changeset
|
2302 'calendar-date-is-valid-p "23.1") |
04183df0b71f
(calendar-date-is-legal-p): New obsolete alias.
Juanma Barranquero <lekktu@gmail.com>
parents:
87649
diff
changeset
|
2303 |
628 | 2304 (defun calendar-date-equal (date1 date2) |
31730
719a230f8091
Docstring fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31671
diff
changeset
|
2305 "Return t if the DATE1 and DATE2 are the same." |
628 | 2306 (and |
93808
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
2307 (= (calendar-extract-month date1) (calendar-extract-month date2)) |
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
2308 (= (calendar-extract-day date1) (calendar-extract-day date2)) |
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
2309 (= (calendar-extract-year date1) (calendar-extract-year date2)))) |
628 | 2310 |
93504
9105df157c3a
(calendar-make-temp-face): New function.
Glenn Morris <rgm@gnu.org>
parents:
93497
diff
changeset
|
2311 (defun calendar-make-temp-face (attrlist) |
9105df157c3a
(calendar-make-temp-face): New function.
Glenn Morris <rgm@gnu.org>
parents:
93497
diff
changeset
|
2312 "Return a temporary face based on the attributes in ATTRLIST. |
9105df157c3a
(calendar-make-temp-face): New function.
Glenn Morris <rgm@gnu.org>
parents:
93497
diff
changeset
|
2313 ATTRLIST is a list with elements of the form :face face :foreground color." |
93510
343109876a78
(calendar-make-temp-face): Fix previous change. Use the last :face if
Glenn Morris <rgm@gnu.org>
parents:
93504
diff
changeset
|
2314 (let ((attrs attrlist) |
343109876a78
(calendar-make-temp-face): Fix previous change. Use the last :face if
Glenn Morris <rgm@gnu.org>
parents:
93504
diff
changeset
|
2315 faceinfo face temp-face) |
343109876a78
(calendar-make-temp-face): Fix previous change. Use the last :face if
Glenn Morris <rgm@gnu.org>
parents:
93504
diff
changeset
|
2316 ;; Separate :face from the other attributes. Use the last :face |
343109876a78
(calendar-make-temp-face): Fix previous change. Use the last :face if
Glenn Morris <rgm@gnu.org>
parents:
93504
diff
changeset
|
2317 ;; if there are more than one. FIXME is merging meaningful? |
343109876a78
(calendar-make-temp-face): Fix previous change. Use the last :face if
Glenn Morris <rgm@gnu.org>
parents:
93504
diff
changeset
|
2318 (while attrs |
343109876a78
(calendar-make-temp-face): Fix previous change. Use the last :face if
Glenn Morris <rgm@gnu.org>
parents:
93504
diff
changeset
|
2319 (if (eq (car attrs) :face) |
343109876a78
(calendar-make-temp-face): Fix previous change. Use the last :face if
Glenn Morris <rgm@gnu.org>
parents:
93504
diff
changeset
|
2320 (setq face (intern-soft (cadr attrs)) |
343109876a78
(calendar-make-temp-face): Fix previous change. Use the last :face if
Glenn Morris <rgm@gnu.org>
parents:
93504
diff
changeset
|
2321 attrs (cddr attrs)) |
343109876a78
(calendar-make-temp-face): Fix previous change. Use the last :face if
Glenn Morris <rgm@gnu.org>
parents:
93504
diff
changeset
|
2322 (push (car attrs) faceinfo) |
343109876a78
(calendar-make-temp-face): Fix previous change. Use the last :face if
Glenn Morris <rgm@gnu.org>
parents:
93504
diff
changeset
|
2323 (setq attrs (cdr attrs)))) |
343109876a78
(calendar-make-temp-face): Fix previous change. Use the last :face if
Glenn Morris <rgm@gnu.org>
parents:
93504
diff
changeset
|
2324 (or (facep face) (setq face 'default)) |
343109876a78
(calendar-make-temp-face): Fix previous change. Use the last :face if
Glenn Morris <rgm@gnu.org>
parents:
93504
diff
changeset
|
2325 (if (not faceinfo) |
343109876a78
(calendar-make-temp-face): Fix previous change. Use the last :face if
Glenn Morris <rgm@gnu.org>
parents:
93504
diff
changeset
|
2326 ;; No attributes to apply, so just use an existing-face. |
343109876a78
(calendar-make-temp-face): Fix previous change. Use the last :face if
Glenn Morris <rgm@gnu.org>
parents:
93504
diff
changeset
|
2327 face |
343109876a78
(calendar-make-temp-face): Fix previous change. Use the last :face if
Glenn Morris <rgm@gnu.org>
parents:
93504
diff
changeset
|
2328 ;; FIXME should we be using numbered temp-faces, re-using where poss? |
343109876a78
(calendar-make-temp-face): Fix previous change. Use the last :face if
Glenn Morris <rgm@gnu.org>
parents:
93504
diff
changeset
|
2329 (setq temp-face |
343109876a78
(calendar-make-temp-face): Fix previous change. Use the last :face if
Glenn Morris <rgm@gnu.org>
parents:
93504
diff
changeset
|
2330 (make-symbol |
343109876a78
(calendar-make-temp-face): Fix previous change. Use the last :face if
Glenn Morris <rgm@gnu.org>
parents:
93504
diff
changeset
|
2331 (concat ":caltemp" |
343109876a78
(calendar-make-temp-face): Fix previous change. Use the last :face if
Glenn Morris <rgm@gnu.org>
parents:
93504
diff
changeset
|
2332 (mapconcat (lambda (sym) |
343109876a78
(calendar-make-temp-face): Fix previous change. Use the last :face if
Glenn Morris <rgm@gnu.org>
parents:
93504
diff
changeset
|
2333 (cond |
343109876a78
(calendar-make-temp-face): Fix previous change. Use the last :face if
Glenn Morris <rgm@gnu.org>
parents:
93504
diff
changeset
|
2334 ((symbolp sym) (symbol-name sym)) |
343109876a78
(calendar-make-temp-face): Fix previous change. Use the last :face if
Glenn Morris <rgm@gnu.org>
parents:
93504
diff
changeset
|
2335 ((numberp sym) (number-to-string sym)) |
343109876a78
(calendar-make-temp-face): Fix previous change. Use the last :face if
Glenn Morris <rgm@gnu.org>
parents:
93504
diff
changeset
|
2336 (t sym))) |
343109876a78
(calendar-make-temp-face): Fix previous change. Use the last :face if
Glenn Morris <rgm@gnu.org>
parents:
93504
diff
changeset
|
2337 attrlist "")))) |
343109876a78
(calendar-make-temp-face): Fix previous change. Use the last :face if
Glenn Morris <rgm@gnu.org>
parents:
93504
diff
changeset
|
2338 (make-face temp-face) |
343109876a78
(calendar-make-temp-face): Fix previous change. Use the last :face if
Glenn Morris <rgm@gnu.org>
parents:
93504
diff
changeset
|
2339 (copy-face face temp-face) |
343109876a78
(calendar-make-temp-face): Fix previous change. Use the last :face if
Glenn Morris <rgm@gnu.org>
parents:
93504
diff
changeset
|
2340 ;; Apply the font aspects. |
343109876a78
(calendar-make-temp-face): Fix previous change. Use the last :face if
Glenn Morris <rgm@gnu.org>
parents:
93504
diff
changeset
|
2341 (apply 'set-face-attribute temp-face nil (nreverse faceinfo)) |
343109876a78
(calendar-make-temp-face): Fix previous change. Use the last :face if
Glenn Morris <rgm@gnu.org>
parents:
93504
diff
changeset
|
2342 temp-face))) |
93504
9105df157c3a
(calendar-make-temp-face): New function.
Glenn Morris <rgm@gnu.org>
parents:
93497
diff
changeset
|
2343 |
93808
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
2344 (defun calendar-mark-visible-date (date &optional mark) |
5694
69471d331d0c
(calendar-version): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5272
diff
changeset
|
2345 "Mark DATE in the calendar window with MARK. |
49736
dd8404d4fed8
(diary-face-attrs): New custom.
Juanma Barranquero <lekktu@gmail.com>
parents:
49350
diff
changeset
|
2346 MARK is a single-character string, a list of face attributes/values, or a face. |
48366
9dad713d153a
Patch of Alan Shutko <ats@acm.org> by way of rms.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47333
diff
changeset
|
2347 MARK defaults to `diary-entry-marker'." |
92530
04183df0b71f
(calendar-date-is-legal-p): New obsolete alias.
Juanma Barranquero <lekktu@gmail.com>
parents:
87649
diff
changeset
|
2348 (if (calendar-date-is-valid-p date) |
65620
eae4a82ba77a
(mark-visible-calendar-date): Save excursion.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65477
diff
changeset
|
2349 (with-current-buffer calendar-buffer |
eae4a82ba77a
(mark-visible-calendar-date): Save excursion.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65477
diff
changeset
|
2350 (save-excursion |
eae4a82ba77a
(mark-visible-calendar-date): Save excursion.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65477
diff
changeset
|
2351 (calendar-cursor-to-visible-date date) |
eae4a82ba77a
(mark-visible-calendar-date): Save excursion.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65477
diff
changeset
|
2352 (setq mark |
eae4a82ba77a
(mark-visible-calendar-date): Save excursion.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65477
diff
changeset
|
2353 (or (and (stringp mark) (= (length mark) 1) mark) ; single-char |
101899
6c501f7469ab
(diary-entry-marker, calendar-today-marker, calendar-holiday-marker)
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
2354 ;; The next two use to also check font-lock-mode. |
6c501f7469ab
(diary-entry-marker, calendar-today-marker, calendar-holiday-marker)
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
2355 ;; See comments above diary-entry-marker for why |
6c501f7469ab
(diary-entry-marker, calendar-today-marker, calendar-holiday-marker)
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
2356 ;; this was dropped. |
6c501f7469ab
(diary-entry-marker, calendar-today-marker, calendar-holiday-marker)
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
2357 ;;; (and font-lock-mode |
6c501f7469ab
(diary-entry-marker, calendar-today-marker, calendar-holiday-marker)
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
2358 ;;; (or |
93528
6fb229e96593
(diary-entry-marker, calendar-today-marker, calendar-holiday-marker)
Glenn Morris <rgm@gnu.org>
parents:
93510
diff
changeset
|
2359 (and (listp mark) (> (length mark) 0) mark) ; attrs |
101899
6c501f7469ab
(diary-entry-marker, calendar-today-marker, calendar-holiday-marker)
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
2360 (and (facep mark) mark) ; )) face-name |
6c501f7469ab
(diary-entry-marker, calendar-today-marker, calendar-holiday-marker)
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
2361 diary-entry-marker)) |
65620
eae4a82ba77a
(mark-visible-calendar-date): Save excursion.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65477
diff
changeset
|
2362 (cond |
92697
001682fd0516
(diary-file, hebrew-holidays-1)
Glenn Morris <rgm@gnu.org>
parents:
92681
diff
changeset
|
2363 ;; Face or an attr-list that contained a face. |
65620
eae4a82ba77a
(mark-visible-calendar-date): Save excursion.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65477
diff
changeset
|
2364 ((facep mark) |
eae4a82ba77a
(mark-visible-calendar-date): Save excursion.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65477
diff
changeset
|
2365 (overlay-put |
eae4a82ba77a
(mark-visible-calendar-date): Save excursion.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65477
diff
changeset
|
2366 (make-overlay (1- (point)) (1+ (point))) 'face mark)) |
93492
2fe1b51b8771
(calendar-mode-map): Use calendar-mark-holidays rather than obsolete alias.
Glenn Morris <rgm@gnu.org>
parents:
93464
diff
changeset
|
2367 ;; Single-character mark, goes after the date. |
65620
eae4a82ba77a
(mark-visible-calendar-date): Save excursion.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65477
diff
changeset
|
2368 ((and (stringp mark) (= (length mark) 1)) |
93492
2fe1b51b8771
(calendar-mode-map): Use calendar-mark-holidays rather than obsolete alias.
Glenn Morris <rgm@gnu.org>
parents:
93464
diff
changeset
|
2369 (overlay-put |
2fe1b51b8771
(calendar-mode-map): Use calendar-mark-holidays rather than obsolete alias.
Glenn Morris <rgm@gnu.org>
parents:
93464
diff
changeset
|
2370 (make-overlay (1+ (point)) (+ 2 (point))) 'display mark)) |
92697
001682fd0516
(diary-file, hebrew-holidays-1)
Glenn Morris <rgm@gnu.org>
parents:
92681
diff
changeset
|
2371 (t ; attr list |
93504
9105df157c3a
(calendar-make-temp-face): New function.
Glenn Morris <rgm@gnu.org>
parents:
93497
diff
changeset
|
2372 (overlay-put |
9105df157c3a
(calendar-make-temp-face): New function.
Glenn Morris <rgm@gnu.org>
parents:
93497
diff
changeset
|
2373 (make-overlay (1- (point)) (1+ (point))) 'face |
9105df157c3a
(calendar-make-temp-face): New function.
Glenn Morris <rgm@gnu.org>
parents:
93497
diff
changeset
|
2374 (calendar-make-temp-face mark)))))))) |
628 | 2375 |
93808
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
2376 (define-obsolete-function-alias 'mark-visible-calendar-date |
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
2377 'calendar-mark-visible-date "23.1") |
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
2378 |
628 | 2379 (defun calendar-star-date () |
2380 "Replace the date under the cursor in the calendar window with asterisks. | |
93808
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
2381 You might want to add this function to `calendar-today-visible-hook'." |
93492
2fe1b51b8771
(calendar-mode-map): Use calendar-mark-holidays rather than obsolete alias.
Glenn Morris <rgm@gnu.org>
parents:
93464
diff
changeset
|
2382 (unless (catch 'found |
2fe1b51b8771
(calendar-mode-map): Use calendar-mark-holidays rather than obsolete alias.
Glenn Morris <rgm@gnu.org>
parents:
93464
diff
changeset
|
2383 (dolist (ol (overlays-at (point))) |
2fe1b51b8771
(calendar-mode-map): Use calendar-mark-holidays rather than obsolete alias.
Glenn Morris <rgm@gnu.org>
parents:
93464
diff
changeset
|
2384 (and (overlay-get ol 'calendar-star) |
2fe1b51b8771
(calendar-mode-map): Use calendar-mark-holidays rather than obsolete alias.
Glenn Morris <rgm@gnu.org>
parents:
93464
diff
changeset
|
2385 (throw 'found t)))) |
2fe1b51b8771
(calendar-mode-map): Use calendar-mark-holidays rather than obsolete alias.
Glenn Morris <rgm@gnu.org>
parents:
93464
diff
changeset
|
2386 (let ((ol (make-overlay (1- (point)) (point)))) |
2fe1b51b8771
(calendar-mode-map): Use calendar-mark-holidays rather than obsolete alias.
Glenn Morris <rgm@gnu.org>
parents:
93464
diff
changeset
|
2387 (overlay-put ol 'display "*") |
2fe1b51b8771
(calendar-mode-map): Use calendar-mark-holidays rather than obsolete alias.
Glenn Morris <rgm@gnu.org>
parents:
93464
diff
changeset
|
2388 (overlay-put ol 'calendar-star t) |
2fe1b51b8771
(calendar-mode-map): Use calendar-mark-holidays rather than obsolete alias.
Glenn Morris <rgm@gnu.org>
parents:
93464
diff
changeset
|
2389 ;; Use copy-sequence to avoid merging of identical 'display props. |
2fe1b51b8771
(calendar-mode-map): Use calendar-mark-holidays rather than obsolete alias.
Glenn Morris <rgm@gnu.org>
parents:
93464
diff
changeset
|
2390 ;; Use two overlays so as not to mess up |
2fe1b51b8771
(calendar-mode-map): Use calendar-mark-holidays rather than obsolete alias.
Glenn Morris <rgm@gnu.org>
parents:
93464
diff
changeset
|
2391 ;; calendar-cursor-to-nearest-date (and calendar-forward-day). |
2fe1b51b8771
(calendar-mode-map): Use calendar-mark-holidays rather than obsolete alias.
Glenn Morris <rgm@gnu.org>
parents:
93464
diff
changeset
|
2392 (overlay-put (setq ol (make-overlay (point) (1+ (point)))) |
2fe1b51b8771
(calendar-mode-map): Use calendar-mark-holidays rather than obsolete alias.
Glenn Morris <rgm@gnu.org>
parents:
93464
diff
changeset
|
2393 'display (copy-sequence "*")) |
2fe1b51b8771
(calendar-mode-map): Use calendar-mark-holidays rather than obsolete alias.
Glenn Morris <rgm@gnu.org>
parents:
93464
diff
changeset
|
2394 (overlay-put ol 'calendar-star t)))) |
628 | 2395 |
2396 (defun calendar-mark-today () | |
5694
69471d331d0c
(calendar-version): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5272
diff
changeset
|
2397 "Mark the date under the cursor in the calendar window. |
93026
8e1a78482251
(calendar-today-marker, initial-calendar-window-hook)
Glenn Morris <rgm@gnu.org>
parents:
92988
diff
changeset
|
2398 The date is marked with `calendar-today-marker'. You might want to add |
93808
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
2399 this function to `calendar-today-visible-hook'." |
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
2400 (calendar-mark-visible-date (calendar-cursor-to-date) calendar-today-marker)) |
628 | 2401 |
104754 | 2402 ;; FIXME why the car? Almost every usage calls list on the args. |
628 | 2403 (defun calendar-date-compare (date1 date2) |
31730
719a230f8091
Docstring fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31671
diff
changeset
|
2404 "Return t if DATE1 is before DATE2, nil otherwise. |
628 | 2405 The actual dates are in the car of DATE1 and DATE2." |
2406 (< (calendar-absolute-from-gregorian (car date1)) | |
2407 (calendar-absolute-from-gregorian (car date2)))) | |
2408 | |
2409 (defun calendar-date-string (date &optional abbreviate nodayname) | |
2410 "A string form of DATE, driven by the variable `calendar-date-display-form'. | |
52115
60ffdeba6e0e
(diary-file, diary-file-name-prefix)
Glenn Morris <rgm@gnu.org>
parents:
49828
diff
changeset
|
2411 An optional parameter ABBREVIATE, when non-nil, causes the month |
60ffdeba6e0e
(diary-file, diary-file-name-prefix)
Glenn Morris <rgm@gnu.org>
parents:
49828
diff
changeset
|
2412 and day names to be abbreviated as specified by |
60ffdeba6e0e
(diary-file, diary-file-name-prefix)
Glenn Morris <rgm@gnu.org>
parents:
49828
diff
changeset
|
2413 `calendar-month-abbrev-array' and `calendar-day-abbrev-array', |
60ffdeba6e0e
(diary-file, diary-file-name-prefix)
Glenn Morris <rgm@gnu.org>
parents:
49828
diff
changeset
|
2414 respectively. An optional parameter NODAYNAME, when t, omits the |
60ffdeba6e0e
(diary-file, diary-file-name-prefix)
Glenn Morris <rgm@gnu.org>
parents:
49828
diff
changeset
|
2415 name of the day of the week." |
92969
bb4fc128d00d
(european-calendar-style, calendar-for-loop)
Glenn Morris <rgm@gnu.org>
parents:
92930
diff
changeset
|
2416 (let* ((dayname (unless nodayname (calendar-day-name date abbreviate))) |
93808
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
2417 (month (calendar-extract-month date)) |
52115
60ffdeba6e0e
(diary-file, diary-file-name-prefix)
Glenn Morris <rgm@gnu.org>
parents:
49828
diff
changeset
|
2418 (monthname (calendar-month-name month abbreviate)) |
93844
bf9ef749c23e
Replace int-to-string with number-to-string.
Glenn Morris <rgm@gnu.org>
parents:
93815
diff
changeset
|
2419 (day (number-to-string (calendar-extract-day date))) |
bf9ef749c23e
Replace int-to-string with number-to-string.
Glenn Morris <rgm@gnu.org>
parents:
93815
diff
changeset
|
2420 (month (number-to-string month)) |
bf9ef749c23e
Replace int-to-string with number-to-string.
Glenn Morris <rgm@gnu.org>
parents:
93815
diff
changeset
|
2421 (year (number-to-string (calendar-extract-year date)))) |
628 | 2422 (mapconcat 'eval calendar-date-display-form ""))) |
2423 | |
2424 (defun calendar-dayname-on-or-before (dayname date) | |
31730
719a230f8091
Docstring fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31671
diff
changeset
|
2425 "Return the absolute date of the DAYNAME on or before absolute DATE. |
628 | 2426 DAYNAME=0 means Sunday, DAYNAME=1 means Monday, and so on. |
2427 | |
2428 Note: Applying this function to d+6 gives us the DAYNAME on or after an | |
2429 absolute day d. Similarly, applying it to d+3 gives the DAYNAME nearest to | |
2430 absolute date d, applying it to d-1 gives the DAYNAME previous to absolute | |
2431 date d, and applying it to d+7 gives the DAYNAME following absolute date d." | |
2432 (- date (% (- date dayname) 7))) | |
2433 | |
4658
a34bd3ee36ef
(solar-holidays): Use new
Paul Eggert <eggert@twinsun.com>
parents:
4652
diff
changeset
|
2434 (defun calendar-nth-named-absday (n dayname month year &optional day) |
94454
0246f8c8f19e
(calendar-nth-named-absday, calendar-nth-named-day): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
94311
diff
changeset
|
2435 "Absolute date of the Nth DAYNAME after/before MONTH YEAR DAY. |
0246f8c8f19e
(calendar-nth-named-absday, calendar-nth-named-day): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
94311
diff
changeset
|
2436 A DAYNAME of 0 means Sunday, 1 means Monday, and so on. |
4658
a34bd3ee36ef
(solar-holidays): Use new
Paul Eggert <eggert@twinsun.com>
parents:
4652
diff
changeset
|
2437 If N>0, return the Nth DAYNAME after MONTH DAY, YEAR (inclusive). |
94454
0246f8c8f19e
(calendar-nth-named-absday, calendar-nth-named-day): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
94311
diff
changeset
|
2438 If N<0, return the Nth DAYNAME before MONTH DAY, YEAR (inclusive). |
0246f8c8f19e
(calendar-nth-named-absday, calendar-nth-named-day): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
94311
diff
changeset
|
2439 DAY defaults to 1 if N>0, and MONTH's last day otherwise." |
4658
a34bd3ee36ef
(solar-holidays): Use new
Paul Eggert <eggert@twinsun.com>
parents:
4652
diff
changeset
|
2440 (if (> n 0) |
a34bd3ee36ef
(solar-holidays): Use new
Paul Eggert <eggert@twinsun.com>
parents:
4652
diff
changeset
|
2441 (+ (* 7 (1- n)) |
92858 | 2442 (calendar-dayname-on-or-before |
2443 dayname | |
2444 (+ 6 (calendar-absolute-from-gregorian | |
2445 (list month (or day 1) year))))) | |
4658
a34bd3ee36ef
(solar-holidays): Use new
Paul Eggert <eggert@twinsun.com>
parents:
4652
diff
changeset
|
2446 (+ (* 7 (1+ n)) |
a34bd3ee36ef
(solar-holidays): Use new
Paul Eggert <eggert@twinsun.com>
parents:
4652
diff
changeset
|
2447 (calendar-dayname-on-or-before |
92858 | 2448 dayname |
2449 (calendar-absolute-from-gregorian | |
2450 (list month | |
2451 (or day (calendar-last-day-of-month month year)) | |
2452 year)))))) | |
4658
a34bd3ee36ef
(solar-holidays): Use new
Paul Eggert <eggert@twinsun.com>
parents:
4652
diff
changeset
|
2453 |
3865
2c6883d0a1b2
* calendar.el (calendar-version): Update to 5.1. Fixed a variety
Jim Blandy <jimb@redhat.com>
parents:
3778
diff
changeset
|
2454 (defun calendar-nth-named-day (n dayname month year &optional day) |
94454
0246f8c8f19e
(calendar-nth-named-absday, calendar-nth-named-day): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
94311
diff
changeset
|
2455 "Date of the Nth DAYNAME after/before MONTH YEAR DAY. |
93528
6fb229e96593
(diary-entry-marker, calendar-today-marker, calendar-holiday-marker)
Glenn Morris <rgm@gnu.org>
parents:
93510
diff
changeset
|
2456 Like `calendar-nth-named-absday', but returns a Gregorian date." |
628 | 2457 (calendar-gregorian-from-absolute |
4658
a34bd3ee36ef
(solar-holidays): Use new
Paul Eggert <eggert@twinsun.com>
parents:
4652
diff
changeset
|
2458 (calendar-nth-named-absday n dayname month year day))) |
628 | 2459 |
5694
69471d331d0c
(calendar-version): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5272
diff
changeset
|
2460 (defun calendar-day-of-year-string (&optional date) |
69471d331d0c
(calendar-version): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5272
diff
changeset
|
2461 "String of day number of year of Gregorian DATE. |
69471d331d0c
(calendar-version): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5272
diff
changeset
|
2462 Defaults to today's date if DATE is not given." |
69471d331d0c
(calendar-version): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5272
diff
changeset
|
2463 (let* ((d (or date (calendar-current-date))) |
93808
2c72483f42c9
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Glenn Morris <rgm@gnu.org>
parents:
93791
diff
changeset
|
2464 (year (calendar-extract-year d)) |
5694
69471d331d0c
(calendar-version): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5272
diff
changeset
|
2465 (day (calendar-day-number d)) |
69471d331d0c
(calendar-version): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5272
diff
changeset
|
2466 (days-remaining (- (calendar-day-number (list 12 31 year)) day))) |
69471d331d0c
(calendar-version): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5272
diff
changeset
|
2467 (format "Day %d of %d; %d day%s remaining in the year" |
69471d331d0c
(calendar-version): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5272
diff
changeset
|
2468 day year days-remaining (if (= days-remaining 1) "" "s")))) |
69471d331d0c
(calendar-version): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5272
diff
changeset
|
2469 |
93091
b801762e0062
(calendar-other-dates): New function.
Glenn Morris <rgm@gnu.org>
parents:
93043
diff
changeset
|
2470 (defun calendar-other-dates (date) |
b801762e0062
(calendar-other-dates): New function.
Glenn Morris <rgm@gnu.org>
parents:
93043
diff
changeset
|
2471 "Return a list of strings giving Gregorian DATE in other calendars. |
b801762e0062
(calendar-other-dates): New function.
Glenn Morris <rgm@gnu.org>
parents:
93043
diff
changeset
|
2472 DATE is (month day year). Calendars that do not apply are omitted." |
b801762e0062
(calendar-other-dates): New function.
Glenn Morris <rgm@gnu.org>
parents:
93043
diff
changeset
|
2473 (let (odate) |
b801762e0062
(calendar-other-dates): New function.
Glenn Morris <rgm@gnu.org>
parents:
93043
diff
changeset
|
2474 (delq nil |
b801762e0062
(calendar-other-dates): New function.
Glenn Morris <rgm@gnu.org>
parents:
93043
diff
changeset
|
2475 (list |
b801762e0062
(calendar-other-dates): New function.
Glenn Morris <rgm@gnu.org>
parents:
93043
diff
changeset
|
2476 (calendar-day-of-year-string date) |
b801762e0062
(calendar-other-dates): New function.
Glenn Morris <rgm@gnu.org>
parents:
93043
diff
changeset
|
2477 (format "ISO date: %s" (calendar-iso-date-string date)) |
b801762e0062
(calendar-other-dates): New function.
Glenn Morris <rgm@gnu.org>
parents:
93043
diff
changeset
|
2478 (format "Julian date: %s" |
b801762e0062
(calendar-other-dates): New function.
Glenn Morris <rgm@gnu.org>
parents:
93043
diff
changeset
|
2479 (calendar-julian-date-string date)) |
b801762e0062
(calendar-other-dates): New function.
Glenn Morris <rgm@gnu.org>
parents:
93043
diff
changeset
|
2480 (format "Astronomical (Julian) day number (at noon UTC): %s.0" |
b801762e0062
(calendar-other-dates): New function.
Glenn Morris <rgm@gnu.org>
parents:
93043
diff
changeset
|
2481 (calendar-astro-date-string date)) |
b801762e0062
(calendar-other-dates): New function.
Glenn Morris <rgm@gnu.org>
parents:
93043
diff
changeset
|
2482 (format "Fixed (RD) date: %s" |
b801762e0062
(calendar-other-dates): New function.
Glenn Morris <rgm@gnu.org>
parents:
93043
diff
changeset
|
2483 (calendar-absolute-from-gregorian date)) |
b801762e0062
(calendar-other-dates): New function.
Glenn Morris <rgm@gnu.org>
parents:
93043
diff
changeset
|
2484 (format "Hebrew date (before sunset): %s" |
b801762e0062
(calendar-other-dates): New function.
Glenn Morris <rgm@gnu.org>
parents:
93043
diff
changeset
|
2485 (calendar-hebrew-date-string date)) |
b801762e0062
(calendar-other-dates): New function.
Glenn Morris <rgm@gnu.org>
parents:
93043
diff
changeset
|
2486 (format "Persian date: %s" |
b801762e0062
(calendar-other-dates): New function.
Glenn Morris <rgm@gnu.org>
parents:
93043
diff
changeset
|
2487 (calendar-persian-date-string date)) |
b801762e0062
(calendar-other-dates): New function.
Glenn Morris <rgm@gnu.org>
parents:
93043
diff
changeset
|
2488 (unless (string-equal |
b801762e0062
(calendar-other-dates): New function.
Glenn Morris <rgm@gnu.org>
parents:
93043
diff
changeset
|
2489 (setq odate (calendar-islamic-date-string date)) |
b801762e0062
(calendar-other-dates): New function.
Glenn Morris <rgm@gnu.org>
parents:
93043
diff
changeset
|
2490 "") |
b801762e0062
(calendar-other-dates): New function.
Glenn Morris <rgm@gnu.org>
parents:
93043
diff
changeset
|
2491 (format "Islamic date (before sunset): %s" odate)) |
b801762e0062
(calendar-other-dates): New function.
Glenn Morris <rgm@gnu.org>
parents:
93043
diff
changeset
|
2492 (unless (string-equal |
b801762e0062
(calendar-other-dates): New function.
Glenn Morris <rgm@gnu.org>
parents:
93043
diff
changeset
|
2493 (setq odate (calendar-bahai-date-string date)) |
b801762e0062
(calendar-other-dates): New function.
Glenn Morris <rgm@gnu.org>
parents:
93043
diff
changeset
|
2494 "") |
b801762e0062
(calendar-other-dates): New function.
Glenn Morris <rgm@gnu.org>
parents:
93043
diff
changeset
|
2495 (format "Baha'i date: %s" odate)) |
b801762e0062
(calendar-other-dates): New function.
Glenn Morris <rgm@gnu.org>
parents:
93043
diff
changeset
|
2496 (format "Chinese date: %s" |
b801762e0062
(calendar-other-dates): New function.
Glenn Morris <rgm@gnu.org>
parents:
93043
diff
changeset
|
2497 (calendar-chinese-date-string date)) |
b801762e0062
(calendar-other-dates): New function.
Glenn Morris <rgm@gnu.org>
parents:
93043
diff
changeset
|
2498 (unless (string-equal |
b801762e0062
(calendar-other-dates): New function.
Glenn Morris <rgm@gnu.org>
parents:
93043
diff
changeset
|
2499 (setq odate (calendar-coptic-date-string date)) |
b801762e0062
(calendar-other-dates): New function.
Glenn Morris <rgm@gnu.org>
parents:
93043
diff
changeset
|
2500 "") |
b801762e0062
(calendar-other-dates): New function.
Glenn Morris <rgm@gnu.org>
parents:
93043
diff
changeset
|
2501 (format "Coptic date: %s" odate)) |
b801762e0062
(calendar-other-dates): New function.
Glenn Morris <rgm@gnu.org>
parents:
93043
diff
changeset
|
2502 (unless (string-equal |
b801762e0062
(calendar-other-dates): New function.
Glenn Morris <rgm@gnu.org>
parents:
93043
diff
changeset
|
2503 (setq odate (calendar-ethiopic-date-string date)) |
b801762e0062
(calendar-other-dates): New function.
Glenn Morris <rgm@gnu.org>
parents:
93043
diff
changeset
|
2504 "") |
b801762e0062
(calendar-other-dates): New function.
Glenn Morris <rgm@gnu.org>
parents:
93043
diff
changeset
|
2505 (format "Ethiopic date: %s" odate)) |
b801762e0062
(calendar-other-dates): New function.
Glenn Morris <rgm@gnu.org>
parents:
93043
diff
changeset
|
2506 (unless (string-equal |
b801762e0062
(calendar-other-dates): New function.
Glenn Morris <rgm@gnu.org>
parents:
93043
diff
changeset
|
2507 (setq odate (calendar-french-date-string date)) |
b801762e0062
(calendar-other-dates): New function.
Glenn Morris <rgm@gnu.org>
parents:
93043
diff
changeset
|
2508 "") |
b801762e0062
(calendar-other-dates): New function.
Glenn Morris <rgm@gnu.org>
parents:
93043
diff
changeset
|
2509 (format "French Revolutionary date: %s" odate)) |
b801762e0062
(calendar-other-dates): New function.
Glenn Morris <rgm@gnu.org>
parents:
93043
diff
changeset
|
2510 (format "Mayan date: %s" |
b801762e0062
(calendar-other-dates): New function.
Glenn Morris <rgm@gnu.org>
parents:
93043
diff
changeset
|
2511 (calendar-mayan-date-string date)))))) |
b801762e0062
(calendar-other-dates): New function.
Glenn Morris <rgm@gnu.org>
parents:
93043
diff
changeset
|
2512 |
105933
8f110099da5c
Update x-popup-menu declaration.
Glenn Morris <rgm@gnu.org>
parents:
105844
diff
changeset
|
2513 (declare-function x-popup-menu "menu.c" (position menu)) |
97422
6e551caf98f6
Add declarations for builds without X.
Glenn Morris <rgm@gnu.org>
parents:
96364
diff
changeset
|
2514 |
96295
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
2515 (defun calendar-print-other-dates (&optional event) |
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
2516 "Show dates on other calendars for date under the cursor. |
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
2517 If called by a mouse-event, pops up a menu with the result." |
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
2518 (interactive (list last-nonmenu-event)) |
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
2519 (let* ((date (calendar-cursor-to-date t event)) |
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
2520 (title (format "%s (Gregorian)" (calendar-date-string date))) |
96313
d0a5d3e21e88
(calendar-intermonth-header, calendar-intermonth-text): Move earlier in file.
Glenn Morris <rgm@gnu.org>
parents:
96295
diff
changeset
|
2521 (others (calendar-other-dates date)) |
96295
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
2522 selection) |
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
2523 (if (mouse-event-p event) |
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
2524 (and (setq selection (cal-menu-x-popup-menu event title |
96313
d0a5d3e21e88
(calendar-intermonth-header, calendar-intermonth-text): Move earlier in file.
Glenn Morris <rgm@gnu.org>
parents:
96295
diff
changeset
|
2525 (mapcar 'list others))) |
96295
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
2526 (call-interactively selection)) |
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
2527 (calendar-in-read-only-buffer calendar-other-calendars-buffer |
f007f1675fd7
(calendar-date-echo-text): Doc fix. Add default :value for sexp type.
Glenn Morris <rgm@gnu.org>
parents:
96158
diff
changeset
|
2528 (calendar-set-mode-line title) |
96313
d0a5d3e21e88
(calendar-intermonth-header, calendar-intermonth-text): Move earlier in file.
Glenn Morris <rgm@gnu.org>
parents:
96295
diff
changeset
|
2529 (insert (mapconcat 'identity others "\n")))))) |
22261
329f546a73ec
Add function to show equivalent date on all available calendars (in parallel
Edward M. Reingold <reingold@emr.cs.iit.edu>
parents:
22028
diff
changeset
|
2530 |
957 | 2531 (defun calendar-print-day-of-year () |
5694
69471d331d0c
(calendar-version): New function.
Richard M. Stallman <rms@gnu.org>
parents:
5272
diff
changeset
|
2532 "Show day number in year/days remaining in year for date under the cursor." |
628 | 2533 (interactive) |
87170
e50a2e215441
* erc-stamp.el (erc-echo-timestamp):
David Kastrup <dak@gnu.org>
parents:
86493
diff
changeset
|
2534 (message "%s" (calendar-day-of-year-string (calendar-cursor-to-date t)))) |
628 | 2535 |
957 | 2536 (defun calendar-set-mode-line (str) |
2537 "Set mode line to STR, centered, surrounded by dashes." | |
68366
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
2538 (let* ((edges (window-edges)) |
54536
934d92d8b496
(calendar-set-mode-line): Use total available mode-line width, rather
Glenn Morris <rgm@gnu.org>
parents:
54128
diff
changeset
|
2539 ;; As per doc of window-width, total visible mode-line length. |
92969
bb4fc128d00d
(european-calendar-style, calendar-for-loop)
Glenn Morris <rgm@gnu.org>
parents:
92930
diff
changeset
|
2540 (width (- (nth 2 edges) (car edges)))) |
101938
0c901689da73
(calendar-window-list): Ignore invisible windows.
Glenn Morris <rgm@gnu.org>
parents:
101910
diff
changeset
|
2541 ;; Hack for --daemon. See bug #2199. |
0c901689da73
(calendar-window-list): Ignore invisible windows.
Glenn Morris <rgm@gnu.org>
parents:
101910
diff
changeset
|
2542 ;; If no frame exists yet, we have no idea what width to use. |
0c901689da73
(calendar-window-list): Ignore invisible windows.
Glenn Morris <rgm@gnu.org>
parents:
101910
diff
changeset
|
2543 (and (= width 10) |
0c901689da73
(calendar-window-list): Ignore invisible windows.
Glenn Morris <rgm@gnu.org>
parents:
101910
diff
changeset
|
2544 (not window-system) |
0c901689da73
(calendar-window-list): Ignore invisible windows.
Glenn Morris <rgm@gnu.org>
parents:
101910
diff
changeset
|
2545 (setq width (or (getenv "COLUMNS") 80))) |
68366
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
2546 (setq mode-line-format |
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
2547 (if buffer-file-name |
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
2548 `("-" mode-line-modified |
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
2549 ,(calendar-string-spread (list str) ?- (- width 6)) |
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
2550 "---") |
f148491791ae
Remove unnecessary leading stars in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67465
diff
changeset
|
2551 (calendar-string-spread (list str) ?- width))))) |
957 | 2552 |
92551
a9c1d203dd4a
(calendar-version): Use emacs-version and make it obsolete. Move to end.
Glenn Morris <rgm@gnu.org>
parents:
92530
diff
changeset
|
2553 (defun calendar-version () |
92697
001682fd0516
(diary-file, hebrew-holidays-1)
Glenn Morris <rgm@gnu.org>
parents:
92681
diff
changeset
|
2554 "Display the Calendar version." |
92551
a9c1d203dd4a
(calendar-version): Use emacs-version and make it obsolete. Move to end.
Glenn Morris <rgm@gnu.org>
parents:
92530
diff
changeset
|
2555 (interactive) |
a9c1d203dd4a
(calendar-version): Use emacs-version and make it obsolete. Move to end.
Glenn Morris <rgm@gnu.org>
parents:
92530
diff
changeset
|
2556 (message "GNU Emacs %s" emacs-version)) |
a9c1d203dd4a
(calendar-version): Use emacs-version and make it obsolete. Move to end.
Glenn Morris <rgm@gnu.org>
parents:
92530
diff
changeset
|
2557 |
a9c1d203dd4a
(calendar-version): Use emacs-version and make it obsolete. Move to end.
Glenn Morris <rgm@gnu.org>
parents:
92530
diff
changeset
|
2558 (make-obsolete 'calendar-version 'emacs-version "23.1") |
a9c1d203dd4a
(calendar-version): Use emacs-version and make it obsolete. Move to end.
Glenn Morris <rgm@gnu.org>
parents:
92530
diff
changeset
|
2559 |
a9c1d203dd4a
(calendar-version): Use emacs-version and make it obsolete. Move to end.
Glenn Morris <rgm@gnu.org>
parents:
92530
diff
changeset
|
2560 |
957 | 2561 (run-hooks 'calendar-load-hook) |
628 | 2562 |
2563 (provide 'calendar) | |
2564 | |
65477
a08c0922f1c4
(calendar-for-loop): Add edebug info.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64826
diff
changeset
|
2565 ;; Local variables: |
a08c0922f1c4
(calendar-for-loop): Add edebug info.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64826
diff
changeset
|
2566 ;; byte-compile-dynamic: t |
a08c0922f1c4
(calendar-for-loop): Add edebug info.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64826
diff
changeset
|
2567 ;; End: |
a08c0922f1c4
(calendar-for-loop): Add edebug info.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64826
diff
changeset
|
2568 |
a08c0922f1c4
(calendar-for-loop): Add edebug info.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64826
diff
changeset
|
2569 ;; arch-tag: 19c61596-c8fb-4c69-bcf1-7dd739919cd8 |
675
85fd29f25c75
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
628
diff
changeset
|
2570 ;;; calendar.el ends here |