2001-07-16 07:46:48 +00:00
|
|
|
;;; calendar.el --- calendar functions
|
1992-07-17 08:15:29 +00:00
|
|
|
|
2001-10-11 21:12:47 +00:00
|
|
|
;; Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1997,
|
2010-01-13 08:35:10 +00:00
|
|
|
;; 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
|
2007-11-27 04:16:37 +00:00
|
|
|
;; Free Software Foundation, Inc.
|
1992-07-22 04:22:42 +00:00
|
|
|
|
1992-07-17 08:15:29 +00:00
|
|
|
;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
|
2005-10-08 04:49:48 +00:00
|
|
|
;; Maintainer: Glenn Morris <rgm@gnu.org>
|
1993-03-18 21:29:42 +00:00
|
|
|
;; Keywords: calendar
|
1995-10-12 15:27:07 +00:00
|
|
|
;; Human-Keywords: calendar, Gregorian calendar, diary, holidays
|
1992-07-17 08:15:29 +00:00
|
|
|
|
1992-05-04 16:48:30 +00:00
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
|
2008-05-06 03:07:58 +00:00
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
1994-04-07 20:31:17 +00:00
|
|
|
;; it under the terms of the GNU General Public License as published by
|
2008-05-06 03:07:58 +00:00
|
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
|
|
;; (at your option) any later version.
|
1994-04-07 20:31:17 +00:00
|
|
|
|
1992-05-04 16:48:30 +00:00
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
1994-04-07 20:31:17 +00:00
|
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
;; GNU General Public License for more details.
|
|
|
|
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
2008-05-06 03:07:58 +00:00
|
|
|
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
|
1992-05-04 16:48:30 +00:00
|
|
|
|
1992-07-17 08:15:29 +00:00
|
|
|
;;; Commentary:
|
|
|
|
|
2004-05-08 12:42:07 +00:00
|
|
|
;; This collection of functions implements a calendar window. It
|
|
|
|
;; generates a calendar for the current month, together with the
|
|
|
|
;; previous and coming months, or for any other three-month period.
|
|
|
|
;; The calendar can be scrolled forward and backward in the window to
|
|
|
|
;; show months in the past or future; the cursor can move forward and
|
|
|
|
;; backward by days, weeks, or months, making it possible, for
|
|
|
|
;; instance, to jump to the date a specified number of days, weeks, or
|
|
|
|
;; months from the date under the cursor. The user can display a list
|
|
|
|
;; of holidays and other notable days for the period shown; the
|
|
|
|
;; notable days can be marked on the calendar, if desired. The user
|
|
|
|
;; can also specify that dates having corresponding diary entries (in
|
|
|
|
;; a file that the user specifies) be marked; the diary entries for
|
|
|
|
;; any date can be viewed in a separate window. The diary and the
|
|
|
|
;; notable days can be viewed independently of the calendar. Dates
|
|
|
|
;; can be translated from the (usual) Gregorian calendar to the day of
|
|
|
|
;; the year/days remaining in year, to the ISO commercial calendar, to
|
|
|
|
;; the Julian (old style) calendar, to the Hebrew calendar, to the
|
|
|
|
;; Islamic calendar, to the Baha'i calendar, to the French
|
|
|
|
;; Revolutionary calendar, to the Mayan calendar, to the Chinese
|
|
|
|
;; calendar, to the Coptic calendar, to the Ethiopic calendar, and to
|
2008-04-01 02:46:29 +00:00
|
|
|
;; the astronomical (Julian) day number. Times of sunrise/sunset can
|
|
|
|
;; be displayed, as can the phases of the moon. Appointment
|
|
|
|
;; notification for diary entries is available. Calendar printing via
|
|
|
|
;; LaTeX is available.
|
1992-08-12 12:50:10 +00:00
|
|
|
|
|
|
|
;; The following files are part of the calendar/diary code:
|
|
|
|
|
2008-04-01 02:46:29 +00:00
|
|
|
;; appt.el Appointment notification
|
|
|
|
;; cal-bahai.el Baha'i calendar
|
|
|
|
;; cal-china.el Chinese calendar
|
|
|
|
;; cal-coptic.el Coptic/Ethiopic calendars
|
|
|
|
;; cal-dst.el Daylight saving time rules
|
|
|
|
;; cal-french.el French revolutionary calendar
|
|
|
|
;; cal-hebrew.el Hebrew calendar
|
|
|
|
;; cal-html.el Calendars in HTML
|
|
|
|
;; cal-islam.el Islamic calendar
|
|
|
|
;; cal-iso.el ISO calendar
|
|
|
|
;; cal-julian.el Julian/astronomical calendars
|
|
|
|
;; cal-mayan.el Mayan calendars
|
|
|
|
;; cal-menu.el Menu support
|
|
|
|
;; cal-move.el Movement in the calendar
|
|
|
|
;; cal-persia.el Persian calendar
|
|
|
|
;; cal-tex.el Calendars in LaTeX
|
|
|
|
;; cal-x.el Dedicated frame functions
|
|
|
|
;; calendar.el This file
|
|
|
|
;; diary-lib.el Diary functions
|
|
|
|
;; holidays.el Holiday functions
|
|
|
|
;; lunar.el Phases of the moon
|
|
|
|
;; solar.el Sunrise/sunset, equinoxes/solstices
|
1992-05-04 16:48:30 +00:00
|
|
|
|
|
|
|
;; Technical details of all the calendrical calculations can be found in
|
2005-03-30 16:55:58 +00:00
|
|
|
;; ``Calendrical Calculations: The Millennium Edition'' by Edward M. Reingold
|
|
|
|
;; and Nachum Dershowitz, Cambridge University Press (2001).
|
1992-08-12 12:50:10 +00:00
|
|
|
|
1997-12-16 19:12:36 +00:00
|
|
|
;; An earlier version of the technical details appeared in
|
1992-05-04 16:48:30 +00:00
|
|
|
;; ``Calendrical Calculations'' by Nachum Dershowitz and Edward M. Reingold,
|
|
|
|
;; Software--Practice and Experience, Volume 20, Number 9 (September, 1990),
|
2005-03-30 16:55:58 +00:00
|
|
|
;; pages 899-928, and in ``Calendrical Calculations, Part II: Three Historical
|
1992-08-12 12:50:10 +00:00
|
|
|
;; Calendars'' by E. M. Reingold, N. Dershowitz, and S. M. Clamen,
|
1993-05-03 22:56:42 +00:00
|
|
|
;; Software--Practice and Experience, Volume 23, Number 4 (April, 1993),
|
|
|
|
;; pages 383-404.
|
1992-08-12 12:50:10 +00:00
|
|
|
|
|
|
|
;; Hard copies of these two papers can be obtained by sending email to
|
|
|
|
;; reingold@cs.uiuc.edu with the SUBJECT "send-paper-cal" (no quotes) and
|
|
|
|
;; the message BODY containing your mailing address (snail).
|
1992-05-04 16:48:30 +00:00
|
|
|
|
2008-03-15 03:00:17 +00:00
|
|
|
|
|
|
|
;; A note on free variables:
|
|
|
|
|
|
|
|
;; The calendar passes around a few dynamically bound variables, which
|
|
|
|
;; unfortunately have rather common names. They are meant to be
|
|
|
|
;; available for external functions, so the names can't be changed.
|
|
|
|
|
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
2008-04-07 01:58:55 +00:00
|
|
|
;; displayed-month, displayed-year: bound in calendar-generate, the
|
2008-03-15 03:00:17 +00:00
|
|
|
;; central month of the 3 month calendar window
|
|
|
|
;; original-date, number: bound in diary-list-entries, the arguments
|
|
|
|
;; with which that function was called.
|
2008-04-06 20:54:25 +00:00
|
|
|
;; date, entry: bound in diary-list-sexp-entries (qv)
|
2008-03-15 03:00:17 +00:00
|
|
|
|
|
|
|
;; Bound in diary-list-entries:
|
2008-04-06 20:54:25 +00:00
|
|
|
;; diary-entries-list: use in d-l, appt.el, and by diary-add-to-list
|
2008-03-15 03:00:17 +00:00
|
|
|
;; diary-saved-point: only used in diary-lib.el, passed to the display func
|
2008-03-16 01:22:58 +00:00
|
|
|
;; date-string: only used in diary-lib.el
|
|
|
|
;; list-only: don't modify the diary-buffer, just return a list of entries
|
|
|
|
;; file-glob-attrs: yuck
|
2008-03-15 03:00:17 +00:00
|
|
|
|
1992-07-17 08:15:29 +00:00
|
|
|
;;; Code:
|
1992-05-04 16:48:30 +00:00
|
|
|
|
2009-11-10 08:11:47 +00:00
|
|
|
(load "cal-loaddefs" nil t)
|
Move many autoloads to separate file, cal-loaddefs.el.
Move defcustoms to start and re-order.
(calendar-month-name-array, calendar-starred-day): No need to declare
for compiler.
(cal-loaddefs): Require it.
(appt, chinese-calendar, calendar-tex): Move custom groups to the
appropriate file.
(diary-entry-marker, calendar-today-marker, calendar-holiday-marker):
Reverse logic.
(diary-face, diary-file-name-prefix-function, diary-include-string)
(diary-glob-file-regexp-prefix, diary-face-attrs)
(diary-file-name-prefix, sexp-diary-entry-symbol)
(print-diary-entries-hook, list-diary-entries-hook)
(nongregorian-diary-listing-hook, mark-diary-entries-hook)
(nongregorian-diary-marking-hook, diary-list-include-blanks):
Move to diary-lib.
(all-christian-calendar-holidays, all-islamic-calendar-holidays)
(all-bahai-calendar-holidays): Doc fix.
(calendar-mark-ring): Add doc-string.
(calendar-starred-day): Defvar it.
(calendar-mode): Make calendar-starred-day local.
(calendar-star-date): No need to make calendar-starred-day local.
2008-03-08 03:47:03 +00:00
|
|
|
|
2008-04-05 18:55:09 +00:00
|
|
|
;; Avoid recursive load of calendar when loading cal-menu. Yuck.
|
2008-03-26 03:13:55 +00:00
|
|
|
(provide 'calendar)
|
Move many autoloads to separate file, cal-loaddefs.el.
Move defcustoms to start and re-order.
(calendar-month-name-array, calendar-starred-day): No need to declare
for compiler.
(cal-loaddefs): Require it.
(appt, chinese-calendar, calendar-tex): Move custom groups to the
appropriate file.
(diary-entry-marker, calendar-today-marker, calendar-holiday-marker):
Reverse logic.
(diary-face, diary-file-name-prefix-function, diary-include-string)
(diary-glob-file-regexp-prefix, diary-face-attrs)
(diary-file-name-prefix, sexp-diary-entry-symbol)
(print-diary-entries-hook, list-diary-entries-hook)
(nongregorian-diary-listing-hook, mark-diary-entries-hook)
(nongregorian-diary-marking-hook, diary-list-include-blanks):
Move to diary-lib.
(all-christian-calendar-holidays, all-islamic-calendar-holidays)
(all-bahai-calendar-holidays): Doc fix.
(calendar-mark-ring): Add doc-string.
(calendar-starred-day): Defvar it.
(calendar-mode): Make calendar-starred-day local.
(calendar-star-date): No need to make calendar-starred-day local.
2008-03-08 03:47:03 +00:00
|
|
|
(require 'cal-menu)
|
|
|
|
|
1997-05-03 04:56:48 +00:00
|
|
|
(defgroup calendar nil
|
|
|
|
"Calendar and time management support."
|
2008-04-10 03:41:41 +00:00
|
|
|
:prefix "calendar-"
|
1997-05-03 04:56:48 +00:00
|
|
|
:group 'applications)
|
|
|
|
|
Move many autoloads to separate file, cal-loaddefs.el.
Move defcustoms to start and re-order.
(calendar-month-name-array, calendar-starred-day): No need to declare
for compiler.
(cal-loaddefs): Require it.
(appt, chinese-calendar, calendar-tex): Move custom groups to the
appropriate file.
(diary-entry-marker, calendar-today-marker, calendar-holiday-marker):
Reverse logic.
(diary-face, diary-file-name-prefix-function, diary-include-string)
(diary-glob-file-regexp-prefix, diary-face-attrs)
(diary-file-name-prefix, sexp-diary-entry-symbol)
(print-diary-entries-hook, list-diary-entries-hook)
(nongregorian-diary-listing-hook, mark-diary-entries-hook)
(nongregorian-diary-marking-hook, diary-list-include-blanks):
Move to diary-lib.
(all-christian-calendar-holidays, all-islamic-calendar-holidays)
(all-bahai-calendar-holidays): Doc fix.
(calendar-mark-ring): Add doc-string.
(calendar-starred-day): Defvar it.
(calendar-mode): Make calendar-starred-day local.
(calendar-star-date): No need to make calendar-starred-day local.
2008-03-08 03:47:03 +00:00
|
|
|
(defgroup calendar-hooks nil
|
|
|
|
"Calendar hooks."
|
|
|
|
:prefix "calendar-"
|
1997-05-03 04:56:48 +00:00
|
|
|
:group 'calendar)
|
|
|
|
|
2008-04-12 03:11:03 +00:00
|
|
|
(defgroup calendar-faces nil
|
|
|
|
"Calendar faces."
|
|
|
|
:prefix "calendar-"
|
|
|
|
:group 'calendar)
|
|
|
|
|
Move many autoloads to separate file, cal-loaddefs.el.
Move defcustoms to start and re-order.
(calendar-month-name-array, calendar-starred-day): No need to declare
for compiler.
(cal-loaddefs): Require it.
(appt, chinese-calendar, calendar-tex): Move custom groups to the
appropriate file.
(diary-entry-marker, calendar-today-marker, calendar-holiday-marker):
Reverse logic.
(diary-face, diary-file-name-prefix-function, diary-include-string)
(diary-glob-file-regexp-prefix, diary-face-attrs)
(diary-file-name-prefix, sexp-diary-entry-symbol)
(print-diary-entries-hook, list-diary-entries-hook)
(nongregorian-diary-listing-hook, mark-diary-entries-hook)
(nongregorian-diary-marking-hook, diary-list-include-blanks):
Move to diary-lib.
(all-christian-calendar-holidays, all-islamic-calendar-holidays)
(all-bahai-calendar-holidays): Doc fix.
(calendar-mark-ring): Add doc-string.
(calendar-starred-day): Defvar it.
(calendar-mode): Make calendar-starred-day local.
(calendar-star-date): No need to make calendar-starred-day local.
2008-03-08 03:47:03 +00:00
|
|
|
(defcustom calendar-offset 0
|
|
|
|
"The offset of the principal month from the center of the calendar window.
|
|
|
|
0 means the principal month is in the center (default), -1 means on the left,
|
|
|
|
+1 means on the right. Larger (or smaller) values push the principal month off
|
|
|
|
the screen."
|
|
|
|
:type 'integer
|
1997-05-03 04:56:48 +00:00
|
|
|
:group 'calendar)
|
|
|
|
|
Move many autoloads to separate file, cal-loaddefs.el.
Move defcustoms to start and re-order.
(calendar-month-name-array, calendar-starred-day): No need to declare
for compiler.
(cal-loaddefs): Require it.
(appt, chinese-calendar, calendar-tex): Move custom groups to the
appropriate file.
(diary-entry-marker, calendar-today-marker, calendar-holiday-marker):
Reverse logic.
(diary-face, diary-file-name-prefix-function, diary-include-string)
(diary-glob-file-regexp-prefix, diary-face-attrs)
(diary-file-name-prefix, sexp-diary-entry-symbol)
(print-diary-entries-hook, list-diary-entries-hook)
(nongregorian-diary-listing-hook, mark-diary-entries-hook)
(nongregorian-diary-marking-hook, diary-list-include-blanks):
Move to diary-lib.
(all-christian-calendar-holidays, all-islamic-calendar-holidays)
(all-bahai-calendar-holidays): Doc fix.
(calendar-mark-ring): Add doc-string.
(calendar-starred-day): Defvar it.
(calendar-mode): Make calendar-starred-day local.
(calendar-star-date): No need to make calendar-starred-day local.
2008-03-08 03:47:03 +00:00
|
|
|
(defcustom calendar-setup nil
|
|
|
|
"The frame setup of the calendar.
|
|
|
|
The choices are: `one-frame' (calendar and diary together in one separate,
|
|
|
|
dedicated frame); `two-frames' (calendar and diary in separate, dedicated
|
|
|
|
frames); `calendar-only' (calendar in a separate, dedicated frame); with
|
|
|
|
any other value the current frame is used. Using any of the first
|
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
2008-04-07 01:58:55 +00:00
|
|
|
three options overrides the value of `calendar-view-diary-initially-flag'."
|
Move many autoloads to separate file, cal-loaddefs.el.
Move defcustoms to start and re-order.
(calendar-month-name-array, calendar-starred-day): No need to declare
for compiler.
(cal-loaddefs): Require it.
(appt, chinese-calendar, calendar-tex): Move custom groups to the
appropriate file.
(diary-entry-marker, calendar-today-marker, calendar-holiday-marker):
Reverse logic.
(diary-face, diary-file-name-prefix-function, diary-include-string)
(diary-glob-file-regexp-prefix, diary-face-attrs)
(diary-file-name-prefix, sexp-diary-entry-symbol)
(print-diary-entries-hook, list-diary-entries-hook)
(nongregorian-diary-listing-hook, mark-diary-entries-hook)
(nongregorian-diary-marking-hook, diary-list-include-blanks):
Move to diary-lib.
(all-christian-calendar-holidays, all-islamic-calendar-holidays)
(all-bahai-calendar-holidays): Doc fix.
(calendar-mark-ring): Add doc-string.
(calendar-starred-day): Defvar it.
(calendar-mode): Make calendar-starred-day local.
(calendar-star-date): No need to make calendar-starred-day local.
2008-03-08 03:47:03 +00:00
|
|
|
:type '(choice
|
|
|
|
(const :tag "calendar and diary in separate frame" one-frame)
|
|
|
|
(const :tag "calendar and diary each in own frame" two-frames)
|
|
|
|
(const :tag "calendar in separate frame" calendar-only)
|
|
|
|
(const :tag "use current frame" nil))
|
1997-05-03 04:56:48 +00:00
|
|
|
:group 'calendar)
|
|
|
|
|
Move many autoloads to separate file, cal-loaddefs.el.
Move defcustoms to start and re-order.
(calendar-month-name-array, calendar-starred-day): No need to declare
for compiler.
(cal-loaddefs): Require it.
(appt, chinese-calendar, calendar-tex): Move custom groups to the
appropriate file.
(diary-entry-marker, calendar-today-marker, calendar-holiday-marker):
Reverse logic.
(diary-face, diary-file-name-prefix-function, diary-include-string)
(diary-glob-file-regexp-prefix, diary-face-attrs)
(diary-file-name-prefix, sexp-diary-entry-symbol)
(print-diary-entries-hook, list-diary-entries-hook)
(nongregorian-diary-listing-hook, mark-diary-entries-hook)
(nongregorian-diary-marking-hook, diary-list-include-blanks):
Move to diary-lib.
(all-christian-calendar-holidays, all-islamic-calendar-holidays)
(all-bahai-calendar-holidays): Doc fix.
(calendar-mark-ring): Add doc-string.
(calendar-starred-day): Defvar it.
(calendar-mode): Make calendar-starred-day local.
(calendar-star-date): No need to make calendar-starred-day local.
2008-03-08 03:47:03 +00:00
|
|
|
(defcustom calendar-minimum-window-height 8
|
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
2008-04-07 01:58:55 +00:00
|
|
|
"Minimum height `calendar-generate-window' should use for calendar window."
|
Move many autoloads to separate file, cal-loaddefs.el.
Move defcustoms to start and re-order.
(calendar-month-name-array, calendar-starred-day): No need to declare
for compiler.
(cal-loaddefs): Require it.
(appt, chinese-calendar, calendar-tex): Move custom groups to the
appropriate file.
(diary-entry-marker, calendar-today-marker, calendar-holiday-marker):
Reverse logic.
(diary-face, diary-file-name-prefix-function, diary-include-string)
(diary-glob-file-regexp-prefix, diary-face-attrs)
(diary-file-name-prefix, sexp-diary-entry-symbol)
(print-diary-entries-hook, list-diary-entries-hook)
(nongregorian-diary-listing-hook, mark-diary-entries-hook)
(nongregorian-diary-marking-hook, diary-list-include-blanks):
Move to diary-lib.
(all-christian-calendar-holidays, all-islamic-calendar-holidays)
(all-bahai-calendar-holidays): Doc fix.
(calendar-mark-ring): Add doc-string.
(calendar-starred-day): Defvar it.
(calendar-mode): Make calendar-starred-day local.
(calendar-star-date): No need to make calendar-starred-day local.
2008-03-08 03:47:03 +00:00
|
|
|
:type 'integer
|
|
|
|
:version "22.1"
|
|
|
|
:group 'calendar)
|
1997-05-03 04:56:48 +00:00
|
|
|
|
2009-10-10 20:50:39 +00:00
|
|
|
;; See discussion in bug#1806.
|
|
|
|
(defcustom calendar-split-width-threshold nil
|
|
|
|
"Value to use for `split-width-threshold' when creating a calendar.
|
|
|
|
This only affects frames wider than the default value of
|
|
|
|
`split-width-threshold'."
|
|
|
|
:type '(choice (const nil)
|
|
|
|
(integer))
|
|
|
|
:version "23.2"
|
|
|
|
:group 'calendar)
|
|
|
|
|
Move many autoloads to separate file, cal-loaddefs.el.
Move defcustoms to start and re-order.
(calendar-month-name-array, calendar-starred-day): No need to declare
for compiler.
(cal-loaddefs): Require it.
(appt, chinese-calendar, calendar-tex): Move custom groups to the
appropriate file.
(diary-entry-marker, calendar-today-marker, calendar-holiday-marker):
Reverse logic.
(diary-face, diary-file-name-prefix-function, diary-include-string)
(diary-glob-file-regexp-prefix, diary-face-attrs)
(diary-file-name-prefix, sexp-diary-entry-symbol)
(print-diary-entries-hook, list-diary-entries-hook)
(nongregorian-diary-listing-hook, mark-diary-entries-hook)
(nongregorian-diary-marking-hook, diary-list-include-blanks):
Move to diary-lib.
(all-christian-calendar-holidays, all-islamic-calendar-holidays)
(all-bahai-calendar-holidays): Doc fix.
(calendar-mark-ring): Add doc-string.
(calendar-starred-day): Defvar it.
(calendar-mode): Make calendar-starred-day local.
(calendar-star-date): No need to make calendar-starred-day local.
2008-03-08 03:47:03 +00:00
|
|
|
(defcustom calendar-week-start-day 0
|
|
|
|
"The day of the week on which a week in the calendar begins.
|
|
|
|
0 means Sunday (default), 1 means Monday, and so on.
|
2005-02-27 20:25:48 +00:00
|
|
|
|
Move many autoloads to separate file, cal-loaddefs.el.
Move defcustoms to start and re-order.
(calendar-month-name-array, calendar-starred-day): No need to declare
for compiler.
(cal-loaddefs): Require it.
(appt, chinese-calendar, calendar-tex): Move custom groups to the
appropriate file.
(diary-entry-marker, calendar-today-marker, calendar-holiday-marker):
Reverse logic.
(diary-face, diary-file-name-prefix-function, diary-include-string)
(diary-glob-file-regexp-prefix, diary-face-attrs)
(diary-file-name-prefix, sexp-diary-entry-symbol)
(print-diary-entries-hook, list-diary-entries-hook)
(nongregorian-diary-listing-hook, mark-diary-entries-hook)
(nongregorian-diary-marking-hook, diary-list-include-blanks):
Move to diary-lib.
(all-christian-calendar-holidays, all-islamic-calendar-holidays)
(all-bahai-calendar-holidays): Doc fix.
(calendar-mark-ring): Add doc-string.
(calendar-starred-day): Defvar it.
(calendar-mode): Make calendar-starred-day local.
(calendar-star-date): No need to make calendar-starred-day local.
2008-03-08 03:47:03 +00:00
|
|
|
If you change this variable directly (without using customize)
|
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
2008-04-07 01:58:55 +00:00
|
|
|
after starting `calendar', you should call `calendar-redraw' to
|
Move many autoloads to separate file, cal-loaddefs.el.
Move defcustoms to start and re-order.
(calendar-month-name-array, calendar-starred-day): No need to declare
for compiler.
(cal-loaddefs): Require it.
(appt, chinese-calendar, calendar-tex): Move custom groups to the
appropriate file.
(diary-entry-marker, calendar-today-marker, calendar-holiday-marker):
Reverse logic.
(diary-face, diary-file-name-prefix-function, diary-include-string)
(diary-glob-file-regexp-prefix, diary-face-attrs)
(diary-file-name-prefix, sexp-diary-entry-symbol)
(print-diary-entries-hook, list-diary-entries-hook)
(nongregorian-diary-listing-hook, mark-diary-entries-hook)
(nongregorian-diary-marking-hook, diary-list-include-blanks):
Move to diary-lib.
(all-christian-calendar-holidays, all-islamic-calendar-holidays)
(all-bahai-calendar-holidays): Doc fix.
(calendar-mark-ring): Add doc-string.
(calendar-starred-day): Defvar it.
(calendar-mode): Make calendar-starred-day local.
(calendar-star-date): No need to make calendar-starred-day local.
2008-03-08 03:47:03 +00:00
|
|
|
update the calendar display to reflect the change, otherwise
|
|
|
|
movement commands will not work correctly."
|
1997-05-03 04:56:48 +00:00
|
|
|
:type 'integer
|
Move many autoloads to separate file, cal-loaddefs.el.
Move defcustoms to start and re-order.
(calendar-month-name-array, calendar-starred-day): No need to declare
for compiler.
(cal-loaddefs): Require it.
(appt, chinese-calendar, calendar-tex): Move custom groups to the
appropriate file.
(diary-entry-marker, calendar-today-marker, calendar-holiday-marker):
Reverse logic.
(diary-face, diary-file-name-prefix-function, diary-include-string)
(diary-glob-file-regexp-prefix, diary-face-attrs)
(diary-file-name-prefix, sexp-diary-entry-symbol)
(print-diary-entries-hook, list-diary-entries-hook)
(nongregorian-diary-listing-hook, mark-diary-entries-hook)
(nongregorian-diary-marking-hook, diary-list-include-blanks):
Move to diary-lib.
(all-christian-calendar-holidays, all-islamic-calendar-holidays)
(all-bahai-calendar-holidays): Doc fix.
(calendar-mark-ring): Add doc-string.
(calendar-starred-day): Defvar it.
(calendar-mode): Make calendar-starred-day local.
(calendar-star-date): No need to make calendar-starred-day local.
2008-03-08 03:47:03 +00:00
|
|
|
;; Change the initialize so that if you reload calendar.el, it will not
|
|
|
|
;; cause a redraw (which may fail, e.g. with "invalid byte-code in
|
|
|
|
;; calendar.elc" because of the "byte-compile-dynamic").
|
|
|
|
:initialize 'custom-initialize-default
|
|
|
|
:set (lambda (sym val)
|
|
|
|
(set sym val)
|
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
2008-04-07 01:58:55 +00:00
|
|
|
(calendar-redraw))
|
1997-05-03 04:56:48 +00:00
|
|
|
:group 'calendar)
|
1994-10-26 15:26:22 +00:00
|
|
|
|
2008-04-12 03:11:03 +00:00
|
|
|
(define-obsolete-variable-alias 'view-diary-entries-initially
|
|
|
|
'calendar-view-diary-initially-flag "23.1")
|
|
|
|
|
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
2008-04-07 01:58:55 +00:00
|
|
|
(defcustom calendar-view-diary-initially-flag nil
|
2006-01-24 17:07:29 +00:00
|
|
|
"Non-nil means display current date's diary entries on entry to calendar.
|
1992-05-04 16:48:30 +00:00
|
|
|
The diary is displayed in another window when the calendar is first displayed,
|
|
|
|
if the current date is visible. The number of days of diary entries displayed
|
2008-04-06 20:54:25 +00:00
|
|
|
is governed by the variable `diary-number-of-entries'. This variable can
|
2004-01-11 22:26:46 +00:00
|
|
|
be overridden by the value of `calendar-setup'."
|
1997-05-03 04:56:48 +00:00
|
|
|
:type 'boolean
|
|
|
|
:group 'diary)
|
1992-05-04 16:48:30 +00:00
|
|
|
|
2008-04-12 03:11:03 +00:00
|
|
|
(define-obsolete-variable-alias 'mark-diary-entries-in-calendar
|
|
|
|
'calendar-mark-diary-entries-flag "23.1")
|
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
2008-04-07 01:58:55 +00:00
|
|
|
|
2009-02-08 01:52:01 +00:00
|
|
|
;; FIXME :set
|
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
2008-04-07 01:58:55 +00:00
|
|
|
(defcustom calendar-mark-diary-entries-flag nil
|
2006-01-24 17:07:29 +00:00
|
|
|
"Non-nil means mark dates with diary entries, in the calendar window.
|
1997-05-03 04:56:48 +00:00
|
|
|
The marking symbol is specified by the variable `diary-entry-marker'."
|
|
|
|
:type 'boolean
|
|
|
|
:group 'diary)
|
1992-05-04 16:48:30 +00:00
|
|
|
|
2008-03-25 03:42:55 +00:00
|
|
|
(defcustom calendar-remove-frame-by-deleting t
|
2006-01-24 17:07:29 +00:00
|
|
|
"Determine how the calendar mode removes a frame no longer needed.
|
1999-11-12 16:05:16 +00:00
|
|
|
If nil, make an icon of the frame. If non-nil, delete the frame."
|
|
|
|
:type 'boolean
|
2008-03-25 03:42:55 +00:00
|
|
|
:version "23.1" ; changed from nil to t
|
|
|
|
:group 'view
|
|
|
|
:group 'calendar)
|
1999-11-12 16:05:16 +00:00
|
|
|
|
Move many autoloads to separate file, cal-loaddefs.el.
Move defcustoms to start and re-order.
(calendar-month-name-array, calendar-starred-day): No need to declare
for compiler.
(cal-loaddefs): Require it.
(appt, chinese-calendar, calendar-tex): Move custom groups to the
appropriate file.
(diary-entry-marker, calendar-today-marker, calendar-holiday-marker):
Reverse logic.
(diary-face, diary-file-name-prefix-function, diary-include-string)
(diary-glob-file-regexp-prefix, diary-face-attrs)
(diary-file-name-prefix, sexp-diary-entry-symbol)
(print-diary-entries-hook, list-diary-entries-hook)
(nongregorian-diary-listing-hook, mark-diary-entries-hook)
(nongregorian-diary-marking-hook, diary-list-include-blanks):
Move to diary-lib.
(all-christian-calendar-holidays, all-islamic-calendar-holidays)
(all-bahai-calendar-holidays): Doc fix.
(calendar-mark-ring): Add doc-string.
(calendar-starred-day): Defvar it.
(calendar-mode): Make calendar-starred-day local.
(calendar-star-date): No need to make calendar-starred-day local.
2008-03-08 03:47:03 +00:00
|
|
|
(defface calendar-today
|
|
|
|
'((t (:underline t)))
|
2008-04-12 03:11:03 +00:00
|
|
|
"Face for indicating today's date in the calendar.
|
2009-08-31 01:33:43 +00:00
|
|
|
See the variable `calendar-today-marker'."
|
2008-04-12 03:11:03 +00:00
|
|
|
:group 'calendar-faces)
|
2009-08-31 01:33:43 +00:00
|
|
|
|
|
|
|
(define-obsolete-face-alias 'calendar-today-face 'calendar-today "22.1")
|
Move many autoloads to separate file, cal-loaddefs.el.
Move defcustoms to start and re-order.
(calendar-month-name-array, calendar-starred-day): No need to declare
for compiler.
(cal-loaddefs): Require it.
(appt, chinese-calendar, calendar-tex): Move custom groups to the
appropriate file.
(diary-entry-marker, calendar-today-marker, calendar-holiday-marker):
Reverse logic.
(diary-face, diary-file-name-prefix-function, diary-include-string)
(diary-glob-file-regexp-prefix, diary-face-attrs)
(diary-file-name-prefix, sexp-diary-entry-symbol)
(print-diary-entries-hook, list-diary-entries-hook)
(nongregorian-diary-listing-hook, mark-diary-entries-hook)
(nongregorian-diary-marking-hook, diary-list-include-blanks):
Move to diary-lib.
(all-christian-calendar-holidays, all-islamic-calendar-holidays)
(all-bahai-calendar-holidays): Doc fix.
(calendar-mark-ring): Add doc-string.
(calendar-starred-day): Defvar it.
(calendar-mode): Make calendar-starred-day local.
(calendar-star-date): No need to make calendar-starred-day local.
2008-03-08 03:47:03 +00:00
|
|
|
|
2005-06-10 10:43:42 +00:00
|
|
|
(defface diary
|
* mh-customize.el (mh-speedbar-selected-folder-face): Special case
high number of colors displays.
* textmodes/table.el (table-cell-face): Add special case for
displays supporting a high number of colors.
* progmodes/vhdl-mode.el (vhdl-font-lock-prompt-face)
(vhdl-font-lock-reserved-words-face)
(vhdl-speedbar-architecture-face)
(vhdl-speedbar-instantiation-face)
(vhdl-speedbar-architecture-selected-face)
(vhdl-speedbar-instantiation-selected-face): Likewise.
* progmodes/sh-script.el (sh-heredoc-face): Likewise.
* progmodes/idlw-help.el (idlwave-help-link-face): Likewise.
* progmodes/ebrowse.el (ebrowse-tree-mark-face)
(ebrowse-root-class-face, ebrowse-member-attribute-face)
(ebrowse-progress-face): Likewise.
* progmodes/compile.el (compilation-info-face): Likewise.
* progmodes/cc-fonts.el (c-invalid-face): Likewise.
* emacs-lisp/re-builder.el (reb-match-3): Likewise.
* calendar/calendar.el (diary-face): Likewise.
* woman.el (woman-italic-face, woman-bold-face)
(woman-unknown-face): Likewise.
* wid-edit.el (widget-button-pressed-face): Likewise.
* whitespace.el (whitespace-highlight-face): Likewise.
* smerge-mode.el (smerge-mine-face, smerge-base-face): Likewise.
* pcvs-info.el (cvs-marked-face): Likewise.
* info.el (info-xref): Likewise.
* ido.el (ido-subdir-face, ido-indicator-face): Likewise.
* hilit-chg.el (highlight-changes-face)
(highlight-changes-delete-face): Likewise.
* hi-lock.el (hi-yellow, hi-green, hi-blue-b, hi-green-b)
(hi-red-b): Likewise.
* generic-x.el (show-tabs-tab-face, show-tabs-space-face): Likewise.
* font-lock.el (font-lock-keyword-face)
(font-lock-function-name-face, font-lock-warning-face): Likewise.
* cus-edit.el (custom-invalid-face, custom-modified-face)
(custom-set-face, custom-changed-face, custom-variable-tag-face)
(custom-group-tag-face-1, custom-group-tag-face): Likewise.
* comint.el (comint-highlight-prompt): Likewise.
2005-04-08 14:26:13 +00:00
|
|
|
'((((min-colors 88) (class color) (background light))
|
|
|
|
:foreground "red1")
|
|
|
|
(((class color) (background light))
|
2000-11-05 03:49:38 +00:00
|
|
|
:foreground "red")
|
* mh-customize.el (mh-speedbar-selected-folder-face): Special case
high number of colors displays.
* textmodes/table.el (table-cell-face): Add special case for
displays supporting a high number of colors.
* progmodes/vhdl-mode.el (vhdl-font-lock-prompt-face)
(vhdl-font-lock-reserved-words-face)
(vhdl-speedbar-architecture-face)
(vhdl-speedbar-instantiation-face)
(vhdl-speedbar-architecture-selected-face)
(vhdl-speedbar-instantiation-selected-face): Likewise.
* progmodes/sh-script.el (sh-heredoc-face): Likewise.
* progmodes/idlw-help.el (idlwave-help-link-face): Likewise.
* progmodes/ebrowse.el (ebrowse-tree-mark-face)
(ebrowse-root-class-face, ebrowse-member-attribute-face)
(ebrowse-progress-face): Likewise.
* progmodes/compile.el (compilation-info-face): Likewise.
* progmodes/cc-fonts.el (c-invalid-face): Likewise.
* emacs-lisp/re-builder.el (reb-match-3): Likewise.
* calendar/calendar.el (diary-face): Likewise.
* woman.el (woman-italic-face, woman-bold-face)
(woman-unknown-face): Likewise.
* wid-edit.el (widget-button-pressed-face): Likewise.
* whitespace.el (whitespace-highlight-face): Likewise.
* smerge-mode.el (smerge-mine-face, smerge-base-face): Likewise.
* pcvs-info.el (cvs-marked-face): Likewise.
* info.el (info-xref): Likewise.
* ido.el (ido-subdir-face, ido-indicator-face): Likewise.
* hilit-chg.el (highlight-changes-face)
(highlight-changes-delete-face): Likewise.
* hi-lock.el (hi-yellow, hi-green, hi-blue-b, hi-green-b)
(hi-red-b): Likewise.
* generic-x.el (show-tabs-tab-face, show-tabs-space-face): Likewise.
* font-lock.el (font-lock-keyword-face)
(font-lock-function-name-face, font-lock-warning-face): Likewise.
* cus-edit.el (custom-invalid-face, custom-modified-face)
(custom-set-face, custom-changed-face, custom-variable-tag-face)
(custom-group-tag-face-1, custom-group-tag-face): Likewise.
* comint.el (comint-highlight-prompt): Likewise.
2005-04-08 14:26:13 +00:00
|
|
|
(((min-colors 88) (class color) (background dark))
|
|
|
|
:foreground "yellow1")
|
2000-11-03 03:30:49 +00:00
|
|
|
(((class color) (background dark))
|
2000-11-05 03:49:38 +00:00
|
|
|
:foreground "yellow")
|
2000-11-03 03:30:49 +00:00
|
|
|
(t
|
2001-12-31 20:44:44 +00:00
|
|
|
:weight bold))
|
2008-04-12 03:11:03 +00:00
|
|
|
"Face for highlighting diary entries.
|
|
|
|
Used to mark diary entries in the calendar (see `diary-entry-marker'),
|
|
|
|
and to highlight the date header in the fancy diary."
|
|
|
|
:group 'calendar-faces)
|
2009-08-31 01:33:43 +00:00
|
|
|
|
|
|
|
(define-obsolete-face-alias 'diary-face 'diary "22.1")
|
2000-11-03 03:30:49 +00:00
|
|
|
|
2005-06-10 10:43:42 +00:00
|
|
|
(defface holiday
|
2000-11-03 03:30:49 +00:00
|
|
|
'((((class color) (background light))
|
2000-11-05 03:49:38 +00:00
|
|
|
:background "pink")
|
2000-11-03 03:30:49 +00:00
|
|
|
(((class color) (background dark))
|
2000-11-05 03:49:38 +00:00
|
|
|
:background "chocolate4")
|
2000-11-03 03:30:49 +00:00
|
|
|
(t
|
2000-11-05 03:49:38 +00:00
|
|
|
:inverse-video t))
|
2008-04-12 03:11:03 +00:00
|
|
|
"Face for indicating in the calendar dates that have holidays.
|
|
|
|
See `calendar-holiday-marker'."
|
|
|
|
:group 'calendar-faces)
|
2009-08-31 01:33:43 +00:00
|
|
|
|
|
|
|
(define-obsolete-face-alias 'holiday-face 'holiday "22.1")
|
1997-07-31 15:38:10 +00:00
|
|
|
|
2009-02-09 07:52:54 +00:00
|
|
|
;; These briefly checked font-lock-mode, but that is broken, since it
|
|
|
|
;; is a buffer-local variable, and which buffer happens to be current
|
|
|
|
;; when this file is loaded shouldn't make a difference. One could
|
|
|
|
;; perhaps check global-font-lock-mode, or font-lock-global-modes; but
|
|
|
|
;; this feature doesn't use font-lock, so there's no real reason it
|
|
|
|
;; should respect those either. See bug#2199.
|
|
|
|
;; They also used to check display-color-p, but that is a problem if
|
|
|
|
;; loaded from --daemon. Since BW displays are rare now, this was
|
|
|
|
;; also taken out. The way to keep it would be to have nil mean do a
|
|
|
|
;; runtime check whenever this variable is used.
|
|
|
|
(defcustom diary-entry-marker 'diary
|
2006-01-24 17:07:29 +00:00
|
|
|
"How to mark dates that have diary entries.
|
2009-02-09 07:52:54 +00:00
|
|
|
The value can be either a single-character string (e.g. \"+\") or a face."
|
|
|
|
:type '(choice (string :tag "Single character string") face)
|
2009-02-09 17:26:21 +00:00
|
|
|
:group 'diary
|
|
|
|
:version "23.1")
|
(calendar-version): New function.
Adjustments to commentary at top of file.
(diary-entry-marker, calendar-today-marker,
calendar-holiday-marker): Don't autoload them; change definitions
to support monochrome and color workstations.
(calendar-french-date-string,calendar-mayan-date-string): Autoload them.
(calendar-day-of-year-string, calendar-iso-date-string,
calendar-julian-date-string,calendar-islamic-date-string,
calendar-hebrew-date-string,calendar-astro-date-string): New functions
(calendar-print-day-of-year, calendar-print-iso-date,
calendar-print-iso-date,calendar-print-julian-date,
calendar-print-islamic-date,calendar-print-hebrew-date,
calendar-print-astro-day-number): Use them.
(calendar-mode-map): Add mouse support.
(calendar-unmark,mark-visible-calendar-date,calendar-mark-today):
Rewritten.
1994-01-30 00:25:00 +00:00
|
|
|
|
2009-02-09 07:52:54 +00:00
|
|
|
(defcustom calendar-today-marker 'calendar-today
|
2006-01-24 17:07:29 +00:00
|
|
|
"How to mark today's date in the calendar.
|
2009-02-09 07:52:54 +00:00
|
|
|
The value can be either a single-character string (e.g. \"=\") or a face.
|
2008-03-17 02:30:06 +00:00
|
|
|
Used by `calendar-mark-today'."
|
2009-02-09 07:52:54 +00:00
|
|
|
:type '(choice (string :tag "Single character string") face)
|
2009-02-09 17:26:21 +00:00
|
|
|
:group 'calendar
|
|
|
|
:version "23.1")
|
(calendar-version): New function.
Adjustments to commentary at top of file.
(diary-entry-marker, calendar-today-marker,
calendar-holiday-marker): Don't autoload them; change definitions
to support monochrome and color workstations.
(calendar-french-date-string,calendar-mayan-date-string): Autoload them.
(calendar-day-of-year-string, calendar-iso-date-string,
calendar-julian-date-string,calendar-islamic-date-string,
calendar-hebrew-date-string,calendar-astro-date-string): New functions
(calendar-print-day-of-year, calendar-print-iso-date,
calendar-print-iso-date,calendar-print-julian-date,
calendar-print-islamic-date,calendar-print-hebrew-date,
calendar-print-astro-day-number): Use them.
(calendar-mode-map): Add mouse support.
(calendar-unmark,mark-visible-calendar-date,calendar-mark-today):
Rewritten.
1994-01-30 00:25:00 +00:00
|
|
|
|
2009-02-09 07:52:54 +00:00
|
|
|
(defcustom calendar-holiday-marker 'holiday
|
2006-01-24 17:07:29 +00:00
|
|
|
"How to mark notable dates in the calendar.
|
2009-02-09 07:52:54 +00:00
|
|
|
The value can be either a single-character string (e.g. \"*\") or a face."
|
|
|
|
:type '(choice (string :tag "Single character string") face)
|
2009-02-09 17:26:21 +00:00
|
|
|
:group 'holidays
|
|
|
|
:version "23.1")
|
1992-05-04 16:48:30 +00:00
|
|
|
|
2008-04-12 03:11:03 +00:00
|
|
|
(define-obsolete-variable-alias 'view-calendar-holidays-initially
|
|
|
|
'calendar-view-holidays-initially-flag "23.1")
|
|
|
|
|
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
2008-04-07 01:58:55 +00:00
|
|
|
(defcustom calendar-view-holidays-initially-flag nil
|
2006-01-24 17:07:29 +00:00
|
|
|
"Non-nil means display holidays for current three month period on entry.
|
* calendar.el (calendar-version): Update to 5.1. Fixed a variety
of spelling error in comments and doc strings.
(calendar-sexp-debug): New variable to turn off error catching.
(calendar-absolute-from-gregorian): Removed unused vars month, day.
(view-calendar-holidays-initially, all-hebrew-calendar-holidays,
all-christian-calendar-holidays, all-christian-islamic-holidays,
diary-nonmarking-symbol, hebrew-diary-entry-symbol,
islamic-diary-entry-symbol, diary-include-string,
abbreviated-calendar-year, european-calendar-style,
european-calendar-display-form, american-calendar-display-form,
calendar-date-display-form, print-diary-entries-hook,
list-diary-entries-hook, nongregorian-diary-listing-hook,
nongregorian-diary-marking-hook, diary-list-include-blanks,
holidays-in-diary-buffer, general-holidays,
increment-calendar-month, calendar-sum, calendar-string-spread,
calendar-absolute-from-iso, calendar-print-iso-date,
hebrew-calendar-elapsed-days, list-yahrzeit-dates,
calendar-print-astro-day-number): Fix doc strings.
(calendar-nth-named-day): Rewritten to include optional day of month.
(general-holidays, calendar-holidays, hebrew-holidays,
christian-holidays, islamic-holidays,
solar-holidays): Rewritten to include require of cal-dst.el and to
show the time of the change to/from daylight savings time.
(calendar-current-time-zone, calendar-time-zone,
calendar-daylight-time-offset, calendar-standard-time-zone-name,
calendar-daylight-time-zone-name, calendar-daylight-savings-starts,
calendar-daylight-savings-ends,
calendar-daylight-savings-switchover-time): Moved to cal-dst.el.
(calendar-location-name, calendar-time-display-form, calendar-latitude,
calendar-longitude): Moved to solar.el.
(calendar-holidays): Unquote it!
1993-06-22 03:22:12 +00:00
|
|
|
The holidays are displayed in another window when the calendar is first
|
1997-05-03 04:56:48 +00:00
|
|
|
displayed."
|
|
|
|
:type 'boolean
|
|
|
|
:group 'holidays)
|
1992-05-04 16:48:30 +00:00
|
|
|
|
2008-04-12 03:11:03 +00:00
|
|
|
(define-obsolete-variable-alias 'mark-holidays-in-calendar
|
|
|
|
'calendar-mark-holidays-flag "23.1")
|
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
2008-04-07 01:58:55 +00:00
|
|
|
|
2009-02-08 01:52:01 +00:00
|
|
|
;; FIXME :set
|
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
2008-04-07 01:58:55 +00:00
|
|
|
(defcustom calendar-mark-holidays-flag nil
|
2006-01-24 17:07:29 +00:00
|
|
|
"Non-nil means mark dates of holidays in the calendar window.
|
1997-05-03 04:56:48 +00:00
|
|
|
The marking symbol is specified by the variable `calendar-holiday-marker'."
|
|
|
|
:type 'boolean
|
|
|
|
:group 'holidays)
|
1992-05-04 16:48:30 +00:00
|
|
|
|
2007-03-27 02:36:25 +00:00
|
|
|
(defcustom calendar-mode-hook nil
|
|
|
|
"Hook run when entering `calendar-mode'."
|
|
|
|
:type 'hook
|
|
|
|
:group 'calendar-hooks)
|
|
|
|
|
1997-05-03 04:56:48 +00:00
|
|
|
(defcustom calendar-load-hook nil
|
2006-01-24 17:07:29 +00:00
|
|
|
"List of functions to be called after the calendar is first loaded.
|
1997-05-03 04:56:48 +00:00
|
|
|
This is the place to add key bindings to `calendar-mode-map'."
|
|
|
|
:type 'hook
|
|
|
|
:group 'calendar-hooks)
|
1992-08-12 12:50:10 +00:00
|
|
|
|
2008-04-12 03:11:03 +00:00
|
|
|
(define-obsolete-variable-alias 'initial-calendar-window-hook
|
|
|
|
'calendar-initial-window-hook "23.1")
|
|
|
|
|
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
2008-04-07 01:58:55 +00:00
|
|
|
(defcustom calendar-initial-window-hook nil
|
2008-03-17 02:30:06 +00:00
|
|
|
"List of functions to be called when the calendar window is created.
|
2008-03-18 03:35:58 +00:00
|
|
|
Quitting the calendar and re-entering it will cause these functions
|
2008-03-17 02:30:06 +00:00
|
|
|
to be called again."
|
1997-05-03 04:56:48 +00:00
|
|
|
:type 'hook
|
|
|
|
:group 'calendar-hooks)
|
1992-05-04 16:48:30 +00:00
|
|
|
|
2008-04-12 03:11:03 +00:00
|
|
|
(define-obsolete-variable-alias 'today-visible-calendar-hook
|
|
|
|
'calendar-today-visible-hook "23.1")
|
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
2008-04-07 01:58:55 +00:00
|
|
|
|
|
|
|
(defcustom calendar-today-visible-hook nil
|
2006-01-24 17:07:29 +00:00
|
|
|
"List of functions called whenever the current date is visible.
|
2008-03-17 02:30:06 +00:00
|
|
|
To mark today's date, add the function `calendar-mark-today'.
|
|
|
|
To replace the date with asterisks, add the function `calendar-star-date'.
|
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
2008-04-07 01:58:55 +00:00
|
|
|
See also `calendar-today-invisible-hook'.
|
2008-03-17 02:30:06 +00:00
|
|
|
|
2008-03-18 03:35:58 +00:00
|
|
|
In general, be careful about changing characters in the calendar buffer,
|
|
|
|
since it may cause the movement commands to fail."
|
1997-05-03 04:56:48 +00:00
|
|
|
:type 'hook
|
2008-03-17 02:30:06 +00:00
|
|
|
:options '(calendar-mark-today calendar-star-date)
|
1997-05-03 04:56:48 +00:00
|
|
|
:group 'calendar-hooks)
|
1992-05-04 16:48:30 +00:00
|
|
|
|
2008-04-12 03:11:03 +00:00
|
|
|
(define-obsolete-variable-alias 'today-invisible-calendar-hook
|
|
|
|
'calendar-today-invisible-hook "23.1")
|
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
2008-04-07 01:58:55 +00:00
|
|
|
|
|
|
|
(defcustom calendar-today-invisible-hook nil
|
2006-01-24 17:07:29 +00:00
|
|
|
"List of functions called whenever the current date is not visible.
|
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
2008-04-07 01:58:55 +00:00
|
|
|
See also `calendar-today-visible-hook'."
|
1997-05-03 04:56:48 +00:00
|
|
|
:type 'hook
|
|
|
|
:group 'calendar-hooks)
|
1992-05-04 16:48:30 +00:00
|
|
|
|
1999-08-28 15:18:39 +00:00
|
|
|
(defcustom calendar-move-hook nil
|
2006-01-24 17:07:29 +00:00
|
|
|
"List of functions called whenever the cursor moves in the calendar.
|
1999-11-12 16:05:16 +00:00
|
|
|
For example,
|
1999-08-28 15:18:39 +00:00
|
|
|
|
2005-09-12 21:32:11 +00:00
|
|
|
(add-hook 'calendar-move-hook (lambda () (diary-view-entries 1)))
|
1999-08-28 15:18:39 +00:00
|
|
|
|
|
|
|
redisplays the diary for whatever date the cursor is moved to."
|
|
|
|
:type 'hook
|
2008-06-17 05:56:48 +00:00
|
|
|
:options '(calendar-update-mode-line)
|
1999-08-28 15:18:39 +00:00
|
|
|
:group 'calendar-hooks)
|
|
|
|
|
2008-06-17 05:56:48 +00:00
|
|
|
(defcustom calendar-date-echo-text
|
|
|
|
"mouse-2: general menu\nmouse-3: menu for this date"
|
|
|
|
"String displayed when the cursor is over a date in the calendar.
|
2008-06-26 03:41:20 +00:00
|
|
|
Can be either a fixed string, or a lisp expression that returns one.
|
|
|
|
When this expression is evaluated, DAY, MONTH, and YEAR are
|
2008-06-17 05:56:48 +00:00
|
|
|
integers appropriate to the relevant date. For example, to
|
2008-06-26 03:41:20 +00:00
|
|
|
display the ISO date:
|
|
|
|
|
|
|
|
(setq calendar-date-echo-text '(format \"ISO date: %s\"
|
|
|
|
(calendar-iso-date-string
|
|
|
|
(list month day year))))
|
2008-06-17 05:56:48 +00:00
|
|
|
Changing this variable without using customize has no effect on
|
|
|
|
pre-existing calendar windows."
|
|
|
|
:group 'calendar
|
|
|
|
:initialize 'custom-initialize-default
|
|
|
|
:risky t
|
|
|
|
:set (lambda (sym val)
|
|
|
|
(set sym val)
|
|
|
|
(calendar-redraw))
|
2008-06-26 03:41:20 +00:00
|
|
|
:type '(choice (string :tag "Fixed string")
|
|
|
|
(sexp :value
|
|
|
|
(format "ISO date: %s"
|
|
|
|
(calendar-iso-date-string
|
|
|
|
(list month day year)))))
|
2008-06-17 05:56:48 +00:00
|
|
|
:version "23.1")
|
|
|
|
|
2008-06-21 19:28:09 +00:00
|
|
|
|
|
|
|
(defvar calendar-month-digit-width nil
|
|
|
|
"Width of the region with numbers in each month in the calendar.")
|
|
|
|
|
|
|
|
(defvar calendar-month-width nil
|
|
|
|
"Full width of each month in the calendar.")
|
|
|
|
|
|
|
|
(defvar calendar-right-margin nil
|
|
|
|
"Right margin of the calendar.")
|
|
|
|
|
2008-06-26 03:41:20 +00:00
|
|
|
(defvar calendar-month-edges nil
|
|
|
|
"Alist of month edge columns.
|
|
|
|
Each element has the form (N LEFT FIRST LAST RIGHT), where
|
|
|
|
LEFT is the leftmost column associated with month segment N,
|
|
|
|
FIRST and LAST are the first and last columns with day digits in,
|
|
|
|
and LAST is the rightmost column.")
|
|
|
|
|
|
|
|
(defun calendar-month-edges (segment)
|
|
|
|
"Compute the month edge columns for month SEGMENT.
|
|
|
|
Returns a list (LEFT FIRST LAST RIGHT), where LEFT is the
|
|
|
|
leftmost column associated with a month, FIRST and LAST are the
|
|
|
|
first and last columns with day digits in, and LAST is the
|
|
|
|
rightmost column."
|
|
|
|
;; The leftmost column with a digit in it in this month segment.
|
|
|
|
(let* ((first (+ calendar-left-margin
|
|
|
|
(* segment calendar-month-width)))
|
|
|
|
;; The rightmost column with a digit in it in this month segment.
|
|
|
|
(last (+ first (1- calendar-month-digit-width)))
|
|
|
|
(left (if (eq segment 0)
|
|
|
|
0
|
|
|
|
(+ calendar-left-margin
|
|
|
|
(* segment calendar-month-width)
|
|
|
|
(- (/ calendar-intermonth-spacing 2)))))
|
|
|
|
;; The rightmost edge of this month segment, dividing the
|
|
|
|
;; space between months in two.
|
|
|
|
(right (+ calendar-left-margin
|
|
|
|
(* (1+ segment) calendar-month-width)
|
|
|
|
(- (/ calendar-intermonth-spacing 2)))))
|
|
|
|
(list left first last right)))
|
|
|
|
|
2008-06-21 19:28:09 +00:00
|
|
|
(defun calendar-recompute-layout-variables ()
|
|
|
|
"Recompute some layout-related calendar \"constants\"."
|
|
|
|
(setq calendar-month-digit-width (+ (* 6 calendar-column-width)
|
|
|
|
calendar-day-digit-width)
|
|
|
|
calendar-month-width (+ (* 7 calendar-column-width)
|
|
|
|
calendar-intermonth-spacing)
|
|
|
|
calendar-right-margin (+ calendar-left-margin
|
|
|
|
(* 3 (* 7 calendar-column-width))
|
2008-06-26 03:41:20 +00:00
|
|
|
(* 2 calendar-intermonth-spacing))
|
|
|
|
calendar-month-edges nil)
|
|
|
|
(dotimes (i 3)
|
|
|
|
(push (cons i (calendar-month-edges i)) calendar-month-edges))
|
|
|
|
(setq calendar-month-edges (reverse calendar-month-edges)))
|
2008-06-21 19:28:09 +00:00
|
|
|
|
|
|
|
;; FIXME add font-lock-keywords.
|
|
|
|
(defun calendar-set-layout-variable (symbol value &optional minmax)
|
|
|
|
"Set SYMBOL's value to VALUE, an integer.
|
|
|
|
A positive/negative MINMAX enforces a minimum/maximum value.
|
|
|
|
Then redraw the calendar, if necessary."
|
|
|
|
(let ((oldvalue (symbol-value symbol)))
|
|
|
|
(custom-set-default symbol (if minmax
|
|
|
|
(if (< minmax 0)
|
|
|
|
(min value (- minmax))
|
|
|
|
(max value minmax))
|
|
|
|
value))
|
|
|
|
(unless (equal value oldvalue)
|
|
|
|
(calendar-recompute-layout-variables)
|
|
|
|
(calendar-redraw))))
|
|
|
|
|
|
|
|
(defcustom calendar-left-margin 5
|
|
|
|
"Empty space to the left of the first month in the calendar."
|
|
|
|
:group 'calendar
|
|
|
|
:initialize 'custom-initialize-default
|
|
|
|
:set 'calendar-set-layout-variable
|
|
|
|
:type 'integer
|
|
|
|
:version "23.1")
|
|
|
|
|
|
|
|
;; Or you can view it as columns of width 2, with 1 space, no space
|
|
|
|
;; after the last column, and a 5 space gap between month.
|
|
|
|
;; FIXME check things work if this is odd.
|
|
|
|
(defcustom calendar-intermonth-spacing 4
|
|
|
|
"Space between months in the calendar. Minimum value is 1."
|
|
|
|
:group 'calendar
|
|
|
|
:initialize 'custom-initialize-default
|
|
|
|
:set (lambda (sym val)
|
|
|
|
(calendar-set-layout-variable sym val 1))
|
|
|
|
:type 'integer
|
|
|
|
:version "23.1")
|
|
|
|
|
2008-06-26 03:41:20 +00:00
|
|
|
;; FIXME calendar-month-column-width?
|
2008-06-21 19:28:09 +00:00
|
|
|
(defcustom calendar-column-width 3
|
|
|
|
"Width of each day column in the calendar. Minimum value is 3."
|
|
|
|
:initialize 'custom-initialize-default
|
|
|
|
:set (lambda (sym val)
|
|
|
|
(calendar-set-layout-variable sym val 3))
|
|
|
|
:type 'integer
|
|
|
|
:version "23.1")
|
|
|
|
|
|
|
|
(defcustom calendar-day-header-width 2
|
|
|
|
"Width of the day column headers in the calendar.
|
|
|
|
Must be at least one less than `calendar-column-width'."
|
|
|
|
:group 'calendar
|
|
|
|
:initialize 'custom-initialize-default
|
|
|
|
:set (lambda (sym val)
|
|
|
|
(calendar-set-layout-variable sym val (- 1 calendar-column-width)))
|
|
|
|
:type 'integer
|
|
|
|
:version "23.1")
|
|
|
|
|
|
|
|
;; FIXME a format specifier instead?
|
|
|
|
(defcustom calendar-day-digit-width 2
|
|
|
|
"Width of the day digits in the calendar. Minimum value is 2."
|
|
|
|
:group 'calendar
|
|
|
|
:initialize 'custom-initialize-default
|
|
|
|
:set (lambda (sym val)
|
|
|
|
(calendar-set-layout-variable sym val 2))
|
|
|
|
:type 'integer
|
|
|
|
:version "23.1")
|
|
|
|
|
2008-06-26 06:57:29 +00:00
|
|
|
(defcustom calendar-intermonth-header nil
|
|
|
|
"Header text display in the space to the left of each calendar month.
|
|
|
|
See `calendar-intermonth-text'."
|
|
|
|
:group 'calendar
|
|
|
|
:initialize 'custom-initialize-default
|
|
|
|
:risky t
|
|
|
|
:set (lambda (sym val)
|
|
|
|
(set sym val)
|
|
|
|
(calendar-redraw))
|
|
|
|
:type '(choice (const nil :tag "Nothing")
|
|
|
|
(string :tag "Fixed string")
|
|
|
|
(sexp :value
|
|
|
|
(propertize "WK" 'font-lock-face
|
|
|
|
'font-lock-function-name-face)))
|
|
|
|
:version "23.1")
|
|
|
|
|
|
|
|
(defcustom calendar-intermonth-text nil
|
|
|
|
"Text to display in the space to the left of each calendar month.
|
|
|
|
Can be nil, a fixed string, or a lisp expression that returns a string.
|
|
|
|
When the expression is evaluated, the variables DAY, MONTH and YEAR
|
|
|
|
are integers appropriate for the first day in each week.
|
|
|
|
Will be truncated to the smaller of `calendar-left-margin' and
|
|
|
|
`calendar-intermonth-spacing'. The last character is forced to be a space.
|
|
|
|
For example, to display the ISO week numbers:
|
|
|
|
|
|
|
|
(setq calendar-week-start-day 1
|
|
|
|
calendar-intermonth-text
|
|
|
|
'(propertize
|
|
|
|
(format \"%2d\"
|
|
|
|
(car
|
|
|
|
(calendar-iso-from-absolute
|
|
|
|
(calendar-absolute-from-gregorian (list month day year)))))
|
|
|
|
'font-lock-face 'font-lock-function-name-face))
|
|
|
|
|
|
|
|
See also `calendar-intermonth-header'."
|
|
|
|
:group 'calendar
|
|
|
|
:initialize 'custom-initialize-default
|
|
|
|
:risky t
|
|
|
|
:set (lambda (sym val)
|
|
|
|
(set sym val)
|
|
|
|
(calendar-redraw))
|
|
|
|
:type '(choice (const nil :tag "Nothing")
|
|
|
|
(string :tag "Fixed string")
|
|
|
|
(sexp :value
|
|
|
|
(propertize
|
|
|
|
(format "%2d"
|
|
|
|
(car
|
|
|
|
(calendar-iso-from-absolute
|
|
|
|
(calendar-absolute-from-gregorian
|
|
|
|
(list month day year)))))
|
|
|
|
'font-lock-face 'font-lock-function-name-face)))
|
|
|
|
:version "23.1")
|
2008-06-21 19:28:09 +00:00
|
|
|
|
1997-05-03 04:56:48 +00:00
|
|
|
(defcustom diary-file "~/diary"
|
2006-01-24 17:07:29 +00:00
|
|
|
"Name of the file in which one's personal diary of dates is kept.
|
1992-05-04 16:48:30 +00:00
|
|
|
|
2003-08-03 13:59:13 +00:00
|
|
|
The file's entries are lines beginning with any of the forms
|
2008-03-27 07:28:24 +00:00
|
|
|
specified by the variable `diary-date-forms', which by default
|
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
2008-04-07 01:58:55 +00:00
|
|
|
uses the forms of `diary-american-date-forms':
|
1992-05-04 16:48:30 +00:00
|
|
|
|
|
|
|
MONTH/DAY
|
|
|
|
MONTH/DAY/YEAR
|
|
|
|
MONTHNAME DAY
|
|
|
|
MONTHNAME DAY, YEAR
|
|
|
|
DAYNAME
|
|
|
|
|
2003-08-03 13:59:13 +00:00
|
|
|
with the remainder of the line being the diary entry string for
|
|
|
|
that date. MONTH and DAY are one or two digit numbers, YEAR is a
|
|
|
|
number and may be written in full or abbreviated to the final two
|
2008-04-06 20:54:25 +00:00
|
|
|
digits (if `diary-abbreviated-year-flag' is non-nil). MONTHNAME
|
2008-03-14 02:46:37 +00:00
|
|
|
and DAYNAME can be spelled in full (as specified by the variables
|
2008-03-27 07:28:24 +00:00
|
|
|
`calendar-month-name-array' and `calendar-day-name-array'), or
|
2003-08-03 13:59:13 +00:00
|
|
|
abbreviated (as specified by `calendar-month-abbrev-array' and
|
2008-03-27 07:28:24 +00:00
|
|
|
`calendar-day-abbrev-array') with or without a period. Case is
|
|
|
|
ignored. Any of DAY, MONTH, or MONTHNAME, YEAR can be `*' which
|
|
|
|
matches any day, month, or year, respectively. If the date does
|
|
|
|
not contain a year, it is generic and applies to any year. A
|
|
|
|
DAYNAME entry applies to the appropriate day of the week in every week.
|
2003-08-03 13:59:13 +00:00
|
|
|
|
2008-03-29 02:44:03 +00:00
|
|
|
You can customize `diary-date-forms' to your preferred format.
|
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
2008-04-07 01:58:55 +00:00
|
|
|
Three default styles are provided: `diary-american-date-forms',
|
|
|
|
`diary-european-date-forms', and `diary-iso-date-forms'.
|
2008-03-29 02:44:03 +00:00
|
|
|
You can choose between these by setting `calendar-date-style' in your
|
|
|
|
.emacs file, or by using `calendar-set-date-style' when in the calendar.
|
1992-05-04 16:48:30 +00:00
|
|
|
|
2008-03-27 07:28:24 +00:00
|
|
|
A diary entry can be preceded by the character `diary-nonmarking-symbol'
|
|
|
|
\(ordinarily `&') to make that entry nonmarking--that is, it will not be
|
|
|
|
marked on dates in the calendar window but will appear in a diary window.
|
1992-05-04 16:48:30 +00:00
|
|
|
|
|
|
|
Multiline diary entries are made by indenting lines after the first with
|
|
|
|
either a TAB or one or more spaces.
|
|
|
|
|
|
|
|
Lines not in one the above formats are ignored. Here are some sample diary
|
|
|
|
entries (in the default American style):
|
|
|
|
|
|
|
|
12/22/1988 Twentieth wedding anniversary!!
|
|
|
|
&1/1. Happy New Year!
|
|
|
|
10/22 Ruth's birthday.
|
|
|
|
21: Payday
|
|
|
|
Tuesday--weekly meeting with grad students at 10am
|
|
|
|
Supowit, Shen, Bitner, and Kapoor to attend.
|
|
|
|
1/13/89 Friday the thirteenth!!
|
|
|
|
&thu 4pm squash game with Lloyd.
|
|
|
|
mar 16 Dad's birthday
|
|
|
|
April 15, 1989 Income tax due.
|
|
|
|
&* 15 time cards due.
|
|
|
|
|
|
|
|
If the first line of a diary entry consists only of the date or day name with
|
1994-04-07 20:31:17 +00:00
|
|
|
no trailing blanks or punctuation, then that line is not displayed in the
|
|
|
|
diary window; only the continuation lines is shown. For example, the
|
1992-05-04 16:48:30 +00:00
|
|
|
single diary entry
|
|
|
|
|
|
|
|
02/11/1989
|
|
|
|
Bill Blattner visits Princeton today
|
|
|
|
2pm Cognitive Studies Committee meeting
|
|
|
|
2:30-5:30 Lizzie at Lawrenceville for `Group Initiative'
|
|
|
|
4:00pm Jamie Tappenden
|
|
|
|
7:30pm Dinner at George and Ed's for Alan Ryan
|
|
|
|
7:30-10:00pm dance at Stewart Country Day School
|
|
|
|
|
|
|
|
will appear in the diary window without the date line at the beginning. This
|
|
|
|
facility allows the diary window to look neater, but can cause confusion if
|
|
|
|
used with more than one day's entries displayed.
|
|
|
|
|
|
|
|
Diary entries can be based on Lisp sexps. For example, the diary entry
|
|
|
|
|
|
|
|
%%(diary-block 11 1 1990 11 10 1990) Vacation
|
|
|
|
|
2004-05-08 12:42:07 +00:00
|
|
|
causes the diary entry \"Vacation\" to appear from November 1 through
|
2008-03-27 07:28:24 +00:00
|
|
|
November 10, 1990. See the documentation for the function
|
2008-04-06 20:54:25 +00:00
|
|
|
`diary-list-sexp-entries' for more details.
|
1992-05-04 16:48:30 +00:00
|
|
|
|
2004-05-08 12:42:07 +00:00
|
|
|
Diary entries based on the Hebrew, the Islamic and/or the Baha'i
|
|
|
|
calendar are also possible, but because these are somewhat slow, they
|
2008-04-06 20:54:25 +00:00
|
|
|
are ignored unless you set the `diary-nongregorian-listing-hook' and
|
|
|
|
the `diary-nongregorian-marking-hook' appropriately. See the
|
2008-03-17 02:30:06 +00:00
|
|
|
documentation of these hooks for details.
|
1992-05-04 16:48:30 +00:00
|
|
|
|
|
|
|
Diary files can contain directives to include the contents of other files; for
|
2008-04-06 20:54:25 +00:00
|
|
|
details, see the documentation for the variable `diary-list-entries-hook'."
|
1997-05-03 04:56:48 +00:00
|
|
|
:type 'file
|
|
|
|
:group 'diary)
|
1992-05-04 16:48:30 +00:00
|
|
|
|
2008-03-17 02:30:06 +00:00
|
|
|
;; FIXME do these have to be single characters?
|
1997-05-03 04:56:48 +00:00
|
|
|
(defcustom diary-nonmarking-symbol "&"
|
2006-01-24 17:07:29 +00:00
|
|
|
"Symbol indicating that a diary entry is not to be marked in the calendar."
|
1997-05-03 04:56:48 +00:00
|
|
|
:type 'string
|
|
|
|
:group 'diary)
|
1992-05-04 16:48:30 +00:00
|
|
|
|
2008-04-12 03:11:03 +00:00
|
|
|
(define-obsolete-variable-alias 'hebrew-diary-entry-symbol
|
|
|
|
'diary-hebrew-entry-symbol "23.1")
|
|
|
|
|
2008-04-05 20:20:08 +00:00
|
|
|
(defcustom diary-hebrew-entry-symbol "H"
|
2006-01-24 17:07:29 +00:00
|
|
|
"Symbol indicating a diary entry according to the Hebrew calendar."
|
1997-05-03 04:56:48 +00:00
|
|
|
:type 'string
|
|
|
|
:group 'diary)
|
1992-05-04 16:48:30 +00:00
|
|
|
|
2008-04-12 03:11:03 +00:00
|
|
|
(define-obsolete-variable-alias 'islamic-diary-entry-symbol
|
|
|
|
'diary-islamic-entry-symbol "23.1")
|
2008-04-05 20:20:08 +00:00
|
|
|
|
|
|
|
(defcustom diary-islamic-entry-symbol "I"
|
2006-01-24 17:07:29 +00:00
|
|
|
"Symbol indicating a diary entry according to the Islamic calendar."
|
1997-05-03 04:56:48 +00:00
|
|
|
:type 'string
|
|
|
|
:group 'diary)
|
1992-05-04 16:48:30 +00:00
|
|
|
|
2008-04-12 03:11:03 +00:00
|
|
|
(define-obsolete-variable-alias 'bahai-diary-entry-symbol
|
|
|
|
'diary-bahai-entry-symbol "23.1")
|
2008-04-05 20:20:08 +00:00
|
|
|
|
|
|
|
(defcustom diary-bahai-entry-symbol "B"
|
2006-01-24 17:07:29 +00:00
|
|
|
"Symbol indicating a diary entry according to the Baha'i calendar."
|
2004-05-08 12:42:07 +00:00
|
|
|
:type 'string
|
|
|
|
:group 'diary)
|
|
|
|
|
1997-05-03 04:56:48 +00:00
|
|
|
(defcustom european-calendar-style nil
|
2008-03-29 02:44:03 +00:00
|
|
|
"Non-nil means use the European style of dates in the diary and display.
|
|
|
|
In this case, a date like 1/2/1990 would be interpreted as
|
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
2008-04-07 01:58:55 +00:00
|
|
|
February 1, 1990. See `diary-european-date-forms' for the
|
2008-03-29 02:44:03 +00:00
|
|
|
default European diary date styles.
|
2006-09-30 00:20:16 +00:00
|
|
|
|
|
|
|
Setting this variable directly does not take effect (if the
|
|
|
|
calendar package is already loaded). Rather, use either
|
2008-03-29 02:44:03 +00:00
|
|
|
\\[customize] or the function `calendar-set-date-style'."
|
1997-05-03 04:56:48 +00:00
|
|
|
:type 'boolean
|
2006-09-30 00:20:16 +00:00
|
|
|
;; Without :initialize (require 'calendar) throws an error because
|
2008-03-29 02:44:03 +00:00
|
|
|
;; calendar-set-date-style is undefined at this point.
|
2006-09-30 00:20:16 +00:00
|
|
|
:initialize 'custom-initialize-default
|
2006-09-30 01:25:25 +00:00
|
|
|
:set (lambda (symbol value)
|
|
|
|
(if value
|
2008-03-29 02:44:03 +00:00
|
|
|
(calendar-set-date-style 'european)
|
|
|
|
(calendar-set-date-style 'american)))
|
2008-04-10 03:41:41 +00:00
|
|
|
:group 'calendar)
|
1992-05-04 16:48:30 +00:00
|
|
|
|
2008-03-29 02:44:03 +00:00
|
|
|
(make-obsolete-variable 'european-calendar-style 'calendar-date-style "23.1")
|
|
|
|
|
2008-04-08 07:31:13 +00:00
|
|
|
;; If this is autoloaded, c-d-s gets set before any customization of e-c-s.
|
2008-03-29 02:44:03 +00:00
|
|
|
(defcustom calendar-date-style (if european-calendar-style 'european
|
|
|
|
'american)
|
|
|
|
"Your preferred style for writing dates.
|
|
|
|
The options are:
|
|
|
|
`american' - month/day/year
|
|
|
|
`european' - day/month/year
|
|
|
|
`iso' - year/month/day
|
|
|
|
This affects how dates written in your diary are interpreted.
|
|
|
|
It also affects date display, as well as those calendar and diary
|
|
|
|
functions that take a date as an argument, e.g. `diary-date', by
|
|
|
|
changing the order in which the arguments are interpreted.
|
|
|
|
|
|
|
|
Setting this variable directly does not take effect (if the
|
|
|
|
calendar package is already loaded). Rather, use either
|
|
|
|
\\[customize] or the function `calendar-set-date-style'."
|
|
|
|
:version "23.1"
|
|
|
|
:type '(choice (const american :tag "Month/Day/Year")
|
|
|
|
(const european :tag "Day/Month/Year")
|
|
|
|
(const iso :tag "Year/Month/Day"))
|
|
|
|
:initialize 'custom-initialize-default
|
|
|
|
:set (lambda (symbol value)
|
|
|
|
(calendar-set-date-style value))
|
|
|
|
:group 'calendar)
|
|
|
|
|
|
|
|
;; Next three are provided to aid in setting diary-date-forms.
|
2008-04-11 03:47:38 +00:00
|
|
|
;; FIXME move to diary-lib?
|
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
2008-04-07 01:58:55 +00:00
|
|
|
(defcustom diary-iso-date-forms
|
2008-03-29 02:44:03 +00:00
|
|
|
'((month "[-/]" day "[^-/0-9]")
|
|
|
|
(year "[-/]" month "[-/]" day "[^0-9]")
|
|
|
|
(monthname "-" day "[^-0-9]")
|
|
|
|
(year "-" monthname "-" day "[^0-9]")
|
|
|
|
(dayname "\\W"))
|
|
|
|
"List of pseudo-patterns describing the ISO style of dates.
|
|
|
|
The defaults are: MONTH[-/]DAY; YEAR[-/]MONTH[-/]DAY; MONTHNAME-DAY;
|
|
|
|
YEAR-MONTHNAME-DAY; DAYNAME. Normally you should not customize this,
|
|
|
|
but `diary-date-forms' (which see)."
|
|
|
|
:version "23.1"
|
|
|
|
:type '(repeat (choice (cons :tag "Backup"
|
|
|
|
:value (backup . nil)
|
|
|
|
(const backup)
|
|
|
|
(repeat (list :inline t :format "%v"
|
|
|
|
(symbol :tag "Keyword")
|
|
|
|
(choice symbol regexp))))
|
|
|
|
(repeat (list :inline t :format "%v"
|
|
|
|
(symbol :tag "Keyword")
|
|
|
|
(choice symbol regexp)))))
|
|
|
|
:group 'diary)
|
|
|
|
|
2008-04-12 03:11:03 +00:00
|
|
|
(define-obsolete-variable-alias 'american-date-diary-pattern
|
|
|
|
'diary-american-date-forms "23.1")
|
|
|
|
|
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
2008-04-07 01:58:55 +00:00
|
|
|
(defcustom diary-american-date-forms
|
1992-05-04 16:48:30 +00:00
|
|
|
'((month "/" day "[^/0-9]")
|
|
|
|
(month "/" day "/" year "[^0-9]")
|
|
|
|
(monthname " *" day "[^,0-9]")
|
|
|
|
(monthname " *" day ", *" year "[^0-9]")
|
|
|
|
(dayname "\\W"))
|
2008-03-29 02:44:03 +00:00
|
|
|
"List of pseudo-patterns describing the American style of dates.
|
|
|
|
The defaults are: MONTH/DAY; MONTH/DAY/YEAR; MONTHNAME DAY;
|
|
|
|
MONTHNAME DAY, YEAR; DAYNAME. Normally you should not customize this,
|
|
|
|
but `diary-date-forms' (which see)."
|
1997-05-03 04:56:48 +00:00
|
|
|
:type '(repeat (choice (cons :tag "Backup"
|
2008-03-13 06:29:28 +00:00
|
|
|
:value (backup . nil)
|
|
|
|
(const backup)
|
|
|
|
(repeat (list :inline t :format "%v"
|
|
|
|
(symbol :tag "Keyword")
|
|
|
|
(choice symbol regexp))))
|
|
|
|
(repeat (list :inline t :format "%v"
|
|
|
|
(symbol :tag "Keyword")
|
|
|
|
(choice symbol regexp)))))
|
1997-05-03 04:56:48 +00:00
|
|
|
:group 'diary)
|
1992-05-04 16:48:30 +00:00
|
|
|
|
2008-04-12 03:11:03 +00:00
|
|
|
(define-obsolete-variable-alias 'european-date-diary-pattern
|
|
|
|
'diary-european-date-forms "23.1")
|
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
2008-04-07 01:58:55 +00:00
|
|
|
|
|
|
|
(defcustom diary-european-date-forms
|
1992-05-04 16:48:30 +00:00
|
|
|
'((day "/" month "[^/0-9]")
|
|
|
|
(day "/" month "/" year "[^0-9]")
|
1999-08-02 00:32:50 +00:00
|
|
|
(backup day " *" monthname "\\W+\\<\\([^*0-9]\\|\\([0-9]+[:aApP]\\)\\)")
|
1992-05-04 16:48:30 +00:00
|
|
|
(day " *" monthname " *" year "[^0-9]")
|
|
|
|
(dayname "\\W"))
|
2008-03-29 02:44:03 +00:00
|
|
|
"List of pseudo-patterns describing the European style of dates.
|
|
|
|
The defaults are: DAY/MONTH; DAY/MONTH/YEAR; DAY MONTHNAME;
|
|
|
|
DAY MONTHNAME YEAR; DAYNAME. Normally you should not customize this, but
|
|
|
|
`diary-date-forms' (which see)."
|
1997-05-03 04:56:48 +00:00
|
|
|
:type '(repeat (choice (cons :tag "Backup"
|
2008-03-13 06:29:28 +00:00
|
|
|
:value (backup . nil)
|
|
|
|
(const backup)
|
|
|
|
(repeat (list :inline t :format "%v"
|
|
|
|
(symbol :tag "Keyword")
|
|
|
|
(choice symbol regexp))))
|
|
|
|
(repeat (list :inline t :format "%v"
|
|
|
|
(symbol :tag "Keyword")
|
|
|
|
(choice symbol regexp)))))
|
1997-05-03 04:56:48 +00:00
|
|
|
:group 'diary)
|
|
|
|
|
2007-04-07 21:53:39 +00:00
|
|
|
(defvar diary-font-lock-keywords)
|
|
|
|
|
2008-03-29 02:44:03 +00:00
|
|
|
(defcustom diary-date-forms (cond ((eq calendar-date-style 'iso)
|
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
2008-04-07 01:58:55 +00:00
|
|
|
diary-iso-date-forms)
|
2008-03-29 02:44:03 +00:00
|
|
|
((eq calendar-date-style 'european)
|
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
2008-04-07 01:58:55 +00:00
|
|
|
diary-european-date-forms)
|
|
|
|
(t diary-american-date-forms))
|
2006-01-24 17:07:29 +00:00
|
|
|
"List of pseudo-patterns describing the forms of date used in the diary.
|
2002-04-03 14:47:16 +00:00
|
|
|
The patterns on the list must be MUTUALLY EXCLUSIVE and should not match
|
1992-05-04 16:48:30 +00:00
|
|
|
any portion of the diary entry itself, just the date component.
|
|
|
|
|
|
|
|
A pseudo-pattern is a list of regular expressions and the keywords `month',
|
|
|
|
`day', `year', `monthname', and `dayname'. The keyword `monthname' will
|
2003-08-03 13:59:13 +00:00
|
|
|
match the name of the month (see `calendar-month-name-array'), capitalized
|
|
|
|
or not, or its user-specified abbreviation (see `calendar-month-abbrev-array'),
|
|
|
|
followed by a period or not; it will also match `*'. Similarly, `dayname'
|
|
|
|
will match the name of the day (see `calendar-day-name-array'), capitalized or
|
|
|
|
not, or its user-specified abbreviation (see `calendar-day-abbrev-array'),
|
|
|
|
followed by a period or not. The keywords `month', `day', and `year' will
|
|
|
|
match those numerical values, preceded by arbitrarily many zeros; they will
|
|
|
|
also match `*'.
|
1992-05-04 16:48:30 +00:00
|
|
|
|
|
|
|
The matching of the diary entries with the date forms is done with the
|
|
|
|
standard syntax table from Fundamental mode, but with the `*' changed so
|
|
|
|
that it is a word constituent.
|
|
|
|
|
|
|
|
If, to be mutually exclusive, a pseudo-pattern must match a portion of the
|
|
|
|
diary entry itself, the first element of the pattern MUST be `backup'. This
|
1992-08-12 12:50:10 +00:00
|
|
|
directive causes the date recognizer to back up to the beginning of the
|
|
|
|
current word of the diary entry, so in no case can the pattern match more than
|
2008-03-29 02:44:03 +00:00
|
|
|
a portion of the first word of the diary entry.
|
|
|
|
|
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
2008-04-07 01:58:55 +00:00
|
|
|
For examples of three common styles, see `diary-american-date-forms',
|
|
|
|
`diary-european-date-forms', and `diary-iso-date-forms'."
|
1997-05-03 04:56:48 +00:00
|
|
|
:type '(repeat (choice (cons :tag "Backup"
|
2008-03-13 06:29:28 +00:00
|
|
|
:value (backup . nil)
|
|
|
|
(const backup)
|
|
|
|
(repeat (list :inline t :format "%v"
|
|
|
|
(symbol :tag "Keyword")
|
|
|
|
(choice symbol regexp))))
|
|
|
|
(repeat (list :inline t :format "%v"
|
|
|
|
(symbol :tag "Keyword")
|
|
|
|
(choice symbol regexp)))))
|
2009-03-02 07:00:43 +00:00
|
|
|
:set-after '(calendar-date-style diary-iso-date-forms
|
|
|
|
diary-european-date-forms
|
|
|
|
diary-american-date-forms)
|
2007-04-07 21:53:39 +00:00
|
|
|
:initialize 'custom-initialize-default
|
|
|
|
:set (lambda (symbol value)
|
|
|
|
(unless (equal value (eval symbol))
|
|
|
|
(custom-set-default symbol value)
|
|
|
|
(setq diary-font-lock-keywords (diary-font-lock-keywords))
|
|
|
|
;; Need to redraw not just to get new font-locking, but also
|
|
|
|
;; to pick up any newly recognized entries.
|
|
|
|
(and (diary-live-p)
|
|
|
|
(diary))))
|
1997-05-03 04:56:48 +00:00
|
|
|
:group 'diary)
|
1992-05-04 16:48:30 +00:00
|
|
|
|
2008-03-29 02:44:03 +00:00
|
|
|
;; Next three are provided to aid in setting calendar-date-display-form.
|
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
2008-04-07 01:58:55 +00:00
|
|
|
(defcustom calendar-iso-date-display-form '((format "%s-%.2d-%.2d" year
|
2008-03-29 02:44:03 +00:00
|
|
|
(string-to-number month)
|
|
|
|
(string-to-number day)))
|
|
|
|
"Pseudo-pattern governing the way a date appears in the ISO style.
|
|
|
|
Normally you should not customize this, but `calendar-date-display-form'
|
|
|
|
\(which see)."
|
|
|
|
:type 'sexp
|
|
|
|
:version "23.1"
|
|
|
|
:group 'calendar)
|
|
|
|
|
2008-04-12 03:11:03 +00:00
|
|
|
(define-obsolete-variable-alias 'european-calendar-display-form
|
|
|
|
'calendar-european-date-display-form "23.1")
|
|
|
|
|
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
2008-04-07 01:58:55 +00:00
|
|
|
(defcustom calendar-european-date-display-form
|
1992-08-12 12:50:10 +00:00
|
|
|
'((if dayname (concat dayname ", ")) day " " monthname " " year)
|
2006-01-24 17:07:29 +00:00
|
|
|
"Pseudo-pattern governing the way a date appears in the European style.
|
2008-03-29 02:44:03 +00:00
|
|
|
Normally you should not customize this, but `calendar-date-display-form'
|
|
|
|
\(which see)."
|
1997-05-03 04:56:48 +00:00
|
|
|
:type 'sexp
|
|
|
|
:group 'calendar)
|
1992-05-04 16:48:30 +00:00
|
|
|
|
2008-04-12 03:11:03 +00:00
|
|
|
(define-obsolete-variable-alias 'american-calendar-display-form
|
|
|
|
'calendar-american-date-display-form "23.1")
|
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
2008-04-07 01:58:55 +00:00
|
|
|
|
|
|
|
(defcustom calendar-american-date-display-form
|
1992-08-12 12:50:10 +00:00
|
|
|
'((if dayname (concat dayname ", ")) monthname " " day ", " year)
|
2006-01-24 17:07:29 +00:00
|
|
|
"Pseudo-pattern governing the way a date appears in the American style.
|
2008-03-29 02:44:03 +00:00
|
|
|
Normally you should not customize this, but `calendar-date-display-form'
|
|
|
|
\(which see)."
|
1997-05-03 04:56:48 +00:00
|
|
|
:type 'sexp
|
|
|
|
:group 'calendar)
|
1992-05-04 16:48:30 +00:00
|
|
|
|
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
2008-04-07 01:58:55 +00:00
|
|
|
(defcustom calendar-date-display-form
|
|
|
|
(cond ((eq calendar-date-style 'iso)
|
|
|
|
calendar-iso-date-display-form)
|
|
|
|
((eq calendar-date-style 'european)
|
|
|
|
calendar-european-date-display-form)
|
|
|
|
(t calendar-american-date-display-form))
|
2008-03-29 02:44:03 +00:00
|
|
|
"Pseudo-pattern governing the way a calendar date appears.
|
|
|
|
Used by the function `calendar-date-string' (which see), a pseudo-pattern
|
|
|
|
is a list of expressions that can involve the keywords `month', `day',
|
|
|
|
and `year' (all numbers in string form), and `monthname' and `dayname'
|
|
|
|
\(both alphabetic strings). For example, a typical American form would be
|
1992-05-04 16:48:30 +00:00
|
|
|
|
|
|
|
'(month \"/\" day \"/\" (substring year -2))
|
|
|
|
|
2008-03-29 02:44:03 +00:00
|
|
|
whereas
|
1992-05-04 16:48:30 +00:00
|
|
|
|
|
|
|
'((format \"%9s, %9s %2s, %4s\" dayname monthname day year))
|
|
|
|
|
2008-03-29 02:44:03 +00:00
|
|
|
would give the usual American style in fixed-length fields. The variables
|
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
2008-04-07 01:58:55 +00:00
|
|
|
`calendar-iso-date-display-form', `calendar-european-date-display-form', and
|
|
|
|
`calendar-american-date-display-form' provide some defaults for three common
|
2008-03-29 02:44:03 +00:00
|
|
|
styles."
|
1997-05-03 04:56:48 +00:00
|
|
|
:type 'sexp
|
2009-03-02 07:00:43 +00:00
|
|
|
:set-after '(calendar-date-style calendar-iso-date-display-form
|
|
|
|
calendar-european-date-display-form
|
|
|
|
calendar-american-date-display-form)
|
1997-05-03 04:56:48 +00:00
|
|
|
:group 'calendar)
|
1992-05-04 16:48:30 +00:00
|
|
|
|
2008-03-29 02:44:03 +00:00
|
|
|
(defun calendar-set-date-style (style)
|
|
|
|
"Set the style of calendar and diary dates to STYLE (a symbol).
|
|
|
|
The valid styles are described in the documentation of `calendar-date-style'."
|
|
|
|
(interactive (list (intern
|
|
|
|
(completing-read "Date style: "
|
|
|
|
'("american" "european" "iso") nil t
|
|
|
|
nil nil "american"))))
|
|
|
|
(or (memq style '(american european iso))
|
|
|
|
(setq style 'american))
|
|
|
|
(setq calendar-date-style style
|
|
|
|
calendar-date-display-form
|
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
2008-04-07 01:58:55 +00:00
|
|
|
(symbol-value (intern-soft
|
|
|
|
(format "calendar-%s-date-display-form" style)))
|
2008-03-29 02:44:03 +00:00
|
|
|
diary-date-forms
|
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
2008-04-07 01:58:55 +00:00
|
|
|
(symbol-value (intern-soft (format "diary-%s-date-forms" style))))
|
|
|
|
(calendar-update-mode-line))
|
2008-03-29 02:44:03 +00:00
|
|
|
|
1992-05-04 16:48:30 +00:00
|
|
|
(defun european-calendar ()
|
|
|
|
"Set the interpretation and display of dates to the European style."
|
|
|
|
(interactive)
|
2008-03-29 02:44:03 +00:00
|
|
|
(calendar-set-date-style 'european))
|
|
|
|
|
|
|
|
(make-obsolete 'european-calendar 'calendar-set-date-style "23.1")
|
1992-05-04 16:48:30 +00:00
|
|
|
|
|
|
|
(defun american-calendar ()
|
|
|
|
"Set the interpretation and display of dates to the American style."
|
|
|
|
(interactive)
|
2008-03-29 02:44:03 +00:00
|
|
|
(calendar-set-date-style 'american))
|
|
|
|
|
|
|
|
(make-obsolete 'american-calendar 'calendar-set-date-style "23.1")
|
1992-05-04 16:48:30 +00:00
|
|
|
|
2008-04-12 03:11:03 +00:00
|
|
|
(define-obsolete-variable-alias 'holidays-in-diary-buffer
|
|
|
|
'diary-show-holidays-flag "23.1")
|
|
|
|
|
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
2008-04-07 01:58:55 +00:00
|
|
|
(defcustom diary-show-holidays-flag t
|
2006-01-24 17:07:29 +00:00
|
|
|
"Non-nil means include holidays in the diary display.
|
1994-04-07 20:31:17 +00:00
|
|
|
The holidays appear in the mode line of the diary buffer, or in the
|
* calendar.el (calendar-version): Update to 5.1. Fixed a variety
of spelling error in comments and doc strings.
(calendar-sexp-debug): New variable to turn off error catching.
(calendar-absolute-from-gregorian): Removed unused vars month, day.
(view-calendar-holidays-initially, all-hebrew-calendar-holidays,
all-christian-calendar-holidays, all-christian-islamic-holidays,
diary-nonmarking-symbol, hebrew-diary-entry-symbol,
islamic-diary-entry-symbol, diary-include-string,
abbreviated-calendar-year, european-calendar-style,
european-calendar-display-form, american-calendar-display-form,
calendar-date-display-form, print-diary-entries-hook,
list-diary-entries-hook, nongregorian-diary-listing-hook,
nongregorian-diary-marking-hook, diary-list-include-blanks,
holidays-in-diary-buffer, general-holidays,
increment-calendar-month, calendar-sum, calendar-string-spread,
calendar-absolute-from-iso, calendar-print-iso-date,
hebrew-calendar-elapsed-days, list-yahrzeit-dates,
calendar-print-astro-day-number): Fix doc strings.
(calendar-nth-named-day): Rewritten to include optional day of month.
(general-holidays, calendar-holidays, hebrew-holidays,
christian-holidays, islamic-holidays,
solar-holidays): Rewritten to include require of cal-dst.el and to
show the time of the change to/from daylight savings time.
(calendar-current-time-zone, calendar-time-zone,
calendar-daylight-time-offset, calendar-standard-time-zone-name,
calendar-daylight-time-zone-name, calendar-daylight-savings-starts,
calendar-daylight-savings-ends,
calendar-daylight-savings-switchover-time): Moved to cal-dst.el.
(calendar-location-name, calendar-time-display-form, calendar-latitude,
calendar-longitude): Moved to solar.el.
(calendar-holidays): Unquote it!
1993-06-22 03:22:12 +00:00
|
|
|
fancy diary buffer next to the date. This slows down the diary functions
|
1997-05-03 04:56:48 +00:00
|
|
|
somewhat; setting it to nil makes the diary display faster."
|
|
|
|
:type 'boolean
|
|
|
|
:group 'holidays)
|
1992-05-04 16:48:30 +00:00
|
|
|
|
Move many autoloads to separate file, cal-loaddefs.el.
Move defcustoms to start and re-order.
(calendar-month-name-array, calendar-starred-day): No need to declare
for compiler.
(cal-loaddefs): Require it.
(appt, chinese-calendar, calendar-tex): Move custom groups to the
appropriate file.
(diary-entry-marker, calendar-today-marker, calendar-holiday-marker):
Reverse logic.
(diary-face, diary-file-name-prefix-function, diary-include-string)
(diary-glob-file-regexp-prefix, diary-face-attrs)
(diary-file-name-prefix, sexp-diary-entry-symbol)
(print-diary-entries-hook, list-diary-entries-hook)
(nongregorian-diary-listing-hook, mark-diary-entries-hook)
(nongregorian-diary-marking-hook, diary-list-include-blanks):
Move to diary-lib.
(all-christian-calendar-holidays, all-islamic-calendar-holidays)
(all-bahai-calendar-holidays): Doc fix.
(calendar-mark-ring): Add doc-string.
(calendar-starred-day): Defvar it.
(calendar-mode): Make calendar-starred-day local.
(calendar-star-date): No need to make calendar-starred-day local.
2008-03-08 03:47:03 +00:00
|
|
|
(defcustom calendar-debug-sexp nil
|
|
|
|
"Turn debugging on when evaluating a sexp in the diary or holiday list."
|
|
|
|
:type 'boolean
|
|
|
|
:group 'calendar)
|
1993-06-03 06:12:46 +00:00
|
|
|
|
2008-04-12 03:11:03 +00:00
|
|
|
(define-obsolete-variable-alias 'all-hebrew-calendar-holidays
|
|
|
|
'calendar-hebrew-all-holidays-flag "23.1")
|
|
|
|
|
2008-04-04 04:36:54 +00:00
|
|
|
(defcustom calendar-hebrew-all-holidays-flag nil
|
Move many autoloads to separate file, cal-loaddefs.el.
Move defcustoms to start and re-order.
(calendar-month-name-array, calendar-starred-day): No need to declare
for compiler.
(cal-loaddefs): Require it.
(appt, chinese-calendar, calendar-tex): Move custom groups to the
appropriate file.
(diary-entry-marker, calendar-today-marker, calendar-holiday-marker):
Reverse logic.
(diary-face, diary-file-name-prefix-function, diary-include-string)
(diary-glob-file-regexp-prefix, diary-face-attrs)
(diary-file-name-prefix, sexp-diary-entry-symbol)
(print-diary-entries-hook, list-diary-entries-hook)
(nongregorian-diary-listing-hook, mark-diary-entries-hook)
(nongregorian-diary-marking-hook, diary-list-include-blanks):
Move to diary-lib.
(all-christian-calendar-holidays, all-islamic-calendar-holidays)
(all-bahai-calendar-holidays): Doc fix.
(calendar-mark-ring): Add doc-string.
(calendar-starred-day): Defvar it.
(calendar-mode): Make calendar-starred-day local.
(calendar-star-date): No need to make calendar-starred-day local.
2008-03-08 03:47:03 +00:00
|
|
|
"If nil, show only major holidays from the Hebrew calendar.
|
|
|
|
This means only those Jewish holidays that appear on secular calendars.
|
|
|
|
Otherwise, show all the holidays that would appear in a complete Hebrew
|
|
|
|
calendar."
|
|
|
|
:type 'boolean
|
|
|
|
:group 'holidays)
|
|
|
|
|
2008-04-12 03:11:03 +00:00
|
|
|
(define-obsolete-variable-alias 'all-christian-calendar-holidays
|
|
|
|
'calendar-christian-all-holidays-flag "23.1")
|
2008-04-04 04:36:54 +00:00
|
|
|
|
|
|
|
(defcustom calendar-christian-all-holidays-flag nil
|
Move many autoloads to separate file, cal-loaddefs.el.
Move defcustoms to start and re-order.
(calendar-month-name-array, calendar-starred-day): No need to declare
for compiler.
(cal-loaddefs): Require it.
(appt, chinese-calendar, calendar-tex): Move custom groups to the
appropriate file.
(diary-entry-marker, calendar-today-marker, calendar-holiday-marker):
Reverse logic.
(diary-face, diary-file-name-prefix-function, diary-include-string)
(diary-glob-file-regexp-prefix, diary-face-attrs)
(diary-file-name-prefix, sexp-diary-entry-symbol)
(print-diary-entries-hook, list-diary-entries-hook)
(nongregorian-diary-listing-hook, mark-diary-entries-hook)
(nongregorian-diary-marking-hook, diary-list-include-blanks):
Move to diary-lib.
(all-christian-calendar-holidays, all-islamic-calendar-holidays)
(all-bahai-calendar-holidays): Doc fix.
(calendar-mark-ring): Add doc-string.
(calendar-starred-day): Defvar it.
(calendar-mode): Make calendar-starred-day local.
(calendar-star-date): No need to make calendar-starred-day local.
2008-03-08 03:47:03 +00:00
|
|
|
"If nil, show only major holidays from the Christian calendar.
|
|
|
|
This means only those Christian holidays that appear on secular calendars.
|
|
|
|
Otherwise, show all the holidays that would appear in a complete Christian
|
|
|
|
calendar."
|
|
|
|
:type 'boolean
|
|
|
|
:group 'holidays)
|
|
|
|
|
2008-04-12 03:11:03 +00:00
|
|
|
(define-obsolete-variable-alias 'all-islamic-calendar-holidays
|
|
|
|
'calendar-islamic-all-holidays-flag "23.1")
|
2008-04-04 04:36:54 +00:00
|
|
|
|
|
|
|
(defcustom calendar-islamic-all-holidays-flag nil
|
Move many autoloads to separate file, cal-loaddefs.el.
Move defcustoms to start and re-order.
(calendar-month-name-array, calendar-starred-day): No need to declare
for compiler.
(cal-loaddefs): Require it.
(appt, chinese-calendar, calendar-tex): Move custom groups to the
appropriate file.
(diary-entry-marker, calendar-today-marker, calendar-holiday-marker):
Reverse logic.
(diary-face, diary-file-name-prefix-function, diary-include-string)
(diary-glob-file-regexp-prefix, diary-face-attrs)
(diary-file-name-prefix, sexp-diary-entry-symbol)
(print-diary-entries-hook, list-diary-entries-hook)
(nongregorian-diary-listing-hook, mark-diary-entries-hook)
(nongregorian-diary-marking-hook, diary-list-include-blanks):
Move to diary-lib.
(all-christian-calendar-holidays, all-islamic-calendar-holidays)
(all-bahai-calendar-holidays): Doc fix.
(calendar-mark-ring): Add doc-string.
(calendar-starred-day): Defvar it.
(calendar-mode): Make calendar-starred-day local.
(calendar-star-date): No need to make calendar-starred-day local.
2008-03-08 03:47:03 +00:00
|
|
|
"If nil, show only major holidays from the Islamic calendar.
|
|
|
|
This means only those Islamic holidays that appear on secular calendars.
|
|
|
|
Otherwise, show all the holidays that would appear in a complete Islamic
|
|
|
|
calendar."
|
|
|
|
:type 'boolean
|
|
|
|
:group 'holidays)
|
|
|
|
|
2008-04-12 03:11:03 +00:00
|
|
|
(define-obsolete-variable-alias 'all-bahai-calendar-holidays
|
|
|
|
'calendar-bahai-all-holidays-flag "23.1")
|
2008-04-04 04:36:54 +00:00
|
|
|
|
|
|
|
(defcustom calendar-bahai-all-holidays-flag nil
|
Move many autoloads to separate file, cal-loaddefs.el.
Move defcustoms to start and re-order.
(calendar-month-name-array, calendar-starred-day): No need to declare
for compiler.
(cal-loaddefs): Require it.
(appt, chinese-calendar, calendar-tex): Move custom groups to the
appropriate file.
(diary-entry-marker, calendar-today-marker, calendar-holiday-marker):
Reverse logic.
(diary-face, diary-file-name-prefix-function, diary-include-string)
(diary-glob-file-regexp-prefix, diary-face-attrs)
(diary-file-name-prefix, sexp-diary-entry-symbol)
(print-diary-entries-hook, list-diary-entries-hook)
(nongregorian-diary-listing-hook, mark-diary-entries-hook)
(nongregorian-diary-marking-hook, diary-list-include-blanks):
Move to diary-lib.
(all-christian-calendar-holidays, all-islamic-calendar-holidays)
(all-bahai-calendar-holidays): Doc fix.
(calendar-mark-ring): Add doc-string.
(calendar-starred-day): Defvar it.
(calendar-mode): Make calendar-starred-day local.
(calendar-star-date): No need to make calendar-starred-day local.
2008-03-08 03:47:03 +00:00
|
|
|
"If nil, show only major holidays from the Baha'i calendar.
|
|
|
|
These are the days on which work and school must be suspended.
|
|
|
|
Otherwise, show all the holidays that would appear in a complete Baha'i
|
|
|
|
calendar."
|
|
|
|
:type 'boolean
|
|
|
|
:group 'holidays)
|
|
|
|
|
2008-04-23 02:59:47 +00:00
|
|
|
(defcustom calendar-chinese-all-holidays-flag nil
|
|
|
|
"If nil, show only the major holidays from the Chinese calendar."
|
|
|
|
:version "23.1"
|
|
|
|
:type 'boolean
|
|
|
|
:group 'holidays)
|
|
|
|
|
Move many autoloads to separate file, cal-loaddefs.el.
Move defcustoms to start and re-order.
(calendar-month-name-array, calendar-starred-day): No need to declare
for compiler.
(cal-loaddefs): Require it.
(appt, chinese-calendar, calendar-tex): Move custom groups to the
appropriate file.
(diary-entry-marker, calendar-today-marker, calendar-holiday-marker):
Reverse logic.
(diary-face, diary-file-name-prefix-function, diary-include-string)
(diary-glob-file-regexp-prefix, diary-face-attrs)
(diary-file-name-prefix, sexp-diary-entry-symbol)
(print-diary-entries-hook, list-diary-entries-hook)
(nongregorian-diary-listing-hook, mark-diary-entries-hook)
(nongregorian-diary-marking-hook, diary-list-include-blanks):
Move to diary-lib.
(all-christian-calendar-holidays, all-islamic-calendar-holidays)
(all-bahai-calendar-holidays): Doc fix.
(calendar-mark-ring): Add doc-string.
(calendar-starred-day): Defvar it.
(calendar-mode): Make calendar-starred-day local.
(calendar-star-date): No need to make calendar-starred-day local.
2008-03-08 03:47:03 +00:00
|
|
|
;;; End of user options.
|
|
|
|
|
2008-06-21 19:28:09 +00:00
|
|
|
(calendar-recompute-layout-variables)
|
|
|
|
|
|
|
|
(defconst calendar-first-date-row 3
|
|
|
|
"First row in the calendar with actual dates.")
|
|
|
|
|
Move many autoloads to separate file, cal-loaddefs.el.
Move defcustoms to start and re-order.
(calendar-month-name-array, calendar-starred-day): No need to declare
for compiler.
(cal-loaddefs): Require it.
(appt, chinese-calendar, calendar-tex): Move custom groups to the
appropriate file.
(diary-entry-marker, calendar-today-marker, calendar-holiday-marker):
Reverse logic.
(diary-face, diary-file-name-prefix-function, diary-include-string)
(diary-glob-file-regexp-prefix, diary-face-attrs)
(diary-file-name-prefix, sexp-diary-entry-symbol)
(print-diary-entries-hook, list-diary-entries-hook)
(nongregorian-diary-listing-hook, mark-diary-entries-hook)
(nongregorian-diary-marking-hook, diary-list-include-blanks):
Move to diary-lib.
(all-christian-calendar-holidays, all-islamic-calendar-holidays)
(all-bahai-calendar-holidays): Doc fix.
(calendar-mark-ring): Add doc-string.
(calendar-starred-day): Defvar it.
(calendar-mode): Make calendar-starred-day local.
(calendar-star-date): No need to make calendar-starred-day local.
2008-03-08 03:47:03 +00:00
|
|
|
(defconst calendar-buffer "*Calendar*"
|
|
|
|
"Name of the buffer used for the calendar.")
|
1992-05-04 16:48:30 +00:00
|
|
|
|
|
|
|
(defconst holiday-buffer "*Holidays*"
|
|
|
|
"Name of the buffer used for the displaying the holidays.")
|
|
|
|
|
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
2008-04-07 01:58:55 +00:00
|
|
|
(defconst diary-fancy-buffer "*Fancy Diary Entries*"
|
1992-05-04 16:48:30 +00:00
|
|
|
"Name of the buffer used for the optional fancy display of the diary.")
|
|
|
|
|
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
2008-04-07 01:58:55 +00:00
|
|
|
(define-obsolete-variable-alias 'fancy-diary-buffer 'diary-fancy-buffer "23.1")
|
|
|
|
|
|
|
|
(defconst calendar-other-calendars-buffer "*Other Calendars*"
|
1998-05-27 20:18:40 +00:00
|
|
|
"Name of the buffer used for the display of date on other calendars.")
|
|
|
|
|
1994-10-26 15:26:22 +00:00
|
|
|
(defconst lunar-phases-buffer "*Phases of Moon*"
|
|
|
|
"Name of the buffer used for the lunar phases.")
|
|
|
|
|
2008-09-27 19:58:53 +00:00
|
|
|
(defconst solar-sunrises-buffer "*Sunrise/Sunset Times*"
|
2008-06-26 22:30:01 +00:00
|
|
|
"Name of buffer used for sunrise/sunset times.")
|
|
|
|
|
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
2008-04-07 01:58:55 +00:00
|
|
|
(defconst calendar-hebrew-yahrzeit-buffer "*Yahrzeits*"
|
2008-03-13 04:06:47 +00:00
|
|
|
"Name of the buffer used by `list-yahrzeit-dates'.")
|
|
|
|
|
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
2008-04-07 01:58:55 +00:00
|
|
|
(defmacro calendar-increment-month (mon yr n &optional nmonths)
|
2003-10-01 20:48:17 +00:00
|
|
|
"Increment the variables MON and YR by N months.
|
|
|
|
Forward if N is positive or backward if N is negative.
|
2008-03-31 07:11:00 +00:00
|
|
|
A negative YR is interpreted as BC; -1 being 1 BC, and so on.
|
2008-03-31 16:00:05 +00:00
|
|
|
Optional NMONTHS is the number of months per year (default 12)."
|
|
|
|
;; Can view this as a form of base-nmonths arithmetic, in which "a
|
|
|
|
;; year" = "ten", and we never bother to use hundreds.
|
|
|
|
`(let ((nmonths (or ,nmonths 12))
|
|
|
|
macro-y)
|
2003-10-01 20:48:17 +00:00
|
|
|
(if (< ,yr 0) (setq ,yr (1+ ,yr))) ; -1 BC -> 0 AD, etc
|
2008-03-31 16:00:05 +00:00
|
|
|
(setq macro-y (+ (* ,yr nmonths) ,mon -1 ,n)
|
|
|
|
,mon (1+ (mod macro-y nmonths))
|
|
|
|
,yr (/ macro-y nmonths))
|
|
|
|
;; Alternative:
|
|
|
|
;;; (setq macro-y (+ (* ,yr nmonths) ,mon -1 ,n)
|
|
|
|
;;; ,yr (/ macro-y nmonths)
|
|
|
|
;;; ,mon (- macro-y (* ,yr nmonths)))
|
2003-10-01 20:48:17 +00:00
|
|
|
(and (< macro-y 0) (> ,mon 1) (setq ,yr (1- ,yr)))
|
|
|
|
(if (< ,yr 1) (setq ,yr (1- ,yr))))) ; 0 AD -> -1 BC, etc
|
1992-05-04 16:48:30 +00:00
|
|
|
|
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
2008-04-07 01:58:55 +00:00
|
|
|
(define-obsolete-function-alias 'increment-calendar-month
|
|
|
|
'calendar-increment-month "23.1")
|
|
|
|
|
2008-03-10 02:46:24 +00:00
|
|
|
(defvar displayed-month)
|
|
|
|
(defvar displayed-year)
|
|
|
|
|
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
2008-04-07 01:58:55 +00:00
|
|
|
(defun calendar-increment-month-cons (n &optional mon yr)
|
2006-01-24 17:07:29 +00:00
|
|
|
"Return the Nth month after MON/YR.
|
|
|
|
The return value is a pair (MONTH . YEAR).
|
|
|
|
MON defaults to `displayed-month'. YR defaults to `displayed-year'."
|
|
|
|
(unless mon (setq mon displayed-month))
|
2006-02-06 16:56:35 +00:00
|
|
|
(unless yr (setq yr displayed-year))
|
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
2008-04-07 01:58:55 +00:00
|
|
|
(calendar-increment-month mon yr n)
|
2006-01-24 17:07:29 +00:00
|
|
|
(cons mon yr))
|
|
|
|
|
1992-05-04 16:48:30 +00:00
|
|
|
(defmacro calendar-for-loop (var from init to final do &rest body)
|
2007-07-24 06:12:32 +00:00
|
|
|
"Execute a for loop.
|
|
|
|
Evaluate BODY with VAR bound to successive integers from INIT to FINAL,
|
2008-03-15 03:00:17 +00:00
|
|
|
inclusive. The standard macro `dotimes' is preferable in most cases."
|
2008-03-16 01:22:58 +00:00
|
|
|
(declare (debug (symbolp "from" form "to" form "do" body))
|
|
|
|
(indent defun))
|
1999-11-12 16:05:16 +00:00
|
|
|
`(let ((,var (1- ,init)))
|
|
|
|
(while (>= ,final (setq ,var (1+ ,var)))
|
|
|
|
,@body)))
|
1992-05-04 16:48:30 +00:00
|
|
|
|
2008-04-02 03:35:38 +00:00
|
|
|
(make-obsolete 'calendar-for-loop "use `dotimes' or `while' instead." "23.1")
|
|
|
|
|
1992-05-04 16:48:30 +00:00
|
|
|
(defmacro calendar-sum (index initial condition expression)
|
2008-03-15 03:00:17 +00:00
|
|
|
"For INDEX = INITIAL, +1, ... (as long as CONDITION holds), sum EXPRESSION."
|
2006-01-24 17:07:29 +00:00
|
|
|
(declare (debug (symbolp form form form)))
|
1999-11-12 16:05:16 +00:00
|
|
|
`(let ((,index ,initial)
|
|
|
|
(sum 0))
|
|
|
|
(while ,condition
|
2008-03-15 03:00:17 +00:00
|
|
|
(setq sum (+ sum ,expression)
|
|
|
|
,index (1+ ,index)))
|
1999-11-12 16:05:16 +00:00
|
|
|
sum))
|
1992-05-04 16:48:30 +00:00
|
|
|
|
2008-03-31 07:11:00 +00:00
|
|
|
;; FIXME bind q to bury-buffer?
|
2008-03-17 02:30:06 +00:00
|
|
|
(defmacro calendar-in-read-only-buffer (buffer &rest body)
|
|
|
|
"Switch to BUFFER and executes the forms in BODY.
|
|
|
|
First creates or erases BUFFER as needed. Leaves BUFFER read-only,
|
|
|
|
with disabled undo. Leaves point at point-min, displays BUFFER."
|
|
|
|
(declare (indent 1) (debug t))
|
|
|
|
`(progn
|
|
|
|
(set-buffer (get-buffer-create ,buffer))
|
|
|
|
(setq buffer-read-only nil
|
|
|
|
buffer-undo-list t)
|
|
|
|
(erase-buffer)
|
|
|
|
,@body
|
|
|
|
(goto-char (point-min))
|
|
|
|
(set-buffer-modified-p nil)
|
|
|
|
(setq buffer-read-only t)
|
|
|
|
(display-buffer ,buffer)))
|
|
|
|
|
1994-10-26 15:26:22 +00:00
|
|
|
;; The following are in-line for speed; they can be called thousands of times
|
|
|
|
;; when looking up holidays or processing the diary. Here, for example, are
|
|
|
|
;; the numbers of calls to calendar/diary/holiday functions in preparing the
|
1992-06-30 13:54:21 +00:00
|
|
|
;; fancy diary display, for a moderately complex diary file, with functions
|
|
|
|
;; used instead of macros. There were a total of 10000 such calls:
|
|
|
|
;;
|
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
2008-04-07 01:58:55 +00:00
|
|
|
;; 1934 calendar-extract-month
|
|
|
|
;; 1852 calendar-extract-year
|
|
|
|
;; 1819 calendar-extract-day
|
1992-06-30 13:54:21 +00:00
|
|
|
;; 845 calendar-leap-year-p
|
|
|
|
;; 837 calendar-day-number
|
|
|
|
;; 775 calendar-absolute-from-gregorian
|
|
|
|
;; 346 calendar-last-day-of-month
|
2008-04-05 20:58:10 +00:00
|
|
|
;; 286 calendar-hebrew-last-day-of-month
|
|
|
|
;; 188 calendar-hebrew-leap-year-p
|
|
|
|
;; 180 calendar-hebrew-elapsed-days
|
|
|
|
;; 163 calendar-hebrew-last-month-of-year
|
1992-06-30 13:54:21 +00:00
|
|
|
;; 66 calendar-date-compare
|
2008-04-05 20:58:10 +00:00
|
|
|
;; 65 calendar-hebrew-days-in-year
|
2008-04-04 07:32:39 +00:00
|
|
|
;; 60 calendar-julian-to-absolute
|
2008-04-05 20:58:10 +00:00
|
|
|
;; 50 calendar-hebrew-to-absolute
|
1992-06-30 13:54:21 +00:00
|
|
|
;; 43 calendar-date-equal
|
|
|
|
;; 38 calendar-gregorian-from-absolute
|
|
|
|
;; .
|
|
|
|
;;
|
|
|
|
;; The use of these seven macros eliminates the overhead of 92% of the function
|
1994-10-26 15:26:22 +00:00
|
|
|
;; calls; it's faster this way.
|
1992-06-30 13:54:21 +00:00
|
|
|
|
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
2008-04-07 01:58:55 +00:00
|
|
|
(defsubst calendar-extract-month (date)
|
1992-05-04 16:48:30 +00:00
|
|
|
"Extract the month part of DATE which has the form (month day year)."
|
1994-10-26 15:26:22 +00:00
|
|
|
(car date))
|
1992-05-04 16:48:30 +00:00
|
|
|
|
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
2008-04-07 01:58:55 +00:00
|
|
|
(define-obsolete-function-alias 'extract-calendar-month
|
|
|
|
'calendar-extract-month "23.1")
|
|
|
|
|
2008-03-17 02:30:06 +00:00
|
|
|
;; Note gives wrong answer for result of (calendar-read-date 'noday),
|
|
|
|
;; but that is only used by `calendar-other-month'.
|
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
2008-04-07 01:58:55 +00:00
|
|
|
(defsubst calendar-extract-day (date)
|
1992-05-04 16:48:30 +00:00
|
|
|
"Extract the day part of DATE which has the form (month day year)."
|
2008-03-15 03:00:17 +00:00
|
|
|
(cadr date))
|
1992-05-04 16:48:30 +00:00
|
|
|
|
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
2008-04-07 01:58:55 +00:00
|
|
|
(define-obsolete-function-alias 'extract-calendar-day
|
|
|
|
'calendar-extract-day "23.1")
|
|
|
|
|
|
|
|
(defsubst calendar-extract-year (date)
|
1992-05-04 16:48:30 +00:00
|
|
|
"Extract the year part of DATE which has the form (month day year)."
|
2008-03-15 03:00:17 +00:00
|
|
|
(nth 2 date))
|
1992-05-04 16:48:30 +00:00
|
|
|
|
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
2008-04-07 01:58:55 +00:00
|
|
|
(define-obsolete-function-alias 'extract-calendar-year
|
|
|
|
'calendar-extract-year "23.1")
|
|
|
|
|
1994-10-26 15:26:22 +00:00
|
|
|
(defsubst calendar-leap-year-p (year)
|
2003-10-01 20:48:17 +00:00
|
|
|
"Return t if YEAR is a Gregorian leap year.
|
|
|
|
A negative year is interpreted as BC; -1 being 1 BC, and so on."
|
|
|
|
;; 1 BC = 0 AD, 2 BC acts like 1 AD, etc.
|
|
|
|
(if (< year 0) (setq year (1- (abs year))))
|
1994-10-26 15:26:22 +00:00
|
|
|
(and (zerop (% year 4))
|
|
|
|
(or (not (zerop (% year 100)))
|
|
|
|
(zerop (% year 400)))))
|
|
|
|
|
* calendar.el (calendar-version): Update to 5.1. Fixed a variety
of spelling error in comments and doc strings.
(calendar-sexp-debug): New variable to turn off error catching.
(calendar-absolute-from-gregorian): Removed unused vars month, day.
(view-calendar-holidays-initially, all-hebrew-calendar-holidays,
all-christian-calendar-holidays, all-christian-islamic-holidays,
diary-nonmarking-symbol, hebrew-diary-entry-symbol,
islamic-diary-entry-symbol, diary-include-string,
abbreviated-calendar-year, european-calendar-style,
european-calendar-display-form, american-calendar-display-form,
calendar-date-display-form, print-diary-entries-hook,
list-diary-entries-hook, nongregorian-diary-listing-hook,
nongregorian-diary-marking-hook, diary-list-include-blanks,
holidays-in-diary-buffer, general-holidays,
increment-calendar-month, calendar-sum, calendar-string-spread,
calendar-absolute-from-iso, calendar-print-iso-date,
hebrew-calendar-elapsed-days, list-yahrzeit-dates,
calendar-print-astro-day-number): Fix doc strings.
(calendar-nth-named-day): Rewritten to include optional day of month.
(general-holidays, calendar-holidays, hebrew-holidays,
christian-holidays, islamic-holidays,
solar-holidays): Rewritten to include require of cal-dst.el and to
show the time of the change to/from daylight savings time.
(calendar-current-time-zone, calendar-time-zone,
calendar-daylight-time-offset, calendar-standard-time-zone-name,
calendar-daylight-time-zone-name, calendar-daylight-savings-starts,
calendar-daylight-savings-ends,
calendar-daylight-savings-switchover-time): Moved to cal-dst.el.
(calendar-location-name, calendar-time-display-form, calendar-latitude,
calendar-longitude): Moved to solar.el.
(calendar-holidays): Unquote it!
1993-06-22 03:22:12 +00:00
|
|
|
;; The foregoing is a bit faster, but not as clear as the following:
|
|
|
|
;;
|
1994-10-26 15:26:22 +00:00
|
|
|
;;(defsubst calendar-leap-year-p (year)
|
2008-03-10 02:46:24 +00:00
|
|
|
;; "Return t if YEAR is a Gregorian leap year."
|
1992-08-12 12:50:10 +00:00
|
|
|
;; (or
|
2008-03-10 02:46:24 +00:00
|
|
|
;; (and (zerop (% year 4))
|
|
|
|
;; (not (zerop (% year 100))))
|
|
|
|
;; (zerop (% year 400)))
|
1992-06-30 13:54:21 +00:00
|
|
|
|
1994-10-26 15:26:22 +00:00
|
|
|
(defsubst calendar-last-day-of-month (month year)
|
1992-06-30 13:54:21 +00:00
|
|
|
"The last day in MONTH during YEAR."
|
1994-10-26 15:26:22 +00:00
|
|
|
(if (and (= month 2) (calendar-leap-year-p year))
|
|
|
|
29
|
|
|
|
(aref [31 28 31 30 31 30 31 31 30 31 30 31] (1- month))))
|
|
|
|
|
|
|
|
;; An explanation of the calculation can be found in PascAlgorithms by
|
|
|
|
;; Edward and Ruth Reingold, Scott-Foresman/Little, Brown, 1988.
|
|
|
|
|
|
|
|
(defsubst calendar-day-number (date)
|
1992-06-30 13:54:21 +00:00
|
|
|
"Return the day number within the year of the date DATE.
|
|
|
|
For example, (calendar-day-number '(1 1 1987)) returns the value 1,
|
|
|
|
while (calendar-day-number '(12 31 1980)) returns 366."
|
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
2008-04-07 01:58:55 +00:00
|
|
|
(let* ((month (calendar-extract-month date))
|
|
|
|
(day (calendar-extract-day date))
|
|
|
|
(year (calendar-extract-year date))
|
1994-10-26 15:26:22 +00:00
|
|
|
(day-of-year (+ day (* 31 (1- month)))))
|
2008-03-15 03:00:17 +00:00
|
|
|
(when (> month 2)
|
|
|
|
(setq day-of-year (- day-of-year (/ (+ 23 (* 4 month)) 10)))
|
|
|
|
(if (calendar-leap-year-p year)
|
|
|
|
(setq day-of-year (1+ day-of-year))))
|
|
|
|
day-of-year))
|
1994-10-26 15:26:22 +00:00
|
|
|
|
|
|
|
(defsubst calendar-absolute-from-gregorian (date)
|
1992-06-30 13:54:21 +00:00
|
|
|
"The number of days elapsed between the Gregorian date 12/31/1 BC and DATE.
|
2003-10-01 20:48:17 +00:00
|
|
|
The Gregorian date Sunday, December 31, 1 BC is imaginary.
|
|
|
|
DATE is a list of the form (month day year). A negative year is
|
|
|
|
interpreted as BC; -1 being 1 BC, and so on. Dates before 12/31/1 BC
|
|
|
|
return negative results."
|
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
2008-04-07 01:58:55 +00:00
|
|
|
(let ((year (calendar-extract-year date))
|
2003-10-01 20:48:17 +00:00
|
|
|
offset-years)
|
2008-03-10 02:46:24 +00:00
|
|
|
(cond ((zerop year)
|
2003-10-01 20:48:17 +00:00
|
|
|
(error "There was no year zero"))
|
|
|
|
((> year 0)
|
|
|
|
(setq offset-years (1- year))
|
2008-03-10 02:46:24 +00:00
|
|
|
(+ (calendar-day-number date) ; days this year
|
|
|
|
(* 365 offset-years) ; + days in prior years
|
2003-10-01 20:48:17 +00:00
|
|
|
(/ offset-years 4) ; + Julian leap years
|
|
|
|
(- (/ offset-years 100)) ; - century years
|
|
|
|
(/ offset-years 400))) ; + Gregorian leap years
|
|
|
|
(t
|
|
|
|
;; Years between date and 1 BC, excluding 1 BC (1 for 2 BC, etc).
|
|
|
|
(setq offset-years (abs (1+ year)))
|
|
|
|
(- (calendar-day-number date)
|
|
|
|
(* 365 offset-years)
|
|
|
|
(/ offset-years 4)
|
|
|
|
(- (/ offset-years 100))
|
|
|
|
(/ offset-years 400)
|
|
|
|
(calendar-day-number '(12 31 -1))))))) ; days in year 1 BC
|
1992-06-30 13:54:21 +00:00
|
|
|
|
1992-06-03 02:55:55 +00:00
|
|
|
;;;###autoload
|
1992-05-04 16:48:30 +00:00
|
|
|
(defun calendar (&optional arg)
|
2008-03-25 03:42:55 +00:00
|
|
|
"Display a three-month Gregorian calendar.
|
|
|
|
The three months appear side by side, with the current month in
|
|
|
|
the middle surrounded by the previous and next months. The
|
|
|
|
cursor is put on today's date. If optional prefix argument ARG
|
|
|
|
is non-nil, prompts for the central month and year.
|
|
|
|
|
|
|
|
Once in the calendar window, future or past months can be moved
|
|
|
|
into view. Arbitrary months can be displayed, or the calendar
|
|
|
|
can be scrolled forward or backward. The cursor can be moved
|
|
|
|
forward or backward by one day, one week, one month, or one year.
|
|
|
|
All of these commands take prefix arguments which, when negative,
|
|
|
|
cause movement in the opposite direction. For convenience, the
|
|
|
|
digit keys and the minus sign are automatically prefixes. Use
|
|
|
|
\\[describe-mode] for details of the key bindings in the calendar
|
|
|
|
window.
|
|
|
|
|
|
|
|
Displays the calendar in a separate window, or optionally in a
|
|
|
|
separate frame, depending on the value of `calendar-setup'.
|
|
|
|
|
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
2008-04-07 01:58:55 +00:00
|
|
|
If `calendar-view-diary-initially-flag' is non-nil, also displays the
|
2008-03-25 03:42:55 +00:00
|
|
|
diary entries for the current date (or however many days
|
2008-04-06 20:54:25 +00:00
|
|
|
`diary-number-of-entries' specifies). This variable can be
|
2008-03-25 03:42:55 +00:00
|
|
|
overridden by `calendar-setup'. As well as being displayed,
|
|
|
|
diary entries can also be marked on the calendar (see
|
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
2008-04-07 01:58:55 +00:00
|
|
|
`calendar-mark-diary-entries-flag').
|
2008-03-25 03:42:55 +00:00
|
|
|
|
|
|
|
Runs the following hooks:
|
|
|
|
|
|
|
|
`calendar-load-hook' - after loading calendar.el
|
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
2008-04-07 01:58:55 +00:00
|
|
|
`calendar-today-visible-hook', `calendar-today-invisible-hook' - after
|
2008-03-25 03:42:55 +00:00
|
|
|
generating a calendar, if today's date is visible or not, respectively
|
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
2008-04-07 01:58:55 +00:00
|
|
|
`calendar-initial-window-hook' - after first creating a calendar
|
2008-03-25 03:42:55 +00:00
|
|
|
|
|
|
|
This function is suitable for execution in a .emacs file."
|
1995-09-21 02:40:35 +00:00
|
|
|
(interactive "P")
|
2008-03-25 03:42:55 +00:00
|
|
|
;; Avoid loading cal-x unless it will be used.
|
|
|
|
(if (and (memq calendar-setup '(one-frame two-frames calendar-only))
|
|
|
|
(display-multi-frame-p))
|
|
|
|
(calendar-frame-setup calendar-setup arg)
|
|
|
|
(calendar-basic-setup arg)))
|
|
|
|
|
|
|
|
(defun calendar-basic-setup (&optional arg nodisplay)
|
|
|
|
"Create a three-month calendar.
|
|
|
|
If optional prefix argument ARG is non-nil, prompts for the month
|
|
|
|
and year, else uses the current date. If NODISPLAY is non-nil, don't
|
|
|
|
display the generated calendar."
|
1992-05-04 16:48:30 +00:00
|
|
|
(interactive "P")
|
2009-10-07 02:57:46 +00:00
|
|
|
(let ((buff (current-buffer)))
|
|
|
|
(set-buffer (get-buffer-create calendar-buffer))
|
|
|
|
(calendar-mode)
|
|
|
|
(let* ((pop-up-windows t)
|
|
|
|
;; Not really needed now, but means we use exactly the same
|
|
|
|
;; behavior as before in the non-wide case (see below).
|
|
|
|
(split-height-threshold 1000)
|
2009-10-10 20:50:39 +00:00
|
|
|
(split-width-threshold calendar-split-width-threshold)
|
2009-10-07 02:57:46 +00:00
|
|
|
(date (if arg (calendar-read-date t)
|
|
|
|
(calendar-current-date)))
|
|
|
|
(month (calendar-extract-month date))
|
|
|
|
(year (calendar-extract-year date)))
|
|
|
|
(calendar-increment-month month year (- calendar-offset))
|
|
|
|
;; Display the buffer before calling calendar-generate-window so that it
|
|
|
|
;; can get a chance to adjust the window sizes to the frame size.
|
|
|
|
(unless nodisplay
|
|
|
|
;; We want a window configuration that looks something like
|
|
|
|
;; X X | Y
|
|
|
|
;; - -----
|
|
|
|
;; C Z | C
|
|
|
|
;; where C is the calendar, and the LHS is the traditional,
|
|
|
|
;; non-wide frame, and the RHS is the wide frame case.
|
|
|
|
;; We should end up in the same state regardless of whether the
|
|
|
|
;; windows were initially split or not.
|
|
|
|
;; Previously, we only thought about the non-wide case.
|
|
|
|
;; We could just set split-height-threshold to 1000, relying on
|
|
|
|
;; the fact that the window splitting treated a single window as
|
|
|
|
;; a special case and would always split it (vertically). The
|
|
|
|
;; same thing does not work in the wide-frame case, so now we do
|
|
|
|
;; the splitting by hand.
|
|
|
|
;; See discussion in bug#1806.
|
|
|
|
;; Actually, this still does not do quite the right thing in the
|
|
|
|
;; wide frame case if started from a configuration like the LHS.
|
|
|
|
;; Eg if you start with a non-wide frame, call calendar, then
|
|
|
|
;; make the frame wider. This one is problematic because you
|
|
|
|
;; might need to split a totally unrelated window. Oh well, it
|
|
|
|
;; seems unlikely, and perhaps respecting the original layout is
|
|
|
|
;; the right thing in that case.
|
|
|
|
;;
|
|
|
|
;; Is this a wide frame? If so, split it horizontally.
|
|
|
|
(if (window-splittable-p t) (split-window-horizontally))
|
|
|
|
(pop-to-buffer calendar-buffer)
|
|
|
|
;; Has the window already been split vertically?
|
|
|
|
(when (and (not (window-dedicated-p))
|
|
|
|
(window-full-height-p))
|
|
|
|
(let ((win (split-window-vertically)))
|
|
|
|
;; In the upper window, show whatever was visible before.
|
|
|
|
;; This looks better than using other-buffer.
|
|
|
|
(switch-to-buffer buff)
|
|
|
|
;; Switch to the lower window with the calendar buffer.
|
|
|
|
(select-window win))))
|
|
|
|
(calendar-generate-window month year)
|
|
|
|
(if (and calendar-view-diary-initially-flag
|
|
|
|
(calendar-date-is-visible-p date))
|
|
|
|
(diary-view-entries))))
|
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
2008-04-07 01:58:55 +00:00
|
|
|
(if calendar-view-holidays-initially-flag
|
2008-03-17 02:30:06 +00:00
|
|
|
(let* ((diary-buffer (get-file-buffer diary-file))
|
|
|
|
(diary-window (if diary-buffer (get-buffer-window diary-buffer)))
|
|
|
|
(split-height-threshold (if diary-window 2 1000)))
|
|
|
|
;; FIXME display buffer?
|
2007-09-14 04:30:30 +00:00
|
|
|
(calendar-list-holidays)))
|
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
2008-04-07 01:58:55 +00:00
|
|
|
(run-hooks 'calendar-initial-window-hook))
|
1992-05-04 16:48:30 +00:00
|
|
|
|
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
2008-04-07 01:58:55 +00:00
|
|
|
(defun calendar-generate-window (&optional mon yr)
|
1992-08-12 12:50:10 +00:00
|
|
|
"Generate the calendar window for the current date.
|
2008-03-25 03:42:55 +00:00
|
|
|
Optional integers MON and YR are used instead of today's date."
|
2007-07-29 20:49:13 +00:00
|
|
|
(let* ((inhibit-read-only t)
|
1992-05-04 16:48:30 +00:00
|
|
|
(today (calendar-current-date))
|
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
2008-04-07 01:58:55 +00:00
|
|
|
(month (calendar-extract-month today))
|
|
|
|
(day (calendar-extract-day today))
|
|
|
|
(year (calendar-extract-year today))
|
2008-04-02 03:35:38 +00:00
|
|
|
(today-visible (or (not mon)
|
|
|
|
(<= (abs (calendar-interval mon yr month year)) 1)))
|
2005-02-27 20:25:48 +00:00
|
|
|
(day-in-week (calendar-day-of-week today))
|
|
|
|
(in-calendar-window (eq (window-buffer (selected-window))
|
|
|
|
(get-buffer calendar-buffer))))
|
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
2008-04-07 01:58:55 +00:00
|
|
|
(calendar-generate (or mon month) (or yr year))
|
|
|
|
(calendar-update-mode-line)
|
1992-05-04 16:48:30 +00:00
|
|
|
(calendar-cursor-to-visible-date
|
|
|
|
(if today-visible today (list displayed-month 1 displayed-year)))
|
|
|
|
(set-buffer-modified-p nil)
|
2005-02-27 20:25:48 +00:00
|
|
|
;; Don't do any window-related stuff if we weren't called from a
|
2008-03-10 02:46:24 +00:00
|
|
|
;; window displaying the calendar.
|
2005-02-27 20:25:48 +00:00
|
|
|
(when in-calendar-window
|
2009-10-03 02:19:22 +00:00
|
|
|
;; The second test used to be window-full-width-p.
|
|
|
|
;; Not sure what it was/is for, except perhaps some way of saying
|
|
|
|
;; "try not to mess with existing configurations".
|
|
|
|
;; If did the wrong thing on wide frames, where we have done a
|
|
|
|
;; horizontal split in calendar-basic-setup.
|
|
|
|
(if (or (one-window-p t) (not (window-safely-shrinkable-p)))
|
2005-02-27 20:25:48 +00:00
|
|
|
;; Don't mess with the window size, but ensure that the first
|
2008-03-10 02:46:24 +00:00
|
|
|
;; line is fully visible.
|
2005-02-27 20:25:48 +00:00
|
|
|
(set-window-vscroll nil 0)
|
2008-03-10 02:46:24 +00:00
|
|
|
;; Adjust the window to exactly fit the displayed calendar.
|
2005-02-27 20:25:48 +00:00
|
|
|
(fit-window-to-buffer nil nil calendar-minimum-window-height))
|
|
|
|
(sit-for 0))
|
2008-04-03 04:07:45 +00:00
|
|
|
(and (bound-and-true-p font-lock-mode)
|
|
|
|
(font-lock-fontify-buffer))
|
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
2008-04-07 01:58:55 +00:00
|
|
|
(and calendar-mark-holidays-flag
|
2008-03-06 15:01:24 +00:00
|
|
|
;;; (calendar-date-is-valid-p today) ; useful for BC dates
|
2008-03-13 06:00:07 +00:00
|
|
|
(calendar-mark-holidays)
|
2005-02-27 20:25:48 +00:00
|
|
|
(and in-calendar-window (sit-for 0)))
|
1992-05-04 16:48:30 +00:00
|
|
|
(unwind-protect
|
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
2008-04-07 01:58:55 +00:00
|
|
|
(if calendar-mark-diary-entries-flag (diary-mark-entries))
|
1992-05-04 16:48:30 +00:00
|
|
|
(if today-visible
|
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
2008-04-07 01:58:55 +00:00
|
|
|
(run-hooks 'calendar-today-visible-hook)
|
|
|
|
(run-hooks 'calendar-today-invisible-hook)))))
|
1992-05-04 16:48:30 +00:00
|
|
|
|
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
2008-04-07 01:58:55 +00:00
|
|
|
(defun calendar-generate (month year)
|
2004-02-23 00:11:12 +00:00
|
|
|
"Generate a three-month Gregorian calendar centered around MONTH, YEAR."
|
2007-07-25 21:59:26 +00:00
|
|
|
;; A negative YEAR is interpreted as BC; -1 being 1 BC, and so on.
|
|
|
|
;; Note that while calendars for years BC could be displayed as it
|
|
|
|
;; stands, almost all other calendar functions (eg holidays) would
|
|
|
|
;; at best have unpredictable results for such dates.
|
2004-02-23 00:11:12 +00:00
|
|
|
(if (< (+ month (* 12 (1- year))) 2)
|
2005-02-27 20:25:48 +00:00
|
|
|
(error "Months before January, 1 AD cannot be displayed"))
|
2004-02-23 00:11:12 +00:00
|
|
|
(setq displayed-month month
|
|
|
|
displayed-year year)
|
1992-05-04 16:48:30 +00:00
|
|
|
(erase-buffer)
|
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
2008-04-07 01:58:55 +00:00
|
|
|
(calendar-increment-month month year -1)
|
2007-07-24 06:12:32 +00:00
|
|
|
(dotimes (i 3)
|
2008-06-21 19:28:09 +00:00
|
|
|
(calendar-generate-month month year
|
|
|
|
(+ calendar-left-margin
|
|
|
|
(* calendar-month-width i)))
|
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
2008-04-07 01:58:55 +00:00
|
|
|
(calendar-increment-month month year 1)))
|
1992-05-04 16:48:30 +00:00
|
|
|
|
2008-06-21 19:28:09 +00:00
|
|
|
(defun calendar-move-to-column (indent)
|
|
|
|
"Like `move-to-column', but indents if the line is too short."
|
|
|
|
(if (< (move-to-column indent) indent)
|
|
|
|
(indent-to indent)))
|
|
|
|
|
|
|
|
(defun calendar-ensure-newline ()
|
|
|
|
"Move to the next line, adding a newline if necessary."
|
|
|
|
(or (zerop (forward-line 1))
|
|
|
|
(insert "\n")))
|
|
|
|
|
2008-06-26 03:41:20 +00:00
|
|
|
(defun calendar-insert-at-column (indent string truncate)
|
|
|
|
"Move to column INDENT, adding spaces as needed.
|
|
|
|
Inserts STRING so that it ends at INDENT. STRING is either a
|
|
|
|
literal string, or a sexp to evaluate to return such. Truncates
|
|
|
|
STRING to length TRUNCATE, ensure a trailing space."
|
|
|
|
(if (not (ignore-errors (stringp (setq string (eval string)))))
|
|
|
|
(calendar-move-to-column indent)
|
|
|
|
(if (> (length string) truncate)
|
|
|
|
(setq string (substring string 0 truncate)))
|
|
|
|
(or (string-match " $" string)
|
|
|
|
(if (= (length string) truncate)
|
|
|
|
(aset string (1- truncate) ?\s)
|
|
|
|
(setq string (concat string " "))))
|
|
|
|
(calendar-move-to-column (- indent (length string)))
|
|
|
|
(insert string)))
|
|
|
|
|
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
2008-04-07 01:58:55 +00:00
|
|
|
(defun calendar-generate-month (month year indent)
|
1992-05-04 16:48:30 +00:00
|
|
|
"Produce a calendar for MONTH, YEAR on the Gregorian calendar.
|
2002-01-28 19:23:14 +00:00
|
|
|
The calendar is inserted at the top of the buffer in which point is currently
|
|
|
|
located, but indented INDENT spaces. The indentation is done from the first
|
|
|
|
character on the line and does not disturb the first INDENT characters on the
|
2004-02-23 00:11:12 +00:00
|
|
|
line."
|
2008-03-15 03:00:17 +00:00
|
|
|
(let ((blank-days ; at start of month
|
|
|
|
(mod
|
|
|
|
(- (calendar-day-of-week (list month 1 year))
|
|
|
|
calendar-week-start-day)
|
|
|
|
7))
|
2008-04-02 03:35:38 +00:00
|
|
|
(last (calendar-last-day-of-month month year))
|
2008-06-26 03:41:20 +00:00
|
|
|
(trunc (min calendar-intermonth-spacing
|
|
|
|
(1- calendar-left-margin)))
|
|
|
|
(day 1)
|
|
|
|
string)
|
1993-10-20 05:49:24 +00:00
|
|
|
(goto-char (point-min))
|
2008-06-21 19:28:09 +00:00
|
|
|
(calendar-move-to-column indent)
|
|
|
|
(insert
|
1993-10-20 05:49:24 +00:00
|
|
|
(calendar-string-spread
|
2008-06-21 19:28:09 +00:00
|
|
|
(list (format "%s %d" (calendar-month-name month) year))
|
|
|
|
?\s calendar-month-digit-width))
|
|
|
|
(calendar-ensure-newline)
|
2008-06-26 03:41:20 +00:00
|
|
|
(calendar-insert-at-column indent calendar-intermonth-header trunc)
|
2003-08-03 13:59:13 +00:00
|
|
|
;; Use the first two characters of each day to head the columns.
|
2007-07-24 06:12:32 +00:00
|
|
|
(dotimes (i 7)
|
|
|
|
(insert
|
2008-04-02 03:35:38 +00:00
|
|
|
(progn
|
|
|
|
(setq string
|
|
|
|
(calendar-day-name (mod (+ calendar-week-start-day i) 7) nil t))
|
2007-07-24 06:12:32 +00:00
|
|
|
(if enable-multibyte-characters
|
2008-06-21 19:28:09 +00:00
|
|
|
(truncate-string-to-width string calendar-day-header-width)
|
|
|
|
(substring string 0 calendar-day-header-width)))
|
|
|
|
(make-string (- calendar-column-width calendar-day-header-width) ?\s)))
|
|
|
|
(calendar-ensure-newline)
|
2008-06-26 03:41:20 +00:00
|
|
|
(calendar-insert-at-column indent calendar-intermonth-text trunc)
|
2008-03-10 02:46:24 +00:00
|
|
|
;; Add blank days before the first of the month.
|
2008-06-21 19:28:09 +00:00
|
|
|
(insert (make-string (* blank-days calendar-column-width) ?\s))
|
2008-03-10 02:46:24 +00:00
|
|
|
;; Put in the days of the month.
|
2008-03-15 03:00:17 +00:00
|
|
|
(dotimes (i last)
|
2008-06-17 05:56:48 +00:00
|
|
|
(setq day (1+ i))
|
2008-06-27 02:41:14 +00:00
|
|
|
;; TODO should numbers be left-justified, centered...?
|
2008-06-21 19:28:09 +00:00
|
|
|
(insert (format (format "%%%dd%%s" calendar-day-digit-width) day
|
|
|
|
(make-string
|
|
|
|
(- calendar-column-width calendar-day-digit-width) ?\s)))
|
2008-06-26 03:41:20 +00:00
|
|
|
;; 'date property prevents intermonth text confusing re-searches.
|
|
|
|
;; (Tried intangible, it did not really work.)
|
|
|
|
(set-text-properties
|
2008-06-21 19:28:09 +00:00
|
|
|
(- (point) (1+ calendar-day-digit-width)) (1- (point))
|
2008-06-26 03:41:20 +00:00
|
|
|
`(mouse-face highlight help-echo ,(eval calendar-date-echo-text)
|
|
|
|
date t))
|
|
|
|
(when (and (zerop (mod (+ day blank-days) 7))
|
|
|
|
(/= day last))
|
|
|
|
(calendar-ensure-newline)
|
|
|
|
(setq day (1+ day)) ; first day of next week
|
|
|
|
(calendar-insert-at-column indent calendar-intermonth-text trunc)))))
|
1992-05-04 16:48:30 +00:00
|
|
|
|
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
2008-04-07 01:58:55 +00:00
|
|
|
(defun calendar-redraw ()
|
2005-03-01 10:24:33 +00:00
|
|
|
"Redraw the calendar display, if `calendar-buffer' is live."
|
1992-05-04 16:48:30 +00:00
|
|
|
(interactive)
|
2005-03-01 10:24:33 +00:00
|
|
|
(if (get-buffer calendar-buffer)
|
2005-03-11 21:44:42 +00:00
|
|
|
(with-current-buffer calendar-buffer
|
2005-03-16 13:23:09 +00:00
|
|
|
(let ((cursor-date (calendar-cursor-to-nearest-date)))
|
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
2008-04-07 01:58:55 +00:00
|
|
|
(calendar-generate-window displayed-month displayed-year)
|
2005-03-11 21:44:42 +00:00
|
|
|
(calendar-cursor-to-visible-date cursor-date)))))
|
2005-03-09 00:28:22 +00:00
|
|
|
|
2007-07-25 21:59:26 +00:00
|
|
|
(defvar calendar-mode-map
|
2006-01-24 17:07:29 +00:00
|
|
|
(let ((map (make-keymap)))
|
|
|
|
(suppress-keymap map)
|
|
|
|
(dolist (c '(narrow-to-region mark-word mark-sexp mark-paragraph
|
|
|
|
mark-defun mark-whole-buffer mark-page
|
|
|
|
downcase-region upcase-region kill-region
|
|
|
|
copy-region-as-kill capitalize-region write-region))
|
|
|
|
(define-key map (vector 'remap c) 'calendar-not-implemented))
|
2007-07-27 06:28:39 +00:00
|
|
|
(define-key map "<" 'calendar-scroll-right)
|
|
|
|
(define-key map "\C-x<" 'calendar-scroll-right)
|
|
|
|
(define-key map [prior] 'calendar-scroll-right-three-months)
|
|
|
|
(define-key map "\ev" 'calendar-scroll-right-three-months)
|
|
|
|
(define-key map ">" 'calendar-scroll-left)
|
|
|
|
(define-key map "\C-x>" 'calendar-scroll-left)
|
|
|
|
(define-key map [next] 'calendar-scroll-left-three-months)
|
|
|
|
(define-key map "\C-v" 'calendar-scroll-left-three-months)
|
2006-01-24 17:07:29 +00:00
|
|
|
(define-key map "\C-b" 'calendar-backward-day)
|
|
|
|
(define-key map "\C-p" 'calendar-backward-week)
|
|
|
|
(define-key map "\e{" 'calendar-backward-month)
|
|
|
|
(define-key map "\C-x[" 'calendar-backward-year)
|
|
|
|
(define-key map "\C-f" 'calendar-forward-day)
|
|
|
|
(define-key map "\C-n" 'calendar-forward-week)
|
|
|
|
(define-key map [left] 'calendar-backward-day)
|
|
|
|
(define-key map [up] 'calendar-backward-week)
|
|
|
|
(define-key map [right] 'calendar-forward-day)
|
|
|
|
(define-key map [down] 'calendar-forward-week)
|
|
|
|
(define-key map "\e}" 'calendar-forward-month)
|
|
|
|
(define-key map "\C-x]" 'calendar-forward-year)
|
|
|
|
(define-key map "\C-a" 'calendar-beginning-of-week)
|
|
|
|
(define-key map "\C-e" 'calendar-end-of-week)
|
|
|
|
(define-key map "\ea" 'calendar-beginning-of-month)
|
|
|
|
(define-key map "\ee" 'calendar-end-of-month)
|
|
|
|
(define-key map "\e<" 'calendar-beginning-of-year)
|
|
|
|
(define-key map "\e>" 'calendar-end-of-year)
|
|
|
|
(define-key map "\C-@" 'calendar-set-mark)
|
|
|
|
;; Many people are used to typing C-SPC and getting C-@.
|
2007-07-25 21:59:26 +00:00
|
|
|
(define-key map [?\C-\s] 'calendar-set-mark)
|
2006-01-24 17:07:29 +00:00
|
|
|
(define-key map "\C-x\C-x" 'calendar-exchange-point-and-mark)
|
|
|
|
(define-key map "\e=" 'calendar-count-days-region)
|
|
|
|
(define-key map "gd" 'calendar-goto-date)
|
|
|
|
(define-key map "gD" 'calendar-goto-day-of-year)
|
2008-04-04 07:32:39 +00:00
|
|
|
(define-key map "gj" 'calendar-julian-goto-date)
|
|
|
|
(define-key map "ga" 'calendar-astro-goto-day-number)
|
2008-04-05 20:58:10 +00:00
|
|
|
(define-key map "gh" 'calendar-hebrew-goto-date)
|
2008-04-04 07:32:39 +00:00
|
|
|
(define-key map "gi" 'calendar-islamic-goto-date)
|
2007-09-16 02:26:29 +00:00
|
|
|
(define-key map "gb" 'calendar-bahai-goto-date)
|
2008-04-05 20:58:10 +00:00
|
|
|
(define-key map "gC" 'calendar-chinese-goto-date)
|
2008-04-05 19:16:40 +00:00
|
|
|
(define-key map "gk" 'calendar-coptic-goto-date)
|
|
|
|
(define-key map "ge" 'calendar-ethiopic-goto-date)
|
2008-04-04 07:32:39 +00:00
|
|
|
(define-key map "gp" 'calendar-persian-goto-date)
|
|
|
|
(define-key map "gc" 'calendar-iso-goto-date)
|
|
|
|
(define-key map "gw" 'calendar-iso-goto-week)
|
2008-04-05 19:16:40 +00:00
|
|
|
(define-key map "gf" 'calendar-french-goto-date)
|
2008-04-04 07:32:39 +00:00
|
|
|
(define-key map "gml" 'calendar-mayan-goto-long-count-date)
|
|
|
|
(define-key map "gmpc" 'calendar-mayan-previous-round-date)
|
|
|
|
(define-key map "gmnc" 'calendar-mayan-next-round-date)
|
|
|
|
(define-key map "gmph" 'calendar-mayan-previous-haab-date)
|
|
|
|
(define-key map "gmnh" 'calendar-mayan-next-haab-date)
|
|
|
|
(define-key map "gmpt" 'calendar-mayan-previous-tzolkin-date)
|
|
|
|
(define-key map "gmnt" 'calendar-mayan-next-tzolkin-date)
|
2006-01-24 17:07:29 +00:00
|
|
|
(define-key map "Aa" 'appt-add)
|
|
|
|
(define-key map "Ad" 'appt-delete)
|
|
|
|
(define-key map "S" 'calendar-sunrise-sunset)
|
2008-06-27 00:33:42 +00:00
|
|
|
(define-key map "M" 'calendar-lunar-phases)
|
2006-01-24 17:07:29 +00:00
|
|
|
(define-key map " " 'scroll-other-window)
|
2008-04-07 07:25:40 +00:00
|
|
|
(define-key map "\d" 'scroll-other-window-down)
|
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
2008-04-07 01:58:55 +00:00
|
|
|
(define-key map "\C-c\C-l" 'calendar-redraw)
|
2006-01-24 17:07:29 +00:00
|
|
|
(define-key map "." 'calendar-goto-today)
|
|
|
|
(define-key map "o" 'calendar-other-month)
|
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
2008-04-07 01:58:55 +00:00
|
|
|
(define-key map "q" 'calendar-exit)
|
2007-09-14 04:30:30 +00:00
|
|
|
(define-key map "a" 'calendar-list-holidays)
|
2006-01-24 17:07:29 +00:00
|
|
|
(define-key map "h" 'calendar-cursor-holidays)
|
2008-04-01 02:46:29 +00:00
|
|
|
(define-key map "x" 'calendar-mark-holidays)
|
2006-01-24 17:07:29 +00:00
|
|
|
(define-key map "u" 'calendar-unmark)
|
2008-04-06 20:54:25 +00:00
|
|
|
(define-key map "m" 'diary-mark-entries)
|
2006-01-24 17:07:29 +00:00
|
|
|
(define-key map "d" 'diary-view-entries)
|
2008-04-06 20:54:25 +00:00
|
|
|
(define-key map "D" 'diary-view-other-diary-entries)
|
2006-05-13 05:32:29 +00:00
|
|
|
(define-key map "s" 'diary-show-all-entries)
|
2006-01-24 17:07:29 +00:00
|
|
|
(define-key map "pd" 'calendar-print-day-of-year)
|
2008-04-05 20:58:10 +00:00
|
|
|
(define-key map "pC" 'calendar-chinese-print-date)
|
2008-04-05 19:16:40 +00:00
|
|
|
(define-key map "pk" 'calendar-coptic-print-date)
|
|
|
|
(define-key map "pe" 'calendar-ethiopic-print-date)
|
2008-04-04 07:32:39 +00:00
|
|
|
(define-key map "pp" 'calendar-persian-print-date)
|
|
|
|
(define-key map "pc" 'calendar-iso-print-date)
|
|
|
|
(define-key map "pj" 'calendar-julian-print-date)
|
|
|
|
(define-key map "pa" 'calendar-astro-print-day-number)
|
2008-04-05 20:58:10 +00:00
|
|
|
(define-key map "ph" 'calendar-hebrew-print-date)
|
2008-04-04 07:32:39 +00:00
|
|
|
(define-key map "pi" 'calendar-islamic-print-date)
|
2007-09-16 02:26:29 +00:00
|
|
|
(define-key map "pb" 'calendar-bahai-print-date)
|
2008-04-05 19:16:40 +00:00
|
|
|
(define-key map "pf" 'calendar-french-print-date)
|
2008-04-04 07:32:39 +00:00
|
|
|
(define-key map "pm" 'calendar-mayan-print-date)
|
2006-01-24 17:07:29 +00:00
|
|
|
(define-key map "po" 'calendar-print-other-dates)
|
2008-04-06 20:54:25 +00:00
|
|
|
(define-key map "id" 'diary-insert-entry)
|
|
|
|
(define-key map "iw" 'diary-insert-weekly-entry)
|
|
|
|
(define-key map "im" 'diary-insert-monthly-entry)
|
|
|
|
(define-key map "iy" 'diary-insert-yearly-entry)
|
|
|
|
(define-key map "ia" 'diary-insert-anniversary-entry)
|
|
|
|
(define-key map "ib" 'diary-insert-block-entry)
|
|
|
|
(define-key map "ic" 'diary-insert-cyclic-entry)
|
2008-04-05 20:58:10 +00:00
|
|
|
(define-key map "ihd" 'diary-hebrew-insert-entry)
|
|
|
|
(define-key map "ihm" 'diary-hebrew-insert-monthly-entry)
|
2008-04-24 05:42:47 +00:00
|
|
|
(define-key map "ihy" 'diary-hebrew-insert-yearly-entry)
|
2008-04-04 07:32:39 +00:00
|
|
|
(define-key map "iid" 'diary-islamic-insert-entry)
|
|
|
|
(define-key map "iim" 'diary-islamic-insert-monthly-entry)
|
|
|
|
(define-key map "iiy" 'diary-islamic-insert-yearly-entry)
|
2007-09-16 02:26:29 +00:00
|
|
|
(define-key map "iBd" 'diary-bahai-insert-entry)
|
|
|
|
(define-key map "iBm" 'diary-bahai-insert-monthly-entry)
|
|
|
|
(define-key map "iBy" 'diary-bahai-insert-yearly-entry)
|
2006-01-24 17:07:29 +00:00
|
|
|
(define-key map "?" 'calendar-goto-info-node)
|
2006-10-28 21:53:34 +00:00
|
|
|
(define-key map "Hm" 'cal-html-cursor-month)
|
|
|
|
(define-key map "Hy" 'cal-html-cursor-year)
|
2006-01-24 17:07:29 +00:00
|
|
|
(define-key map "tm" 'cal-tex-cursor-month)
|
|
|
|
(define-key map "tM" 'cal-tex-cursor-month-landscape)
|
|
|
|
(define-key map "td" 'cal-tex-cursor-day)
|
|
|
|
(define-key map "tw1" 'cal-tex-cursor-week)
|
|
|
|
(define-key map "tw2" 'cal-tex-cursor-week2)
|
|
|
|
(define-key map "tw3" 'cal-tex-cursor-week-iso)
|
|
|
|
(define-key map "tw4" 'cal-tex-cursor-week-monday)
|
|
|
|
(define-key map "tfd" 'cal-tex-cursor-filofax-daily)
|
|
|
|
(define-key map "tfw" 'cal-tex-cursor-filofax-2week)
|
|
|
|
(define-key map "tfW" 'cal-tex-cursor-filofax-week)
|
|
|
|
(define-key map "tfy" 'cal-tex-cursor-filofax-year)
|
|
|
|
(define-key map "ty" 'cal-tex-cursor-year)
|
|
|
|
(define-key map "tY" 'cal-tex-cursor-year-landscape)
|
2007-07-25 21:59:26 +00:00
|
|
|
|
|
|
|
(define-key map [menu-bar edit] 'undefined)
|
|
|
|
(define-key map [menu-bar search] 'undefined)
|
|
|
|
|
2008-06-26 22:30:01 +00:00
|
|
|
(easy-menu-define nil map nil cal-menu-sunmoon-menu)
|
2007-07-25 21:59:26 +00:00
|
|
|
(easy-menu-define nil map nil cal-menu-diary-menu)
|
|
|
|
(easy-menu-define nil map nil cal-menu-holidays-menu)
|
|
|
|
(easy-menu-define nil map nil cal-menu-goto-menu)
|
|
|
|
(easy-menu-define nil map nil cal-menu-scroll-menu)
|
2008-03-06 15:01:24 +00:00
|
|
|
|
2008-06-17 05:56:48 +00:00
|
|
|
;; These are referenced in the default calendar-date-echo-text.
|
2007-07-25 21:59:26 +00:00
|
|
|
(define-key map [down-mouse-3]
|
|
|
|
(easy-menu-binding cal-menu-context-mouse-menu))
|
|
|
|
(define-key map [down-mouse-2]
|
|
|
|
(easy-menu-binding cal-menu-global-mouse-menu))
|
|
|
|
|
2009-09-22 07:37:58 +00:00
|
|
|
;; Left-click moves us forward in time, right-click backwards.
|
|
|
|
;; cf scroll-bar.el.
|
|
|
|
(define-key map [vertical-scroll-bar mouse-1] 'calendar-scroll-left)
|
|
|
|
(define-key map [vertical-scroll-bar drag-mouse-1] 'calendar-scroll-left)
|
|
|
|
;; down-mouse-2 stays as scroll-bar-drag.
|
|
|
|
(define-key map [vertical-scroll-bar mouse-3] 'calendar-scroll-right)
|
|
|
|
(define-key map [vertical-scroll-bar drag-mouse-3] 'calendar-scroll-right)
|
|
|
|
|
2008-03-10 02:46:24 +00:00
|
|
|
map)
|
|
|
|
"Keymap for `calendar-mode'.")
|
1992-05-04 16:48:30 +00:00
|
|
|
|
|
|
|
;; Calendar mode is suitable only for specially formatted data.
|
|
|
|
(put 'calendar-mode 'mode-class 'special)
|
|
|
|
|
2008-06-17 05:56:48 +00:00
|
|
|
(defun calendar-mode-line-entry (command echo &optional key string)
|
|
|
|
"Return a propertized string for `calendar-mode-line-format'.
|
|
|
|
COMMAND is a command to run, ECHO is the help-echo text, KEY
|
|
|
|
is COMMAND's keybinding, STRING describes the binding."
|
|
|
|
(propertize (or key
|
|
|
|
(substitute-command-keys
|
|
|
|
(format "\\<calendar-mode-map>\\[%s] %s" command string)))
|
|
|
|
'help-echo (format "mouse-1: %s" echo)
|
|
|
|
'mouse-face 'mode-line-highlight
|
|
|
|
'keymap (make-mode-line-mouse-map 'mouse-1 command)))
|
|
|
|
|
2008-03-10 02:46:24 +00:00
|
|
|
;; After calendar-mode-map.
|
|
|
|
(defcustom calendar-mode-line-format
|
1992-08-12 12:50:10 +00:00
|
|
|
(list
|
2008-06-17 05:56:48 +00:00
|
|
|
(calendar-mode-line-entry 'calendar-scroll-right "previous month" "<")
|
1992-08-12 12:50:10 +00:00
|
|
|
"Calendar"
|
2000-09-17 17:06:00 +00:00
|
|
|
(concat
|
2008-06-17 05:56:48 +00:00
|
|
|
(calendar-mode-line-entry 'calendar-goto-info-node "read Info on Calendar"
|
|
|
|
nil "info")
|
2006-12-23 19:07:12 +00:00
|
|
|
" / "
|
2008-06-17 05:56:48 +00:00
|
|
|
(calendar-mode-line-entry 'calendar-other-month "choose another month"
|
|
|
|
nil "other")
|
2006-12-23 19:07:12 +00:00
|
|
|
" / "
|
2008-06-17 05:56:48 +00:00
|
|
|
(calendar-mode-line-entry 'calendar-goto-today "go to today's date"
|
|
|
|
nil "today"))
|
1992-08-12 12:50:10 +00:00
|
|
|
'(calendar-date-string (calendar-current-date) t)
|
2008-06-17 05:56:48 +00:00
|
|
|
(calendar-mode-line-entry 'calendar-scroll-left "next month" ">"))
|
2002-04-03 14:36:02 +00:00
|
|
|
"The mode line of the calendar buffer.
|
2008-06-17 05:56:48 +00:00
|
|
|
This is a list of items that evaluate to strings. The elements
|
|
|
|
are evaluated and concatenated, evenly separated by blanks.
|
|
|
|
During evaluation, the variable `date' is available as the date
|
|
|
|
nearest the cursor (or today's date if that fails). To update
|
|
|
|
the mode-line as the cursor moves, add `calendar-update-mode-line'
|
|
|
|
to `calendar-move-hook'. Here is an example that has the Hebrew date,
|
|
|
|
the day number/days remaining in the year, and the ISO week/year numbers:
|
2002-04-03 14:36:02 +00:00
|
|
|
|
2008-06-17 05:56:48 +00:00
|
|
|
(list
|
|
|
|
\"\"
|
|
|
|
'(calendar-hebrew-date-string date)
|
|
|
|
'(let* ((year (calendar-extract-year date))
|
|
|
|
(d (calendar-day-number date))
|
|
|
|
(days-remaining
|
|
|
|
(- (calendar-day-number (list 12 31 year)) d)))
|
|
|
|
(format \"%d/%d\" d days-remaining))
|
|
|
|
'(let* ((d (calendar-absolute-from-gregorian date))
|
|
|
|
(iso-date (calendar-iso-from-absolute d)))
|
|
|
|
(format \"ISO week %d of %d\"
|
|
|
|
(calendar-extract-month iso-date)
|
|
|
|
(calendar-extract-year iso-date)))
|
|
|
|
\"\"))"
|
|
|
|
:risky t
|
2008-03-10 02:46:24 +00:00
|
|
|
:type 'sexp
|
|
|
|
:group 'calendar)
|
1992-05-04 16:48:30 +00:00
|
|
|
|
1994-10-26 15:26:22 +00:00
|
|
|
(defun calendar-goto-info-node ()
|
|
|
|
"Go to the info node for the calendar."
|
|
|
|
(interactive)
|
2008-06-17 05:56:48 +00:00
|
|
|
(info "(emacs)Calendar/Diary")
|
|
|
|
(fit-window-to-buffer))
|
2002-11-16 19:19:35 +00:00
|
|
|
|
Move many autoloads to separate file, cal-loaddefs.el.
Move defcustoms to start and re-order.
(calendar-month-name-array, calendar-starred-day): No need to declare
for compiler.
(cal-loaddefs): Require it.
(appt, chinese-calendar, calendar-tex): Move custom groups to the
appropriate file.
(diary-entry-marker, calendar-today-marker, calendar-holiday-marker):
Reverse logic.
(diary-face, diary-file-name-prefix-function, diary-include-string)
(diary-glob-file-regexp-prefix, diary-face-attrs)
(diary-file-name-prefix, sexp-diary-entry-symbol)
(print-diary-entries-hook, list-diary-entries-hook)
(nongregorian-diary-listing-hook, mark-diary-entries-hook)
(nongregorian-diary-marking-hook, diary-list-include-blanks):
Move to diary-lib.
(all-christian-calendar-holidays, all-islamic-calendar-holidays)
(all-bahai-calendar-holidays): Doc fix.
(calendar-mark-ring): Add doc-string.
(calendar-starred-day): Defvar it.
(calendar-mode): Make calendar-starred-day local.
(calendar-star-date): No need to make calendar-starred-day local.
2008-03-08 03:47:03 +00:00
|
|
|
(defvar calendar-mark-ring nil
|
|
|
|
"Used by `calendar-set-mark'.")
|
|
|
|
|
2008-06-17 05:56:48 +00:00
|
|
|
(define-derived-mode calendar-mode nil "Calendar"
|
1992-08-12 12:50:10 +00:00
|
|
|
"A major mode for the calendar window.
|
2008-06-17 05:56:48 +00:00
|
|
|
For a complete description, see the info node `Calendar/Diary'.
|
1992-05-04 16:48:30 +00:00
|
|
|
|
1994-10-26 15:26:22 +00:00
|
|
|
\\<calendar-mode-map>\\{calendar-mode-map}"
|
2008-06-17 05:56:48 +00:00
|
|
|
(setq buffer-read-only t
|
2008-04-01 02:46:29 +00:00
|
|
|
buffer-undo-list t
|
Move many autoloads to separate file, cal-loaddefs.el.
Move defcustoms to start and re-order.
(calendar-month-name-array, calendar-starred-day): No need to declare
for compiler.
(cal-loaddefs): Require it.
(appt, chinese-calendar, calendar-tex): Move custom groups to the
appropriate file.
(diary-entry-marker, calendar-today-marker, calendar-holiday-marker):
Reverse logic.
(diary-face, diary-file-name-prefix-function, diary-include-string)
(diary-glob-file-regexp-prefix, diary-face-attrs)
(diary-file-name-prefix, sexp-diary-entry-symbol)
(print-diary-entries-hook, list-diary-entries-hook)
(nongregorian-diary-listing-hook, mark-diary-entries-hook)
(nongregorian-diary-marking-hook, diary-list-include-blanks):
Move to diary-lib.
(all-christian-calendar-holidays, all-islamic-calendar-holidays)
(all-bahai-calendar-holidays): Doc fix.
(calendar-mark-ring): Add doc-string.
(calendar-starred-day): Defvar it.
(calendar-mode): Make calendar-starred-day local.
(calendar-star-date): No need to make calendar-starred-day local.
2008-03-08 03:47:03 +00:00
|
|
|
indent-tabs-mode nil)
|
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
2008-04-07 01:58:55 +00:00
|
|
|
(calendar-update-mode-line)
|
1992-05-04 16:48:30 +00:00
|
|
|
(make-local-variable 'calendar-mark-ring)
|
2008-03-10 02:46:24 +00:00
|
|
|
(make-local-variable 'displayed-month) ; month in middle of window
|
|
|
|
(make-local-variable 'displayed-year) ; year in middle of window
|
2007-07-29 20:49:13 +00:00
|
|
|
;; Most functions only work if displayed-month and displayed-year are set,
|
|
|
|
;; so let's make sure they're always set. Most likely, this will be reset
|
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
2008-04-07 01:58:55 +00:00
|
|
|
;; soon in calendar-generate, but better safe than sorry.
|
2007-07-29 20:49:13 +00:00
|
|
|
(unless (boundp 'displayed-month) (setq displayed-month 1))
|
|
|
|
(unless (boundp 'displayed-year) (setq displayed-year 2001))
|
2002-11-16 19:19:35 +00:00
|
|
|
(set (make-local-variable 'font-lock-defaults)
|
2008-06-17 05:56:48 +00:00
|
|
|
'(calendar-font-lock-keywords t)))
|
1992-05-04 16:48:30 +00:00
|
|
|
|
1992-08-12 12:50:10 +00:00
|
|
|
(defun calendar-string-spread (strings char length)
|
1995-06-02 22:02:17 +00:00
|
|
|
"Concatenate list of STRINGS separated with copies of CHAR to fill LENGTH.
|
|
|
|
The effect is like mapconcat but the separating pieces are as balanced as
|
|
|
|
possible. Each item of STRINGS is evaluated before concatenation so it can
|
|
|
|
actually be an expression that evaluates to a string. If LENGTH is too short,
|
|
|
|
the STRINGS are just concatenated and the result truncated."
|
1992-08-12 12:50:10 +00:00
|
|
|
;; The algorithm is based on equation (3.25) on page 85 of Concrete
|
|
|
|
;; Mathematics by Ronald L. Graham, Donald E. Knuth, and Oren Patashnik,
|
2008-03-10 02:46:24 +00:00
|
|
|
;; Addison-Wesley, Reading, MA, 1989.
|
1995-06-02 22:02:17 +00:00
|
|
|
(let* ((strings (mapcar 'eval
|
|
|
|
(if (< (length strings) 2)
|
|
|
|
(append (list "") strings (list ""))
|
|
|
|
strings)))
|
1992-08-12 12:50:10 +00:00
|
|
|
(n (- length (length (apply 'concat strings))))
|
|
|
|
(m (1- (length strings)))
|
|
|
|
(s (car strings))
|
|
|
|
(strings (cdr strings))
|
|
|
|
(i 0))
|
2006-01-24 17:07:29 +00:00
|
|
|
(dolist (string strings)
|
1992-08-12 12:50:10 +00:00
|
|
|
(setq s (concat s
|
|
|
|
(make-string (max 0 (/ (+ n i) m)) char)
|
2008-03-16 01:22:58 +00:00
|
|
|
string)
|
|
|
|
i (1+ i)))
|
1992-08-12 12:50:10 +00:00
|
|
|
(substring s 0 length)))
|
|
|
|
|
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
2008-04-07 01:58:55 +00:00
|
|
|
(defun calendar-update-mode-line ()
|
1992-05-04 16:48:30 +00:00
|
|
|
"Update the calendar mode line with the current date and date style."
|
|
|
|
(if (bufferp (get-buffer calendar-buffer))
|
2005-09-12 21:32:11 +00:00
|
|
|
(with-current-buffer calendar-buffer
|
2008-06-21 19:28:09 +00:00
|
|
|
(let ((start (- calendar-left-margin 2))
|
|
|
|
(date (condition-case nil
|
|
|
|
(calendar-cursor-to-nearest-date)
|
|
|
|
(error (calendar-current-date)))))
|
|
|
|
(setq mode-line-format
|
|
|
|
(concat (make-string (max 0 (+ start
|
|
|
|
(- (car (window-inside-edges))
|
|
|
|
(car (window-edges))))) ?\s)
|
|
|
|
(calendar-string-spread
|
|
|
|
(mapcar 'eval calendar-mode-line-format)
|
|
|
|
?\s (- calendar-right-margin (1- start))))))
|
2002-04-03 14:36:02 +00:00
|
|
|
(force-mode-line-update))))
|
1992-05-04 16:48:30 +00:00
|
|
|
|
1994-10-26 15:26:22 +00:00
|
|
|
(defun calendar-window-list ()
|
|
|
|
"List of all calendar-related windows."
|
|
|
|
(let ((calendar-buffers (calendar-buffer-list))
|
|
|
|
list)
|
2009-02-11 04:02:16 +00:00
|
|
|
;; Using 0 rather than t for last argument - see bug#2199.
|
|
|
|
;; This is only used with calendar-hide-window, which ignores
|
|
|
|
;; iconified frames anyway, so could use 'visible rather than 0.
|
2000-09-17 17:06:00 +00:00
|
|
|
(walk-windows (lambda (w)
|
2008-03-13 06:29:28 +00:00
|
|
|
(if (memq (window-buffer w) calendar-buffers)
|
|
|
|
(push w list)))
|
2009-02-11 04:02:16 +00:00
|
|
|
nil 0)
|
1994-10-26 15:26:22 +00:00
|
|
|
list))
|
|
|
|
|
|
|
|
(defun calendar-buffer-list ()
|
2008-03-14 02:46:37 +00:00
|
|
|
"List of all calendar-related buffers (as buffers, not strings)."
|
2008-03-13 04:06:47 +00:00
|
|
|
(let (buffs)
|
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
2008-04-07 01:58:55 +00:00
|
|
|
(dolist (b (list calendar-hebrew-yahrzeit-buffer lunar-phases-buffer
|
2008-06-26 22:30:01 +00:00
|
|
|
holiday-buffer diary-fancy-buffer solar-sunrises-buffer
|
2008-03-13 04:06:47 +00:00
|
|
|
(get-file-buffer diary-file)
|
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
2008-04-07 01:58:55 +00:00
|
|
|
calendar-buffer calendar-other-calendars-buffer))
|
2008-03-14 02:46:37 +00:00
|
|
|
(and b (setq b (get-buffer b))
|
2008-03-13 04:06:47 +00:00
|
|
|
(push b buffs)))
|
|
|
|
buffs))
|
1994-10-26 15:26:22 +00:00
|
|
|
|
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
2008-04-07 01:58:55 +00:00
|
|
|
(defun calendar-exit ()
|
1994-10-26 15:26:22 +00:00
|
|
|
"Get out of the calendar window and hide it and related buffers."
|
1992-05-04 16:48:30 +00:00
|
|
|
(interactive)
|
2008-03-15 03:00:17 +00:00
|
|
|
(let ((diary-buffer (get-file-buffer diary-file)))
|
1998-05-11 15:48:24 +00:00
|
|
|
(if (or (not diary-buffer)
|
|
|
|
(not (buffer-modified-p diary-buffer))
|
|
|
|
(yes-or-no-p
|
|
|
|
"Diary modified; do you really want to exit the calendar? "))
|
2008-03-08 03:57:36 +00:00
|
|
|
;; Need to do this multiple times because one time can replace some
|
2008-03-10 02:46:24 +00:00
|
|
|
;; calendar-related buffers with other calendar-related buffers.
|
2008-03-08 03:57:36 +00:00
|
|
|
(mapc (lambda (x)
|
|
|
|
(mapc 'calendar-hide-window (calendar-window-list)))
|
1994-10-26 15:26:22 +00:00
|
|
|
(calendar-window-list)))))
|
|
|
|
|
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
2008-04-07 01:58:55 +00:00
|
|
|
(define-obsolete-function-alias 'exit-calendar 'calendar-exit "23.1")
|
|
|
|
|
1994-10-26 15:26:22 +00:00
|
|
|
(defun calendar-hide-window (window)
|
|
|
|
"Hide WINDOW if it is calendar-related."
|
|
|
|
(let ((buffer (if (window-live-p window) (window-buffer window))))
|
|
|
|
(if (memq buffer (calendar-buffer-list))
|
|
|
|
(cond
|
2001-04-23 14:19:57 +00:00
|
|
|
((and (display-multi-frame-p)
|
1994-10-26 15:26:22 +00:00
|
|
|
(eq 'icon (cdr (assoc 'visibility
|
|
|
|
(frame-parameters
|
|
|
|
(window-frame window))))))
|
|
|
|
nil)
|
2001-04-23 14:19:57 +00:00
|
|
|
((and (display-multi-frame-p) (window-dedicated-p window))
|
1999-11-12 16:05:16 +00:00
|
|
|
(if calendar-remove-frame-by-deleting
|
|
|
|
(delete-frame (window-frame window))
|
|
|
|
(iconify-frame (window-frame window))))
|
1994-10-26 15:26:22 +00:00
|
|
|
((not (and (select-window window) (one-window-p window)))
|
|
|
|
(delete-window window))
|
|
|
|
(t (set-buffer buffer)
|
|
|
|
(bury-buffer))))))
|
1992-05-04 16:48:30 +00:00
|
|
|
|
2009-07-08 02:46:23 +00:00
|
|
|
(defun calendar-current-date (&optional offset)
|
|
|
|
"Return the current date in a list (month day year).
|
2009-07-08 02:48:11 +00:00
|
|
|
Optional integer OFFSET is a number of days from the current date."
|
|
|
|
(let* ((now (decode-time))
|
|
|
|
(now (list (nth 4 now) (nth 3 now) (nth 5 now))))
|
|
|
|
(if (zerop (or offset 0))
|
|
|
|
now
|
|
|
|
(calendar-gregorian-from-absolute
|
|
|
|
(+ offset (calendar-absolute-from-gregorian now))))))
|
1992-05-04 16:48:30 +00:00
|
|
|
|
2008-06-26 03:41:20 +00:00
|
|
|
(defun calendar-column-to-segment ()
|
|
|
|
"Convert current column to calendar month \"segment\".
|
|
|
|
The left-most month returns 0, the next right 1, and so on."
|
|
|
|
(let ((col (max 0 (+ (current-column)
|
|
|
|
(/ calendar-intermonth-spacing 2)
|
|
|
|
(- calendar-left-margin)))))
|
|
|
|
(/ col (+ (* 7 calendar-column-width) calendar-intermonth-spacing))))
|
2008-06-21 19:28:09 +00:00
|
|
|
|
2008-06-17 15:42:19 +00:00
|
|
|
(defun calendar-cursor-to-date (&optional error event)
|
2000-09-19 15:50:54 +00:00
|
|
|
"Return a list (month day year) of current cursor position.
|
1994-02-07 20:42:44 +00:00
|
|
|
If cursor is not on a specific date, signals an error if optional parameter
|
2008-06-17 15:42:19 +00:00
|
|
|
ERROR is non-nil, otherwise just returns nil.
|
|
|
|
If EVENT is non-nil, it's an event indicating the buffer position to
|
|
|
|
use instead of point."
|
|
|
|
(with-current-buffer
|
|
|
|
(if event (window-buffer (posn-window (event-start event)))
|
|
|
|
(current-buffer))
|
|
|
|
(save-excursion
|
2008-06-26 07:08:01 +00:00
|
|
|
(and event (setq event (event-start event))
|
|
|
|
(goto-char (posn-point event)))
|
2008-06-26 03:41:20 +00:00
|
|
|
(let* ((segment (calendar-column-to-segment))
|
|
|
|
(month (% (+ displayed-month (1- segment)) 12)))
|
2008-06-21 19:28:09 +00:00
|
|
|
;; Call with point on either of the two digits in a 2-digit date,
|
|
|
|
;; or on or before the digit of a 1-digit date.
|
2008-06-17 15:42:19 +00:00
|
|
|
(if (not (and (looking-at "[ 0-9]?[0-9][^0-9]")
|
2008-06-26 03:41:20 +00:00
|
|
|
(get-text-property (point) 'date)))
|
2008-06-17 15:42:19 +00:00
|
|
|
(if error (error "Not on a date!"))
|
2008-06-26 03:41:20 +00:00
|
|
|
;; Convert segment to real month and year.
|
|
|
|
(if (zerop month) (setq month 12))
|
2008-06-21 19:28:09 +00:00
|
|
|
;; Go back to before the first date digit.
|
|
|
|
(or (looking-at " ")
|
2007-07-25 21:59:26 +00:00
|
|
|
(re-search-backward "[^0-9]"))
|
1994-02-23 02:38:23 +00:00
|
|
|
(list month
|
2008-06-21 19:28:09 +00:00
|
|
|
(string-to-number
|
|
|
|
(buffer-substring (1+ (point))
|
|
|
|
(+ 1 calendar-day-digit-width (point))))
|
2008-06-26 03:41:20 +00:00
|
|
|
(cond
|
|
|
|
((and (= 12 month) (zerop segment)) (1- displayed-year))
|
|
|
|
((and (= 1 month) (= segment 2)) (1+ displayed-year))
|
|
|
|
(t displayed-year))))))))
|
1992-05-04 16:48:30 +00:00
|
|
|
|
2005-09-12 21:32:11 +00:00
|
|
|
(add-to-list 'debug-ignored-errors "Not on a date!")
|
|
|
|
|
* calendar.el (calendar-version): Update to 5.1. Fixed a variety
of spelling error in comments and doc strings.
(calendar-sexp-debug): New variable to turn off error catching.
(calendar-absolute-from-gregorian): Removed unused vars month, day.
(view-calendar-holidays-initially, all-hebrew-calendar-holidays,
all-christian-calendar-holidays, all-christian-islamic-holidays,
diary-nonmarking-symbol, hebrew-diary-entry-symbol,
islamic-diary-entry-symbol, diary-include-string,
abbreviated-calendar-year, european-calendar-style,
european-calendar-display-form, american-calendar-display-form,
calendar-date-display-form, print-diary-entries-hook,
list-diary-entries-hook, nongregorian-diary-listing-hook,
nongregorian-diary-marking-hook, diary-list-include-blanks,
holidays-in-diary-buffer, general-holidays,
increment-calendar-month, calendar-sum, calendar-string-spread,
calendar-absolute-from-iso, calendar-print-iso-date,
hebrew-calendar-elapsed-days, list-yahrzeit-dates,
calendar-print-astro-day-number): Fix doc strings.
(calendar-nth-named-day): Rewritten to include optional day of month.
(general-holidays, calendar-holidays, hebrew-holidays,
christian-holidays, islamic-holidays,
solar-holidays): Rewritten to include require of cal-dst.el and to
show the time of the change to/from daylight savings time.
(calendar-current-time-zone, calendar-time-zone,
calendar-daylight-time-offset, calendar-standard-time-zone-name,
calendar-daylight-time-zone-name, calendar-daylight-savings-starts,
calendar-daylight-savings-ends,
calendar-daylight-savings-switchover-time): Moved to cal-dst.el.
(calendar-location-name, calendar-time-display-form, calendar-latitude,
calendar-longitude): Moved to solar.el.
(calendar-holidays): Unquote it!
1993-06-22 03:22:12 +00:00
|
|
|
;; The following version of calendar-gregorian-from-absolute is preferred for
|
|
|
|
;; reasons of clarity, BUT it's much slower than the version that follows it.
|
|
|
|
|
|
|
|
;;(defun calendar-gregorian-from-absolute (date)
|
|
|
|
;; "Compute the list (month day year) corresponding to the absolute DATE.
|
|
|
|
;;The absolute date is the number of days elapsed since the (imaginary)
|
|
|
|
;;Gregorian date Sunday, December 31, 1 BC."
|
2008-03-10 02:46:24 +00:00
|
|
|
;; (let* ((approx (/ date 366)) ; approximation from below
|
|
|
|
;; (year ; search forward from the approximation
|
* calendar.el (calendar-version): Update to 5.1. Fixed a variety
of spelling error in comments and doc strings.
(calendar-sexp-debug): New variable to turn off error catching.
(calendar-absolute-from-gregorian): Removed unused vars month, day.
(view-calendar-holidays-initially, all-hebrew-calendar-holidays,
all-christian-calendar-holidays, all-christian-islamic-holidays,
diary-nonmarking-symbol, hebrew-diary-entry-symbol,
islamic-diary-entry-symbol, diary-include-string,
abbreviated-calendar-year, european-calendar-style,
european-calendar-display-form, american-calendar-display-form,
calendar-date-display-form, print-diary-entries-hook,
list-diary-entries-hook, nongregorian-diary-listing-hook,
nongregorian-diary-marking-hook, diary-list-include-blanks,
holidays-in-diary-buffer, general-holidays,
increment-calendar-month, calendar-sum, calendar-string-spread,
calendar-absolute-from-iso, calendar-print-iso-date,
hebrew-calendar-elapsed-days, list-yahrzeit-dates,
calendar-print-astro-day-number): Fix doc strings.
(calendar-nth-named-day): Rewritten to include optional day of month.
(general-holidays, calendar-holidays, hebrew-holidays,
christian-holidays, islamic-holidays,
solar-holidays): Rewritten to include require of cal-dst.el and to
show the time of the change to/from daylight savings time.
(calendar-current-time-zone, calendar-time-zone,
calendar-daylight-time-offset, calendar-standard-time-zone-name,
calendar-daylight-time-zone-name, calendar-daylight-savings-starts,
calendar-daylight-savings-ends,
calendar-daylight-savings-switchover-time): Moved to cal-dst.el.
(calendar-location-name, calendar-time-display-form, calendar-latitude,
calendar-longitude): Moved to solar.el.
(calendar-holidays): Unquote it!
1993-06-22 03:22:12 +00:00
|
|
|
;; (+ approx
|
|
|
|
;; (calendar-sum y approx
|
|
|
|
;; (>= date (calendar-absolute-from-gregorian (list 1 1 (1+ y))))
|
|
|
|
;; 1)))
|
2008-03-10 02:46:24 +00:00
|
|
|
;; (month ; search forward from January
|
* calendar.el (calendar-version): Update to 5.1. Fixed a variety
of spelling error in comments and doc strings.
(calendar-sexp-debug): New variable to turn off error catching.
(calendar-absolute-from-gregorian): Removed unused vars month, day.
(view-calendar-holidays-initially, all-hebrew-calendar-holidays,
all-christian-calendar-holidays, all-christian-islamic-holidays,
diary-nonmarking-symbol, hebrew-diary-entry-symbol,
islamic-diary-entry-symbol, diary-include-string,
abbreviated-calendar-year, european-calendar-style,
european-calendar-display-form, american-calendar-display-form,
calendar-date-display-form, print-diary-entries-hook,
list-diary-entries-hook, nongregorian-diary-listing-hook,
nongregorian-diary-marking-hook, diary-list-include-blanks,
holidays-in-diary-buffer, general-holidays,
increment-calendar-month, calendar-sum, calendar-string-spread,
calendar-absolute-from-iso, calendar-print-iso-date,
hebrew-calendar-elapsed-days, list-yahrzeit-dates,
calendar-print-astro-day-number): Fix doc strings.
(calendar-nth-named-day): Rewritten to include optional day of month.
(general-holidays, calendar-holidays, hebrew-holidays,
christian-holidays, islamic-holidays,
solar-holidays): Rewritten to include require of cal-dst.el and to
show the time of the change to/from daylight savings time.
(calendar-current-time-zone, calendar-time-zone,
calendar-daylight-time-offset, calendar-standard-time-zone-name,
calendar-daylight-time-zone-name, calendar-daylight-savings-starts,
calendar-daylight-savings-ends,
calendar-daylight-savings-switchover-time): Moved to cal-dst.el.
(calendar-location-name, calendar-time-display-form, calendar-latitude,
calendar-longitude): Moved to solar.el.
(calendar-holidays): Unquote it!
1993-06-22 03:22:12 +00:00
|
|
|
;; (1+ (calendar-sum m 1
|
|
|
|
;; (> date
|
|
|
|
;; (calendar-absolute-from-gregorian
|
|
|
|
;; (list m (calendar-last-day-of-month m year) year)))
|
|
|
|
;; 1)))
|
2008-03-10 02:46:24 +00:00
|
|
|
;; (day ; calculate the day by subtraction
|
* calendar.el (calendar-version): Update to 5.1. Fixed a variety
of spelling error in comments and doc strings.
(calendar-sexp-debug): New variable to turn off error catching.
(calendar-absolute-from-gregorian): Removed unused vars month, day.
(view-calendar-holidays-initially, all-hebrew-calendar-holidays,
all-christian-calendar-holidays, all-christian-islamic-holidays,
diary-nonmarking-symbol, hebrew-diary-entry-symbol,
islamic-diary-entry-symbol, diary-include-string,
abbreviated-calendar-year, european-calendar-style,
european-calendar-display-form, american-calendar-display-form,
calendar-date-display-form, print-diary-entries-hook,
list-diary-entries-hook, nongregorian-diary-listing-hook,
nongregorian-diary-marking-hook, diary-list-include-blanks,
holidays-in-diary-buffer, general-holidays,
increment-calendar-month, calendar-sum, calendar-string-spread,
calendar-absolute-from-iso, calendar-print-iso-date,
hebrew-calendar-elapsed-days, list-yahrzeit-dates,
calendar-print-astro-day-number): Fix doc strings.
(calendar-nth-named-day): Rewritten to include optional day of month.
(general-holidays, calendar-holidays, hebrew-holidays,
christian-holidays, islamic-holidays,
solar-holidays): Rewritten to include require of cal-dst.el and to
show the time of the change to/from daylight savings time.
(calendar-current-time-zone, calendar-time-zone,
calendar-daylight-time-offset, calendar-standard-time-zone-name,
calendar-daylight-time-zone-name, calendar-daylight-savings-starts,
calendar-daylight-savings-ends,
calendar-daylight-savings-switchover-time): Moved to cal-dst.el.
(calendar-location-name, calendar-time-display-form, calendar-latitude,
calendar-longitude): Moved to solar.el.
(calendar-holidays): Unquote it!
1993-06-22 03:22:12 +00:00
|
|
|
;; (- date
|
|
|
|
;; (1- (calendar-absolute-from-gregorian (list month 1 year))))))
|
|
|
|
;; (list month day year)))
|
|
|
|
|
1992-05-04 16:48:30 +00:00
|
|
|
(defun calendar-gregorian-from-absolute (date)
|
|
|
|
"Compute the list (month day year) corresponding to the absolute DATE.
|
|
|
|
The absolute date is the number of days elapsed since the (imaginary)
|
2003-10-01 20:48:17 +00:00
|
|
|
Gregorian date Sunday, December 31, 1 BC. This function does not
|
|
|
|
handle dates in years BC."
|
2008-03-10 02:46:24 +00:00
|
|
|
;; See the footnote on page 384 of ``Calendrical Calculations, Part II:
|
|
|
|
;; Three Historical Calendars'' by E. M. Reingold, N. Dershowitz, and S. M.
|
|
|
|
;; Clamen, Software--Practice and Experience, Volume 23, Number 4
|
|
|
|
;; (April, 1993), pages 383-404 for an explanation.
|
* calendar.el (calendar-version): Update to 5.1. Fixed a variety
of spelling error in comments and doc strings.
(calendar-sexp-debug): New variable to turn off error catching.
(calendar-absolute-from-gregorian): Removed unused vars month, day.
(view-calendar-holidays-initially, all-hebrew-calendar-holidays,
all-christian-calendar-holidays, all-christian-islamic-holidays,
diary-nonmarking-symbol, hebrew-diary-entry-symbol,
islamic-diary-entry-symbol, diary-include-string,
abbreviated-calendar-year, european-calendar-style,
european-calendar-display-form, american-calendar-display-form,
calendar-date-display-form, print-diary-entries-hook,
list-diary-entries-hook, nongregorian-diary-listing-hook,
nongregorian-diary-marking-hook, diary-list-include-blanks,
holidays-in-diary-buffer, general-holidays,
increment-calendar-month, calendar-sum, calendar-string-spread,
calendar-absolute-from-iso, calendar-print-iso-date,
hebrew-calendar-elapsed-days, list-yahrzeit-dates,
calendar-print-astro-day-number): Fix doc strings.
(calendar-nth-named-day): Rewritten to include optional day of month.
(general-holidays, calendar-holidays, hebrew-holidays,
christian-holidays, islamic-holidays,
solar-holidays): Rewritten to include require of cal-dst.el and to
show the time of the change to/from daylight savings time.
(calendar-current-time-zone, calendar-time-zone,
calendar-daylight-time-offset, calendar-standard-time-zone-name,
calendar-daylight-time-zone-name, calendar-daylight-savings-starts,
calendar-daylight-savings-ends,
calendar-daylight-savings-switchover-time): Moved to cal-dst.el.
(calendar-location-name, calendar-time-display-form, calendar-latitude,
calendar-longitude): Moved to solar.el.
(calendar-holidays): Unquote it!
1993-06-22 03:22:12 +00:00
|
|
|
(let* ((d0 (1- date))
|
|
|
|
(n400 (/ d0 146097))
|
|
|
|
(d1 (% d0 146097))
|
|
|
|
(n100 (/ d1 36524))
|
|
|
|
(d2 (% d1 36524))
|
|
|
|
(n4 (/ d2 1461))
|
|
|
|
(d3 (% d2 1461))
|
|
|
|
(n1 (/ d3 365))
|
|
|
|
(day (1+ (% d3 365)))
|
2008-04-02 03:35:38 +00:00
|
|
|
(year (+ (* 400 n400) (* 100 n100) (* n4 4) n1))
|
|
|
|
(month 1)
|
|
|
|
mdays)
|
* calendar.el (calendar-version): Update to 5.1. Fixed a variety
of spelling error in comments and doc strings.
(calendar-sexp-debug): New variable to turn off error catching.
(calendar-absolute-from-gregorian): Removed unused vars month, day.
(view-calendar-holidays-initially, all-hebrew-calendar-holidays,
all-christian-calendar-holidays, all-christian-islamic-holidays,
diary-nonmarking-symbol, hebrew-diary-entry-symbol,
islamic-diary-entry-symbol, diary-include-string,
abbreviated-calendar-year, european-calendar-style,
european-calendar-display-form, american-calendar-display-form,
calendar-date-display-form, print-diary-entries-hook,
list-diary-entries-hook, nongregorian-diary-listing-hook,
nongregorian-diary-marking-hook, diary-list-include-blanks,
holidays-in-diary-buffer, general-holidays,
increment-calendar-month, calendar-sum, calendar-string-spread,
calendar-absolute-from-iso, calendar-print-iso-date,
hebrew-calendar-elapsed-days, list-yahrzeit-dates,
calendar-print-astro-day-number): Fix doc strings.
(calendar-nth-named-day): Rewritten to include optional day of month.
(general-holidays, calendar-holidays, hebrew-holidays,
christian-holidays, islamic-holidays,
solar-holidays): Rewritten to include require of cal-dst.el and to
show the time of the change to/from daylight savings time.
(calendar-current-time-zone, calendar-time-zone,
calendar-daylight-time-offset, calendar-standard-time-zone-name,
calendar-daylight-time-zone-name, calendar-daylight-savings-starts,
calendar-daylight-savings-ends,
calendar-daylight-savings-switchover-time): Moved to cal-dst.el.
(calendar-location-name, calendar-time-display-form, calendar-latitude,
calendar-longitude): Moved to solar.el.
(calendar-holidays): Unquote it!
1993-06-22 03:22:12 +00:00
|
|
|
(if (or (= n100 4) (= n1 4))
|
|
|
|
(list 12 31 year)
|
2008-04-02 03:35:38 +00:00
|
|
|
(setq year (1+ year))
|
|
|
|
(while (< (setq mdays (calendar-last-day-of-month month year)) day)
|
|
|
|
(setq day (- day mdays)
|
|
|
|
month (1+ month)))
|
|
|
|
(list month day year))))
|
1992-05-04 16:48:30 +00:00
|
|
|
|
2008-06-17 05:56:48 +00:00
|
|
|
(defun calendar-other-month (month year &optional event)
|
|
|
|
"Display a three-month calendar centered around MONTH and YEAR.
|
|
|
|
EVENT is an event like `last-nonmenu-event'."
|
|
|
|
(interactive (let ((event (list last-nonmenu-event)))
|
|
|
|
(append (calendar-read-date 'noday) event)))
|
|
|
|
(save-selected-window
|
|
|
|
(and event
|
|
|
|
(setq event (event-start event))
|
|
|
|
(select-window (posn-window event)))
|
|
|
|
(unless (and (= month displayed-month)
|
|
|
|
(= year displayed-year))
|
|
|
|
(let ((old-date (calendar-cursor-to-date))
|
|
|
|
(today (calendar-current-date)))
|
|
|
|
(calendar-generate-window month year)
|
|
|
|
(calendar-cursor-to-visible-date
|
|
|
|
(cond
|
|
|
|
((calendar-date-is-visible-p old-date) old-date)
|
|
|
|
((calendar-date-is-visible-p today) today)
|
|
|
|
(t (list month 1 year))))))))
|
1992-05-04 16:48:30 +00:00
|
|
|
|
2008-06-17 15:42:19 +00:00
|
|
|
(defun calendar-set-mark (arg &optional event)
|
1992-05-04 16:48:30 +00:00
|
|
|
"Mark the date under the cursor, or jump to marked date.
|
|
|
|
With no prefix argument, push current date onto marked date ring.
|
2008-03-10 02:46:24 +00:00
|
|
|
With argument ARG, jump to mark, pop it, and put point at end of ring."
|
2008-06-17 15:42:19 +00:00
|
|
|
(interactive
|
|
|
|
(list current-prefix-arg last-nonmenu-event))
|
|
|
|
(let ((date (calendar-cursor-to-date t event)))
|
2008-03-15 03:00:17 +00:00
|
|
|
(if arg
|
|
|
|
(if (null calendar-mark-ring)
|
|
|
|
(error "No mark set in this buffer")
|
|
|
|
(calendar-goto-date (car calendar-mark-ring))
|
|
|
|
(setq calendar-mark-ring
|
|
|
|
(cdr (nconc calendar-mark-ring (list date)))))
|
|
|
|
(push date calendar-mark-ring)
|
|
|
|
;; Since the top of the mark ring is the marked date in the
|
|
|
|
;; calendar, the mark ring in the calendar is one longer than
|
|
|
|
;; in other buffers to get the same effect.
|
|
|
|
(if (> (length calendar-mark-ring) (1+ mark-ring-max))
|
|
|
|
(setcdr (nthcdr mark-ring-max calendar-mark-ring) nil))
|
|
|
|
(message "Mark set"))))
|
1992-05-04 16:48:30 +00:00
|
|
|
|
|
|
|
(defun calendar-exchange-point-and-mark ()
|
|
|
|
"Exchange the current cursor position with the marked date."
|
|
|
|
(interactive)
|
|
|
|
(let ((mark (car calendar-mark-ring))
|
1994-02-07 20:42:44 +00:00
|
|
|
(date (calendar-cursor-to-date t)))
|
1992-05-04 16:48:30 +00:00
|
|
|
(if (null mark)
|
|
|
|
(error "No mark set in this buffer")
|
|
|
|
(setq calendar-mark-ring (cons date (cdr calendar-mark-ring)))
|
|
|
|
(calendar-goto-date mark))))
|
|
|
|
|
|
|
|
(defun calendar-count-days-region ()
|
|
|
|
"Count the number of days (inclusive) between point and the mark."
|
|
|
|
(interactive)
|
|
|
|
(let* ((days (- (calendar-absolute-from-gregorian
|
1994-02-07 20:42:44 +00:00
|
|
|
(calendar-cursor-to-date t))
|
1992-05-04 16:48:30 +00:00
|
|
|
(calendar-absolute-from-gregorian
|
|
|
|
(or (car calendar-mark-ring)
|
|
|
|
(error "No mark set in this buffer")))))
|
|
|
|
(days (1+ (if (> days 0) days (- days)))))
|
|
|
|
(message "Region has %d day%s (inclusive)"
|
|
|
|
days (if (> days 1) "s" ""))))
|
|
|
|
|
|
|
|
(defun calendar-not-implemented ()
|
|
|
|
"Not implemented."
|
|
|
|
(interactive)
|
|
|
|
(error "%s not available in the calendar"
|
|
|
|
(global-key-binding (this-command-keys))))
|
|
|
|
|
|
|
|
(defun calendar-read (prompt acceptable &optional initial-contents)
|
|
|
|
"Return an object read from the minibuffer.
|
|
|
|
Prompt with the string PROMPT and use the function ACCEPTABLE to decide if
|
|
|
|
entered item is acceptable. If non-nil, optional third arg INITIAL-CONTENTS
|
|
|
|
is a string to insert in the minibuffer before reading."
|
|
|
|
(let ((value (read-minibuffer prompt initial-contents)))
|
|
|
|
(while (not (funcall acceptable value))
|
|
|
|
(setq value (read-minibuffer prompt initial-contents)))
|
|
|
|
value))
|
|
|
|
|
|
|
|
|
2003-08-03 13:59:13 +00:00
|
|
|
(defvar calendar-abbrev-length 3
|
|
|
|
"*Length of abbreviations to be used for day and month names.
|
|
|
|
See also `calendar-day-abbrev-array' and `calendar-month-abbrev-array'.")
|
|
|
|
|
2008-03-17 02:30:06 +00:00
|
|
|
;; FIXME does it have to start from Sunday?
|
|
|
|
(defcustom calendar-day-name-array
|
1998-10-21 20:03:07 +00:00
|
|
|
["Sunday" "Monday" "Tuesday" "Wednesday" "Thursday" "Friday" "Saturday"]
|
2008-03-17 02:30:06 +00:00
|
|
|
"Array of capitalized strings giving, in order, the day names.
|
2003-08-03 13:59:13 +00:00
|
|
|
The first two characters of each string will be used to head the
|
|
|
|
day columns in the calendar. See also the variable
|
2008-03-17 02:30:06 +00:00
|
|
|
`calendar-day-abbrev-array'."
|
|
|
|
:group 'calendar
|
|
|
|
:type '(vector (string :tag "Sunday")
|
|
|
|
(string :tag "Monday")
|
|
|
|
(string :tag "Tuesday")
|
|
|
|
(string :tag "Wednesday")
|
|
|
|
(string :tag "Thursday")
|
|
|
|
(string :tag "Friday")
|
|
|
|
(string :tag "Saturday")))
|
2003-08-03 13:59:13 +00:00
|
|
|
|
|
|
|
(defvar calendar-day-abbrev-array
|
|
|
|
[nil nil nil nil nil nil nil]
|
|
|
|
"*Array of capitalized strings giving the abbreviated day names.
|
|
|
|
The order should be the same as that of the full names specified
|
|
|
|
in `calendar-day-name-array'. These abbreviations may be used
|
|
|
|
instead of the full names in the diary file. Do not include a
|
|
|
|
trailing `.' in the strings specified in this variable, though
|
|
|
|
you may use such in the diary file. If any element of this array
|
2005-03-30 16:55:58 +00:00
|
|
|
is nil, then the abbreviation will be constructed as the first
|
2003-08-03 13:59:13 +00:00
|
|
|
`calendar-abbrev-length' characters of the corresponding full name.")
|
1992-05-04 16:48:30 +00:00
|
|
|
|
2008-03-17 02:30:06 +00:00
|
|
|
(defcustom calendar-month-name-array
|
1992-05-04 16:48:30 +00:00
|
|
|
["January" "February" "March" "April" "May" "June"
|
1998-10-21 20:03:07 +00:00
|
|
|
"July" "August" "September" "October" "November" "December"]
|
2008-03-17 02:30:06 +00:00
|
|
|
"Array of capitalized strings giving, in order, the month names.
|
|
|
|
See also the variable `calendar-month-abbrev-array'."
|
|
|
|
:group 'calendar
|
|
|
|
:type '(vector (string :tag "January")
|
|
|
|
(string :tag "February")
|
|
|
|
(string :tag "March")
|
|
|
|
(string :tag "April")
|
|
|
|
(string :tag "May")
|
|
|
|
(string :tag "June")
|
|
|
|
(string :tag "July")
|
|
|
|
(string :tag "August")
|
|
|
|
(string :tag "September")
|
|
|
|
(string :tag "October")
|
|
|
|
(string :tag "November")
|
|
|
|
(string :tag "December")))
|
2003-08-03 13:59:13 +00:00
|
|
|
|
|
|
|
(defvar calendar-month-abbrev-array
|
|
|
|
[nil nil nil nil nil nil nil nil nil nil nil nil]
|
|
|
|
"*Array of capitalized strings giving the abbreviated month names.
|
|
|
|
The order should be the same as that of the full names specified
|
|
|
|
in `calendar-month-name-array'. These abbreviations are used in
|
|
|
|
the calendar menu entries, and can also be used in the diary
|
|
|
|
file. Do not include a trailing `.' in the strings specified in
|
|
|
|
this variable, though you may use such in the diary file. If any
|
|
|
|
element of this array is nil, then the abbreviation will be
|
|
|
|
constructed as the first `calendar-abbrev-length' characters of the
|
|
|
|
corresponding full name.")
|
|
|
|
|
2008-03-15 03:00:17 +00:00
|
|
|
(defun calendar-make-alist (sequence &optional start-index filter abbrevs)
|
|
|
|
"Make an assoc list corresponding to SEQUENCE.
|
|
|
|
Each element of sequence will be associated with an integer, starting
|
|
|
|
from 1, or from START-INDEX if that is non-nil. If a sequence ABBREVS
|
|
|
|
is supplied, the function `calendar-abbrev-construct' is used to
|
|
|
|
construct abbreviations corresponding to the elements in SEQUENCE.
|
|
|
|
Each abbreviation is entered into the alist with the same
|
|
|
|
association index as the full name it represents.
|
|
|
|
If FILTER is provided, apply it to each key in the alist."
|
|
|
|
(let ((index 0)
|
|
|
|
(offset (or start-index 1))
|
|
|
|
(aseq (if abbrevs (calendar-abbrev-construct abbrevs sequence)))
|
|
|
|
(aseqp (if abbrevs (calendar-abbrev-construct abbrevs sequence
|
|
|
|
'period)))
|
|
|
|
alist elem)
|
|
|
|
(dotimes (i (length sequence) (reverse alist))
|
|
|
|
(setq index (+ i offset)
|
|
|
|
elem (elt sequence i)
|
|
|
|
alist
|
|
|
|
(cons (cons (if filter (funcall filter elem) elem) index) alist))
|
|
|
|
(if aseq
|
|
|
|
(setq elem (elt aseq i)
|
|
|
|
alist (cons (cons (if filter (funcall filter elem) elem)
|
|
|
|
index) alist)))
|
|
|
|
(if aseqp
|
|
|
|
(setq elem (elt aseqp i)
|
|
|
|
alist (cons (cons (if filter (funcall filter elem) elem)
|
|
|
|
index) alist))))))
|
Move many autoloads to separate file, cal-loaddefs.el.
Move defcustoms to start and re-order.
(calendar-month-name-array, calendar-starred-day): No need to declare
for compiler.
(cal-loaddefs): Require it.
(appt, chinese-calendar, calendar-tex): Move custom groups to the
appropriate file.
(diary-entry-marker, calendar-today-marker, calendar-holiday-marker):
Reverse logic.
(diary-face, diary-file-name-prefix-function, diary-include-string)
(diary-glob-file-regexp-prefix, diary-face-attrs)
(diary-file-name-prefix, sexp-diary-entry-symbol)
(print-diary-entries-hook, list-diary-entries-hook)
(nongregorian-diary-listing-hook, mark-diary-entries-hook)
(nongregorian-diary-marking-hook, diary-list-include-blanks):
Move to diary-lib.
(all-christian-calendar-holidays, all-islamic-calendar-holidays)
(all-bahai-calendar-holidays): Doc fix.
(calendar-mark-ring): Add doc-string.
(calendar-starred-day): Defvar it.
(calendar-mode): Make calendar-starred-day local.
(calendar-star-date): No need to make calendar-starred-day local.
2008-03-08 03:47:03 +00:00
|
|
|
|
|
|
|
(defun calendar-read-date (&optional noday)
|
|
|
|
"Prompt for Gregorian date. Return a list (month day year).
|
|
|
|
If optional NODAY is t, does not ask for day, but just returns
|
2008-03-17 02:30:06 +00:00
|
|
|
\(month 1 year); if NODAY is any other non-nil value the value returned is
|
Move many autoloads to separate file, cal-loaddefs.el.
Move defcustoms to start and re-order.
(calendar-month-name-array, calendar-starred-day): No need to declare
for compiler.
(cal-loaddefs): Require it.
(appt, chinese-calendar, calendar-tex): Move custom groups to the
appropriate file.
(diary-entry-marker, calendar-today-marker, calendar-holiday-marker):
Reverse logic.
(diary-face, diary-file-name-prefix-function, diary-include-string)
(diary-glob-file-regexp-prefix, diary-face-attrs)
(diary-file-name-prefix, sexp-diary-entry-symbol)
(print-diary-entries-hook, list-diary-entries-hook)
(nongregorian-diary-listing-hook, mark-diary-entries-hook)
(nongregorian-diary-marking-hook, diary-list-include-blanks):
Move to diary-lib.
(all-christian-calendar-holidays, all-islamic-calendar-holidays)
(all-bahai-calendar-holidays): Doc fix.
(calendar-mark-ring): Add doc-string.
(calendar-starred-day): Defvar it.
(calendar-mode): Make calendar-starred-day local.
(calendar-star-date): No need to make calendar-starred-day local.
2008-03-08 03:47:03 +00:00
|
|
|
\(month year)"
|
|
|
|
(let* ((year (calendar-read
|
|
|
|
"Year (>0): "
|
|
|
|
(lambda (x) (> x 0))
|
2008-04-08 07:08:24 +00:00
|
|
|
(number-to-string (calendar-extract-year
|
Move many autoloads to separate file, cal-loaddefs.el.
Move defcustoms to start and re-order.
(calendar-month-name-array, calendar-starred-day): No need to declare
for compiler.
(cal-loaddefs): Require it.
(appt, chinese-calendar, calendar-tex): Move custom groups to the
appropriate file.
(diary-entry-marker, calendar-today-marker, calendar-holiday-marker):
Reverse logic.
(diary-face, diary-file-name-prefix-function, diary-include-string)
(diary-glob-file-regexp-prefix, diary-face-attrs)
(diary-file-name-prefix, sexp-diary-entry-symbol)
(print-diary-entries-hook, list-diary-entries-hook)
(nongregorian-diary-listing-hook, mark-diary-entries-hook)
(nongregorian-diary-marking-hook, diary-list-include-blanks):
Move to diary-lib.
(all-christian-calendar-holidays, all-islamic-calendar-holidays)
(all-bahai-calendar-holidays): Doc fix.
(calendar-mark-ring): Add doc-string.
(calendar-starred-day): Defvar it.
(calendar-mode): Make calendar-starred-day local.
(calendar-star-date): No need to make calendar-starred-day local.
2008-03-08 03:47:03 +00:00
|
|
|
(calendar-current-date)))))
|
|
|
|
(month-array calendar-month-name-array)
|
|
|
|
(completion-ignore-case t)
|
|
|
|
(month (cdr (assoc-string
|
|
|
|
(completing-read
|
|
|
|
"Month name: "
|
|
|
|
(mapcar 'list (append month-array nil))
|
|
|
|
nil t)
|
|
|
|
(calendar-make-alist month-array 1) t)))
|
|
|
|
(last (calendar-last-day-of-month month year)))
|
|
|
|
(if noday
|
|
|
|
(if (eq noday t)
|
2008-03-17 02:30:06 +00:00
|
|
|
(list month 1 year)
|
Move many autoloads to separate file, cal-loaddefs.el.
Move defcustoms to start and re-order.
(calendar-month-name-array, calendar-starred-day): No need to declare
for compiler.
(cal-loaddefs): Require it.
(appt, chinese-calendar, calendar-tex): Move custom groups to the
appropriate file.
(diary-entry-marker, calendar-today-marker, calendar-holiday-marker):
Reverse logic.
(diary-face, diary-file-name-prefix-function, diary-include-string)
(diary-glob-file-regexp-prefix, diary-face-attrs)
(diary-file-name-prefix, sexp-diary-entry-symbol)
(print-diary-entries-hook, list-diary-entries-hook)
(nongregorian-diary-listing-hook, mark-diary-entries-hook)
(nongregorian-diary-marking-hook, diary-list-include-blanks):
Move to diary-lib.
(all-christian-calendar-holidays, all-islamic-calendar-holidays)
(all-bahai-calendar-holidays): Doc fix.
(calendar-mark-ring): Add doc-string.
(calendar-starred-day): Defvar it.
(calendar-mode): Make calendar-starred-day local.
(calendar-star-date): No need to make calendar-starred-day local.
2008-03-08 03:47:03 +00:00
|
|
|
(list month year))
|
|
|
|
(list month
|
|
|
|
(calendar-read (format "Day (1-%d): " last)
|
2008-03-13 06:29:28 +00:00
|
|
|
(lambda (x) (and (< 0 x) (<= x last))))
|
Move many autoloads to separate file, cal-loaddefs.el.
Move defcustoms to start and re-order.
(calendar-month-name-array, calendar-starred-day): No need to declare
for compiler.
(cal-loaddefs): Require it.
(appt, chinese-calendar, calendar-tex): Move custom groups to the
appropriate file.
(diary-entry-marker, calendar-today-marker, calendar-holiday-marker):
Reverse logic.
(diary-face, diary-file-name-prefix-function, diary-include-string)
(diary-glob-file-regexp-prefix, diary-face-attrs)
(diary-file-name-prefix, sexp-diary-entry-symbol)
(print-diary-entries-hook, list-diary-entries-hook)
(nongregorian-diary-listing-hook, mark-diary-entries-hook)
(nongregorian-diary-marking-hook, diary-list-include-blanks):
Move to diary-lib.
(all-christian-calendar-holidays, all-islamic-calendar-holidays)
(all-bahai-calendar-holidays): Doc fix.
(calendar-mark-ring): Add doc-string.
(calendar-starred-day): Defvar it.
(calendar-mode): Make calendar-starred-day local.
(calendar-star-date): No need to make calendar-starred-day local.
2008-03-08 03:47:03 +00:00
|
|
|
year))))
|
|
|
|
|
|
|
|
(defun calendar-interval (mon1 yr1 mon2 yr2)
|
|
|
|
"The number of months difference between MON1, YR1 and MON2, YR2.
|
|
|
|
The result is positive if the second date is later than the first.
|
|
|
|
Negative years are interpreted as years BC; -1 being 1 BC, and so on."
|
|
|
|
(if (< yr1 0) (setq yr1 (1+ yr1))) ; -1 BC -> 0 AD, etc
|
|
|
|
(if (< yr2 0) (setq yr2 (1+ yr2)))
|
|
|
|
(+ (* 12 (- yr2 yr1))
|
|
|
|
(- mon2 mon1)))
|
|
|
|
|
2003-08-03 13:59:13 +00:00
|
|
|
(defun calendar-abbrev-construct (abbrev full &optional period)
|
|
|
|
"Internal calendar function to return a complete abbreviation array.
|
|
|
|
ABBREV is an array of abbreviations, FULL the corresponding array
|
|
|
|
of full names. The return value is the ABBREV array, with any nil
|
|
|
|
elements replaced by the first three characters taken from the
|
|
|
|
corresponding element of FULL. If optional argument PERIOD is non-nil,
|
|
|
|
each element returned has a final `.' character."
|
2003-08-06 10:10:46 +00:00
|
|
|
(let (elem array name)
|
2003-08-03 13:59:13 +00:00
|
|
|
(dotimes (i (length full))
|
2003-08-06 10:10:46 +00:00
|
|
|
(setq name (aref full i)
|
|
|
|
elem (or (aref abbrev i)
|
|
|
|
(substring name 0
|
|
|
|
(min calendar-abbrev-length (length name))))
|
2003-08-03 13:59:13 +00:00
|
|
|
elem (format "%s%s" elem (if period "." ""))
|
|
|
|
array (append array (list elem))))
|
|
|
|
(vconcat array)))
|
1992-05-04 16:48:30 +00:00
|
|
|
|
2002-11-16 19:19:35 +00:00
|
|
|
(defvar calendar-font-lock-keywords
|
2002-12-05 18:42:33 +00:00
|
|
|
`((,(concat (regexp-opt (mapcar 'identity calendar-month-name-array) t)
|
2008-03-13 06:29:28 +00:00
|
|
|
" -?[0-9]+")
|
2002-12-05 18:42:33 +00:00
|
|
|
. font-lock-function-name-face) ; month and year
|
|
|
|
(,(regexp-opt
|
2008-06-21 19:28:09 +00:00
|
|
|
(list (substring (aref calendar-day-name-array 6)
|
|
|
|
0 calendar-day-header-width)
|
|
|
|
(substring (aref calendar-day-name-array 0)
|
|
|
|
0 calendar-day-header-width)))
|
2008-03-10 02:46:24 +00:00
|
|
|
;; Saturdays and Sundays are highlighted differently.
|
2002-12-05 18:42:33 +00:00
|
|
|
. font-lock-comment-face)
|
2003-08-03 13:59:13 +00:00
|
|
|
;; First two chars of each day are used in the calendar.
|
2008-06-21 19:28:09 +00:00
|
|
|
(,(regexp-opt (mapcar (lambda (x) (substring x 0 calendar-day-header-width))
|
2008-03-10 02:46:24 +00:00
|
|
|
calendar-day-name-array))
|
2002-12-05 18:42:33 +00:00
|
|
|
. font-lock-reference-face))
|
2002-11-16 19:19:35 +00:00
|
|
|
"Default keywords to highlight in Calendar mode.")
|
|
|
|
|
2003-08-03 13:59:13 +00:00
|
|
|
(defun calendar-day-name (date &optional abbrev absolute)
|
2002-12-07 21:30:57 +00:00
|
|
|
"Return a string with the name of the day of the week of DATE.
|
2003-08-03 13:59:13 +00:00
|
|
|
DATE should be a list in the format (MONTH DAY YEAR), unless the
|
|
|
|
optional argument ABSOLUTE is non-nil, in which case DATE should
|
|
|
|
be an integer in the range 0 to 6 corresponding to the day of the
|
|
|
|
week. Day names are taken from the variable `calendar-day-name-array',
|
|
|
|
unless the optional argument ABBREV is non-nil, in which case
|
|
|
|
the variable `calendar-day-abbrev-array' is used."
|
|
|
|
(aref (if abbrev
|
|
|
|
(calendar-abbrev-construct calendar-day-abbrev-array
|
|
|
|
calendar-day-name-array)
|
|
|
|
calendar-day-name-array)
|
|
|
|
(if absolute date (calendar-day-of-week date))))
|
|
|
|
|
|
|
|
(defun calendar-month-name (month &optional abbrev)
|
|
|
|
"Return a string with the name of month number MONTH.
|
|
|
|
Months are numbered from one. Month names are taken from the
|
|
|
|
variable `calendar-month-name-array', unless the optional
|
|
|
|
argument ABBREV is non-nil, in which case
|
|
|
|
`calendar-month-abbrev-array' is used."
|
|
|
|
(aref (if abbrev
|
|
|
|
(calendar-abbrev-construct calendar-month-abbrev-array
|
|
|
|
calendar-month-name-array)
|
|
|
|
calendar-month-name-array)
|
|
|
|
(1- month)))
|
1992-05-04 16:48:30 +00:00
|
|
|
|
|
|
|
(defun calendar-day-of-week (date)
|
2003-10-01 20:48:17 +00:00
|
|
|
"Return the day-of-the-week index of DATE, 0 for Sunday, 1 for Monday, etc.
|
|
|
|
DATE is a list of the form (month day year). A negative year is
|
|
|
|
interpreted as BC; -1 being 1 BC, and so on."
|
|
|
|
(mod (calendar-absolute-from-gregorian date) 7))
|
1992-05-04 16:48:30 +00:00
|
|
|
|
|
|
|
(defun calendar-unmark ()
|
(calendar-version): New function.
Adjustments to commentary at top of file.
(diary-entry-marker, calendar-today-marker,
calendar-holiday-marker): Don't autoload them; change definitions
to support monochrome and color workstations.
(calendar-french-date-string,calendar-mayan-date-string): Autoload them.
(calendar-day-of-year-string, calendar-iso-date-string,
calendar-julian-date-string,calendar-islamic-date-string,
calendar-hebrew-date-string,calendar-astro-date-string): New functions
(calendar-print-day-of-year, calendar-print-iso-date,
calendar-print-iso-date,calendar-print-julian-date,
calendar-print-islamic-date,calendar-print-hebrew-date,
calendar-print-astro-day-number): Use them.
(calendar-mode-map): Add mouse support.
(calendar-unmark,mark-visible-calendar-date,calendar-mark-today):
Rewritten.
1994-01-30 00:25:00 +00:00
|
|
|
"Delete all diary/holiday marks/highlighting from the calendar."
|
1992-05-04 16:48:30 +00:00
|
|
|
(interactive)
|
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
2008-04-07 01:58:55 +00:00
|
|
|
(setq calendar-mark-holidays-flag nil
|
|
|
|
calendar-mark-diary-entries-flag nil)
|
2008-04-01 02:46:29 +00:00
|
|
|
(with-current-buffer calendar-buffer
|
|
|
|
(mapc 'delete-overlay (overlays-in (point-min) (point-max)))))
|
1992-05-04 16:48:30 +00:00
|
|
|
|
|
|
|
(defun calendar-date-is-visible-p (date)
|
2008-03-31 07:11:00 +00:00
|
|
|
"Return non-nil if DATE is valid and is visible in the calendar window."
|
|
|
|
(and (calendar-date-is-valid-p date)
|
|
|
|
(< (abs (calendar-interval
|
|
|
|
displayed-month displayed-year
|
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
2008-04-07 01:58:55 +00:00
|
|
|
(calendar-extract-month date) (calendar-extract-year date)))
|
2008-03-31 07:11:00 +00:00
|
|
|
2)))
|
1992-05-04 16:48:30 +00:00
|
|
|
|
2008-04-23 02:59:47 +00:00
|
|
|
;; FIXME can this be generalized for holiday-chinese?
|
2008-04-01 02:55:03 +00:00
|
|
|
(defun calendar-nongregorian-visible-p (month day toabs fromabs switch)
|
|
|
|
"Return non-nil if MONTH, DAY is visible in the calendar window.
|
|
|
|
MONTH and DAY are in some non-Gregorian calendar system. The
|
|
|
|
functions TOABS and FROMABS convert that system to and from
|
|
|
|
absolute, respectively. SWITCH is a function that takes a single
|
|
|
|
argument (a local month number). It applies when the local year
|
|
|
|
changes across the calendar window, and returns non-nil if the
|
|
|
|
specified month should be associated with the higher year.
|
|
|
|
Returns the corresponding Gregorian date."
|
|
|
|
;; We need to choose the local year associated with month and day
|
|
|
|
;; that might make them visible.
|
|
|
|
(let* ((m1 displayed-month)
|
|
|
|
(y1 displayed-year)
|
|
|
|
(m2 displayed-month)
|
|
|
|
(y2 displayed-year)
|
|
|
|
;; Absolute date of first/last dates in calendar window.
|
|
|
|
(start-date (progn
|
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
2008-04-07 01:58:55 +00:00
|
|
|
(calendar-increment-month m1 y1 -1)
|
2008-04-01 02:55:03 +00:00
|
|
|
(calendar-absolute-from-gregorian (list m1 1 y1))))
|
|
|
|
(end-date (progn
|
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
2008-04-07 01:58:55 +00:00
|
|
|
(calendar-increment-month m2 y2 1)
|
2008-04-01 02:55:03 +00:00
|
|
|
(calendar-absolute-from-gregorian
|
|
|
|
(list m2 (calendar-last-day-of-month m2 y2) y2))))
|
|
|
|
;; Local date of first/last date in calendar window.
|
|
|
|
(local-start (funcall fromabs start-date))
|
|
|
|
(local-end (funcall fromabs end-date))
|
|
|
|
;; Local year of first/last dates.
|
|
|
|
;; Can only differ if displayed-month = 12, 1, 2.
|
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
2008-04-07 01:58:55 +00:00
|
|
|
(local-y1 (calendar-extract-year local-start))
|
|
|
|
(local-y2 (calendar-extract-year local-end))
|
2008-04-01 02:55:03 +00:00
|
|
|
;; Choose which year might be visible in the window.
|
|
|
|
;; Obviously it only matters when y1 and y2 differ, ie
|
|
|
|
;; when the _local_ new year is visible.
|
|
|
|
(year (if (funcall switch month) local-y2 local-y1))
|
|
|
|
(date (calendar-gregorian-from-absolute
|
|
|
|
(funcall toabs (list month day year)))))
|
|
|
|
(if (calendar-date-is-visible-p date)
|
|
|
|
date)))
|
|
|
|
|
2008-03-06 15:01:24 +00:00
|
|
|
(defun calendar-date-is-valid-p (date)
|
2005-03-25 09:53:47 +00:00
|
|
|
"Return t if DATE is a valid date."
|
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
2008-04-07 01:58:55 +00:00
|
|
|
(let ((month (calendar-extract-month date))
|
|
|
|
(day (calendar-extract-day date))
|
|
|
|
(year (calendar-extract-year date)))
|
1992-05-04 16:48:30 +00:00
|
|
|
(and (<= 1 month) (<= month 12)
|
2008-03-17 02:30:06 +00:00
|
|
|
;; (calendar-read-date t) used to return a date with day = nil.
|
2006-05-11 06:57:32 +00:00
|
|
|
;; Should not be valid (?), since many funcs prob assume integer.
|
|
|
|
;; (calendar-read-date 'noday) returns (month year), which
|
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
2008-04-07 01:58:55 +00:00
|
|
|
;; currently results in calendar-extract-year returning nil.
|
2006-05-11 06:57:32 +00:00
|
|
|
day year (<= 1 day) (<= day (calendar-last-day-of-month month year))
|
2005-03-25 09:53:47 +00:00
|
|
|
;; BC dates left as non-valid, to suppress errors from
|
2003-10-01 20:48:17 +00:00
|
|
|
;; complex holiday algorithms not suitable for years BC.
|
|
|
|
;; Note there are side effects on calendar navigation.
|
1992-05-04 16:48:30 +00:00
|
|
|
(<= 1 year))))
|
|
|
|
|
2008-03-06 15:01:24 +00:00
|
|
|
(define-obsolete-function-alias 'calendar-date-is-legal-p
|
|
|
|
'calendar-date-is-valid-p "23.1")
|
|
|
|
|
1992-05-04 16:48:30 +00:00
|
|
|
(defun calendar-date-equal (date1 date2)
|
2000-09-19 15:50:54 +00:00
|
|
|
"Return t if the DATE1 and DATE2 are the same."
|
1992-05-04 16:48:30 +00:00
|
|
|
(and
|
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
2008-04-07 01:58:55 +00:00
|
|
|
(= (calendar-extract-month date1) (calendar-extract-month date2))
|
|
|
|
(= (calendar-extract-day date1) (calendar-extract-day date2))
|
|
|
|
(= (calendar-extract-year date1) (calendar-extract-year date2))))
|
1992-05-04 16:48:30 +00:00
|
|
|
|
2008-04-01 04:10:09 +00:00
|
|
|
(defun calendar-make-temp-face (attrlist)
|
|
|
|
"Return a temporary face based on the attributes in ATTRLIST.
|
|
|
|
ATTRLIST is a list with elements of the form :face face :foreground color."
|
2008-04-01 07:25:42 +00:00
|
|
|
(let ((attrs attrlist)
|
|
|
|
faceinfo face temp-face)
|
|
|
|
;; Separate :face from the other attributes. Use the last :face
|
|
|
|
;; if there are more than one. FIXME is merging meaningful?
|
|
|
|
(while attrs
|
|
|
|
(if (eq (car attrs) :face)
|
|
|
|
(setq face (intern-soft (cadr attrs))
|
|
|
|
attrs (cddr attrs))
|
|
|
|
(push (car attrs) faceinfo)
|
|
|
|
(setq attrs (cdr attrs))))
|
|
|
|
(or (facep face) (setq face 'default))
|
|
|
|
(if (not faceinfo)
|
|
|
|
;; No attributes to apply, so just use an existing-face.
|
|
|
|
face
|
|
|
|
;; FIXME should we be using numbered temp-faces, re-using where poss?
|
|
|
|
(setq temp-face
|
|
|
|
(make-symbol
|
|
|
|
(concat ":caltemp"
|
|
|
|
(mapconcat (lambda (sym)
|
|
|
|
(cond
|
|
|
|
((symbolp sym) (symbol-name sym))
|
|
|
|
((numberp sym) (number-to-string sym))
|
|
|
|
(t sym)))
|
|
|
|
attrlist ""))))
|
|
|
|
(make-face temp-face)
|
|
|
|
(copy-face face temp-face)
|
|
|
|
;; Apply the font aspects.
|
|
|
|
(apply 'set-face-attribute temp-face nil (nreverse faceinfo))
|
|
|
|
temp-face)))
|
2008-04-01 04:10:09 +00:00
|
|
|
|
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
2008-04-07 01:58:55 +00:00
|
|
|
(defun calendar-mark-visible-date (date &optional mark)
|
(calendar-version): New function.
Adjustments to commentary at top of file.
(diary-entry-marker, calendar-today-marker,
calendar-holiday-marker): Don't autoload them; change definitions
to support monochrome and color workstations.
(calendar-french-date-string,calendar-mayan-date-string): Autoload them.
(calendar-day-of-year-string, calendar-iso-date-string,
calendar-julian-date-string,calendar-islamic-date-string,
calendar-hebrew-date-string,calendar-astro-date-string): New functions
(calendar-print-day-of-year, calendar-print-iso-date,
calendar-print-iso-date,calendar-print-julian-date,
calendar-print-islamic-date,calendar-print-hebrew-date,
calendar-print-astro-day-number): Use them.
(calendar-mode-map): Add mouse support.
(calendar-unmark,mark-visible-calendar-date,calendar-mark-today):
Rewritten.
1994-01-30 00:25:00 +00:00
|
|
|
"Mark DATE in the calendar window with MARK.
|
2003-02-11 23:23:10 +00:00
|
|
|
MARK is a single-character string, a list of face attributes/values, or a face.
|
2002-11-16 19:19:35 +00:00
|
|
|
MARK defaults to `diary-entry-marker'."
|
2008-03-06 15:01:24 +00:00
|
|
|
(if (calendar-date-is-valid-p date)
|
2005-09-19 17:41:22 +00:00
|
|
|
(with-current-buffer calendar-buffer
|
|
|
|
(save-excursion
|
|
|
|
(calendar-cursor-to-visible-date date)
|
|
|
|
(setq mark
|
|
|
|
(or (and (stringp mark) (= (length mark) 1) mark) ; single-char
|
2009-02-08 01:52:01 +00:00
|
|
|
;; The next two use to also check font-lock-mode.
|
|
|
|
;; See comments above diary-entry-marker for why
|
|
|
|
;; this was dropped.
|
|
|
|
;;; (and font-lock-mode
|
|
|
|
;;; (or
|
2008-04-02 03:35:38 +00:00
|
|
|
(and (listp mark) (> (length mark) 0) mark) ; attrs
|
2009-02-08 01:52:01 +00:00
|
|
|
(and (facep mark) mark) ; )) face-name
|
|
|
|
diary-entry-marker))
|
2005-09-19 17:41:22 +00:00
|
|
|
(cond
|
2008-03-10 02:46:24 +00:00
|
|
|
;; Face or an attr-list that contained a face.
|
2005-09-19 17:41:22 +00:00
|
|
|
((facep mark)
|
|
|
|
(overlay-put
|
|
|
|
(make-overlay (1- (point)) (1+ (point))) 'face mark))
|
2008-04-01 02:46:29 +00:00
|
|
|
;; Single-character mark, goes after the date.
|
2005-09-19 17:41:22 +00:00
|
|
|
((and (stringp mark) (= (length mark) 1))
|
2008-04-01 02:46:29 +00:00
|
|
|
(overlay-put
|
|
|
|
(make-overlay (1+ (point)) (+ 2 (point))) 'display mark))
|
2008-03-10 02:46:24 +00:00
|
|
|
(t ; attr list
|
2008-04-01 04:10:09 +00:00
|
|
|
(overlay-put
|
|
|
|
(make-overlay (1- (point)) (1+ (point))) 'face
|
|
|
|
(calendar-make-temp-face mark))))))))
|
1992-05-04 16:48:30 +00:00
|
|
|
|
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
2008-04-07 01:58:55 +00:00
|
|
|
(define-obsolete-function-alias 'mark-visible-calendar-date
|
|
|
|
'calendar-mark-visible-date "23.1")
|
|
|
|
|
1992-05-04 16:48:30 +00:00
|
|
|
(defun calendar-star-date ()
|
|
|
|
"Replace the date under the cursor in the calendar window with asterisks.
|
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
2008-04-07 01:58:55 +00:00
|
|
|
You might want to add this function to `calendar-today-visible-hook'."
|
2008-04-01 02:46:29 +00:00
|
|
|
(unless (catch 'found
|
|
|
|
(dolist (ol (overlays-at (point)))
|
|
|
|
(and (overlay-get ol 'calendar-star)
|
|
|
|
(throw 'found t))))
|
|
|
|
(let ((ol (make-overlay (1- (point)) (point))))
|
|
|
|
(overlay-put ol 'display "*")
|
|
|
|
(overlay-put ol 'calendar-star t)
|
|
|
|
;; Use copy-sequence to avoid merging of identical 'display props.
|
|
|
|
;; Use two overlays so as not to mess up
|
|
|
|
;; calendar-cursor-to-nearest-date (and calendar-forward-day).
|
|
|
|
(overlay-put (setq ol (make-overlay (point) (1+ (point))))
|
|
|
|
'display (copy-sequence "*"))
|
|
|
|
(overlay-put ol 'calendar-star t))))
|
1992-05-04 16:48:30 +00:00
|
|
|
|
|
|
|
(defun calendar-mark-today ()
|
(calendar-version): New function.
Adjustments to commentary at top of file.
(diary-entry-marker, calendar-today-marker,
calendar-holiday-marker): Don't autoload them; change definitions
to support monochrome and color workstations.
(calendar-french-date-string,calendar-mayan-date-string): Autoload them.
(calendar-day-of-year-string, calendar-iso-date-string,
calendar-julian-date-string,calendar-islamic-date-string,
calendar-hebrew-date-string,calendar-astro-date-string): New functions
(calendar-print-day-of-year, calendar-print-iso-date,
calendar-print-iso-date,calendar-print-julian-date,
calendar-print-islamic-date,calendar-print-hebrew-date,
calendar-print-astro-day-number): Use them.
(calendar-mode-map): Add mouse support.
(calendar-unmark,mark-visible-calendar-date,calendar-mark-today):
Rewritten.
1994-01-30 00:25:00 +00:00
|
|
|
"Mark the date under the cursor in the calendar window.
|
2008-03-17 02:30:06 +00:00
|
|
|
The date is marked with `calendar-today-marker'. You might want to add
|
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
2008-04-07 01:58:55 +00:00
|
|
|
this function to `calendar-today-visible-hook'."
|
|
|
|
(calendar-mark-visible-date (calendar-cursor-to-date) calendar-today-marker))
|
1992-05-04 16:48:30 +00:00
|
|
|
|
2009-08-31 01:33:43 +00:00
|
|
|
;; FIXME why the car? Almost every usage calls list on the args.
|
1992-05-04 16:48:30 +00:00
|
|
|
(defun calendar-date-compare (date1 date2)
|
2000-09-19 15:50:54 +00:00
|
|
|
"Return t if DATE1 is before DATE2, nil otherwise.
|
1992-05-04 16:48:30 +00:00
|
|
|
The actual dates are in the car of DATE1 and DATE2."
|
|
|
|
(< (calendar-absolute-from-gregorian (car date1))
|
|
|
|
(calendar-absolute-from-gregorian (car date2))))
|
|
|
|
|
|
|
|
(defun calendar-date-string (date &optional abbreviate nodayname)
|
|
|
|
"A string form of DATE, driven by the variable `calendar-date-display-form'.
|
2003-08-03 13:59:13 +00:00
|
|
|
An optional parameter ABBREVIATE, when non-nil, causes the month
|
|
|
|
and day names to be abbreviated as specified by
|
|
|
|
`calendar-month-abbrev-array' and `calendar-day-abbrev-array',
|
|
|
|
respectively. An optional parameter NODAYNAME, when t, omits the
|
|
|
|
name of the day of the week."
|
2008-03-15 03:00:17 +00:00
|
|
|
(let* ((dayname (unless nodayname (calendar-day-name date abbreviate)))
|
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
2008-04-07 01:58:55 +00:00
|
|
|
(month (calendar-extract-month date))
|
2003-08-03 13:59:13 +00:00
|
|
|
(monthname (calendar-month-name month abbreviate))
|
2008-04-08 07:08:24 +00:00
|
|
|
(day (number-to-string (calendar-extract-day date)))
|
|
|
|
(month (number-to-string month))
|
|
|
|
(year (number-to-string (calendar-extract-year date))))
|
1992-05-04 16:48:30 +00:00
|
|
|
(mapconcat 'eval calendar-date-display-form "")))
|
|
|
|
|
|
|
|
(defun calendar-dayname-on-or-before (dayname date)
|
2000-09-19 15:50:54 +00:00
|
|
|
"Return the absolute date of the DAYNAME on or before absolute DATE.
|
1992-05-04 16:48:30 +00:00
|
|
|
DAYNAME=0 means Sunday, DAYNAME=1 means Monday, and so on.
|
|
|
|
|
|
|
|
Note: Applying this function to d+6 gives us the DAYNAME on or after an
|
|
|
|
absolute day d. Similarly, applying it to d+3 gives the DAYNAME nearest to
|
|
|
|
absolute date d, applying it to d-1 gives the DAYNAME previous to absolute
|
|
|
|
date d, and applying it to d+7 gives the DAYNAME following absolute date d."
|
|
|
|
(- date (% (- date dayname) 7)))
|
|
|
|
|
1993-08-28 04:14:25 +00:00
|
|
|
(defun calendar-nth-named-absday (n dayname month year &optional day)
|
2008-04-29 03:34:17 +00:00
|
|
|
"Absolute date of the Nth DAYNAME after/before MONTH YEAR DAY.
|
|
|
|
A DAYNAME of 0 means Sunday, 1 means Monday, and so on.
|
1993-08-28 04:14:25 +00:00
|
|
|
If N>0, return the Nth DAYNAME after MONTH DAY, YEAR (inclusive).
|
2008-04-29 03:34:17 +00:00
|
|
|
If N<0, return the Nth DAYNAME before MONTH DAY, YEAR (inclusive).
|
|
|
|
DAY defaults to 1 if N>0, and MONTH's last day otherwise."
|
1993-08-28 04:14:25 +00:00
|
|
|
(if (> n 0)
|
|
|
|
(+ (* 7 (1- n))
|
2008-03-13 06:29:28 +00:00
|
|
|
(calendar-dayname-on-or-before
|
|
|
|
dayname
|
|
|
|
(+ 6 (calendar-absolute-from-gregorian
|
|
|
|
(list month (or day 1) year)))))
|
1993-08-28 04:14:25 +00:00
|
|
|
(+ (* 7 (1+ n))
|
|
|
|
(calendar-dayname-on-or-before
|
2008-03-13 06:29:28 +00:00
|
|
|
dayname
|
|
|
|
(calendar-absolute-from-gregorian
|
|
|
|
(list month
|
|
|
|
(or day (calendar-last-day-of-month month year))
|
|
|
|
year))))))
|
1993-08-28 04:14:25 +00:00
|
|
|
|
* calendar.el (calendar-version): Update to 5.1. Fixed a variety
of spelling error in comments and doc strings.
(calendar-sexp-debug): New variable to turn off error catching.
(calendar-absolute-from-gregorian): Removed unused vars month, day.
(view-calendar-holidays-initially, all-hebrew-calendar-holidays,
all-christian-calendar-holidays, all-christian-islamic-holidays,
diary-nonmarking-symbol, hebrew-diary-entry-symbol,
islamic-diary-entry-symbol, diary-include-string,
abbreviated-calendar-year, european-calendar-style,
european-calendar-display-form, american-calendar-display-form,
calendar-date-display-form, print-diary-entries-hook,
list-diary-entries-hook, nongregorian-diary-listing-hook,
nongregorian-diary-marking-hook, diary-list-include-blanks,
holidays-in-diary-buffer, general-holidays,
increment-calendar-month, calendar-sum, calendar-string-spread,
calendar-absolute-from-iso, calendar-print-iso-date,
hebrew-calendar-elapsed-days, list-yahrzeit-dates,
calendar-print-astro-day-number): Fix doc strings.
(calendar-nth-named-day): Rewritten to include optional day of month.
(general-holidays, calendar-holidays, hebrew-holidays,
christian-holidays, islamic-holidays,
solar-holidays): Rewritten to include require of cal-dst.el and to
show the time of the change to/from daylight savings time.
(calendar-current-time-zone, calendar-time-zone,
calendar-daylight-time-offset, calendar-standard-time-zone-name,
calendar-daylight-time-zone-name, calendar-daylight-savings-starts,
calendar-daylight-savings-ends,
calendar-daylight-savings-switchover-time): Moved to cal-dst.el.
(calendar-location-name, calendar-time-display-form, calendar-latitude,
calendar-longitude): Moved to solar.el.
(calendar-holidays): Unquote it!
1993-06-22 03:22:12 +00:00
|
|
|
(defun calendar-nth-named-day (n dayname month year &optional day)
|
2008-04-29 03:34:17 +00:00
|
|
|
"Date of the Nth DAYNAME after/before MONTH YEAR DAY.
|
2008-04-02 03:35:38 +00:00
|
|
|
Like `calendar-nth-named-absday', but returns a Gregorian date."
|
1992-05-04 16:48:30 +00:00
|
|
|
(calendar-gregorian-from-absolute
|
1993-08-28 04:14:25 +00:00
|
|
|
(calendar-nth-named-absday n dayname month year day)))
|
1992-05-04 16:48:30 +00:00
|
|
|
|
(calendar-version): New function.
Adjustments to commentary at top of file.
(diary-entry-marker, calendar-today-marker,
calendar-holiday-marker): Don't autoload them; change definitions
to support monochrome and color workstations.
(calendar-french-date-string,calendar-mayan-date-string): Autoload them.
(calendar-day-of-year-string, calendar-iso-date-string,
calendar-julian-date-string,calendar-islamic-date-string,
calendar-hebrew-date-string,calendar-astro-date-string): New functions
(calendar-print-day-of-year, calendar-print-iso-date,
calendar-print-iso-date,calendar-print-julian-date,
calendar-print-islamic-date,calendar-print-hebrew-date,
calendar-print-astro-day-number): Use them.
(calendar-mode-map): Add mouse support.
(calendar-unmark,mark-visible-calendar-date,calendar-mark-today):
Rewritten.
1994-01-30 00:25:00 +00:00
|
|
|
(defun calendar-day-of-year-string (&optional date)
|
|
|
|
"String of day number of year of Gregorian DATE.
|
|
|
|
Defaults to today's date if DATE is not given."
|
|
|
|
(let* ((d (or date (calendar-current-date)))
|
(diary-view-entries-initially-flag): Rename view-diary-entries-initially.
Keep old name as alias, update users.
(calendar-mark-diary-entries-flag): Rename mark-diary-entries-in-calendar.
Keep old name as alias, update users.
(calendar-view-holidays-initially-flag): Rename
view-calendar-holidays-initially. Keep old name as alias, update users.
(calendar-mark-holidays-flag): Rename mark-holidays-in-calendar.
Keep old name as alias, update users.
(calendar-initial-window-hook): Rename initial-calendar-window-hook.
Keep old name as alias, update users.
(calendar-today-visible-hook): Rename today-visible-calendar-hook.
Keep old name as alias, update users.
(calendar-today-invisible-hook): Rename today-invisible-calendar-hook.
Keep old name as alias, update users.
(diary-iso-date-forms): Rename iso-date-diary-pattern. Update users.
(diary-american-date-forms): Rename american-date-diary-pattern.
Keep old name as alias, update users.
(diary-european-date-forms): Rename european-date-diary-pattern.
Keep old name as alias, update users.
(calendar-iso-date-display-form): Rename iso-calendar-display-form.
Keep old name as alias, update users.
(calendar-european-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(calendar-american-date-display-form): Rename european-calendar-display-form.
Keep old name as alias, update users.
(diary-show-holidays-flag): Rename holidays-in-diary-buffer.
Keep old name as alias, update users.
(holiday-general-holidays): Rename general-holidays. Keep old name as alias,
update users.
(holiday-oriental-holidays): Rename oriental-holidays. Keep old name as alias,
update users.
(holiday-local-holidays): Rename local-holidays. Keep old name as alias,
update users.
(holiday-other-holidays): Rename other-holidays. Keep old name as alias,
update users.
(holiday-hebrew-holidays): Rename hebrew-holidays. Keep old name as alias,
update users.
(holiday-christian-holidays): Rename christian-holidays.
Keep old name as alias, update users.
(holiday-islamic-holidays): Rename islamic-holidays. Keep old name as alias,
update users.
(holiday-bahai-holidays): Rename bahai-holidays. Keep old name as alias,
update users.
(holiday-solar-holidays): Rename solar-holidays. Keep old name as alias,
update users.
(diary-fancy-buffer): Rename fancy-diary-buffer. Keep old name as alias,
update users.
(calendar-other-calendars-buffer): Rename other-calendars-buffer. Update users.
(calendar-hebrew-yahrzeit-buffer): Rename cal-hebrew-yahrzeit-buffer.
Update users.
(calendar-increment-month): Rename increment-calendar-month.
Keep old name as alias, update callers.
(calendar-increment-month-cons): Rename old calendar-increment-month.
Update callers.
(calendar-extract-month): Rename extract-calendar-month.
Keep old name as alias, update callers
(calendar-extract-day): Rename extract-calendar-day. Keep old name as alias,
update callers.
(calendar-extract-year): Rename extract-calendar-year. Keep old name as alias,
update callers.
(calendar-generate-window): Rename generate-calendar-window. Update callers.
(calendar-generate): Rename generate-calendar. Update callers.
(calendar-generate-month): Rename generate-calendar-month. Update callers.
(calendar-redraw): Rename redraw-calendar. Update callers.
(calendar-describe-mode): Rename describe-calendar-mode. Update uses.
(calendar-mouse-other-month): Rename mouse-calendar-other-month.
Update callers.
(calendar-update-mode-line): Rename update-calendar-mode-line. Update callers.
(calendar-exit): Rename exit-calendar. Keep old name as alias, update callers.
(calendar-mark-visible-date): Rename mark-visible-calendar-date.
Keep old name as alias, update callers.
2008-04-07 01:58:55 +00:00
|
|
|
(year (calendar-extract-year d))
|
(calendar-version): New function.
Adjustments to commentary at top of file.
(diary-entry-marker, calendar-today-marker,
calendar-holiday-marker): Don't autoload them; change definitions
to support monochrome and color workstations.
(calendar-french-date-string,calendar-mayan-date-string): Autoload them.
(calendar-day-of-year-string, calendar-iso-date-string,
calendar-julian-date-string,calendar-islamic-date-string,
calendar-hebrew-date-string,calendar-astro-date-string): New functions
(calendar-print-day-of-year, calendar-print-iso-date,
calendar-print-iso-date,calendar-print-julian-date,
calendar-print-islamic-date,calendar-print-hebrew-date,
calendar-print-astro-day-number): Use them.
(calendar-mode-map): Add mouse support.
(calendar-unmark,mark-visible-calendar-date,calendar-mark-today):
Rewritten.
1994-01-30 00:25:00 +00:00
|
|
|
(day (calendar-day-number d))
|
|
|
|
(days-remaining (- (calendar-day-number (list 12 31 year)) day)))
|
|
|
|
(format "Day %d of %d; %d day%s remaining in the year"
|
|
|
|
day year days-remaining (if (= days-remaining 1) "" "s"))))
|
|
|
|
|
2008-03-20 04:41:47 +00:00
|
|
|
(defun calendar-other-dates (date)
|
|
|
|
"Return a list of strings giving Gregorian DATE in other calendars.
|
|
|
|
DATE is (month day year). Calendars that do not apply are omitted."
|
|
|
|
(let (odate)
|
|
|
|
(delq nil
|
|
|
|
(list
|
|
|
|
(calendar-day-of-year-string date)
|
|
|
|
(format "ISO date: %s" (calendar-iso-date-string date))
|
|
|
|
(format "Julian date: %s"
|
|
|
|
(calendar-julian-date-string date))
|
|
|
|
(format "Astronomical (Julian) day number (at noon UTC): %s.0"
|
|
|
|
(calendar-astro-date-string date))
|
|
|
|
(format "Fixed (RD) date: %s"
|
|
|
|
(calendar-absolute-from-gregorian date))
|
|
|
|
(format "Hebrew date (before sunset): %s"
|
|
|
|
(calendar-hebrew-date-string date))
|
|
|
|
(format "Persian date: %s"
|
|
|
|
(calendar-persian-date-string date))
|
|
|
|
(unless (string-equal
|
|
|
|
(setq odate (calendar-islamic-date-string date))
|
|
|
|
"")
|
|
|
|
(format "Islamic date (before sunset): %s" odate))
|
|
|
|
(unless (string-equal
|
|
|
|
(setq odate (calendar-bahai-date-string date))
|
|
|
|
"")
|
|
|
|
(format "Baha'i date: %s" odate))
|
|
|
|
(format "Chinese date: %s"
|
|
|
|
(calendar-chinese-date-string date))
|
|
|
|
(unless (string-equal
|
|
|
|
(setq odate (calendar-coptic-date-string date))
|
|
|
|
"")
|
|
|
|
(format "Coptic date: %s" odate))
|
|
|
|
(unless (string-equal
|
|
|
|
(setq odate (calendar-ethiopic-date-string date))
|
|
|
|
"")
|
|
|
|
(format "Ethiopic date: %s" odate))
|
|
|
|
(unless (string-equal
|
|
|
|
(setq odate (calendar-french-date-string date))
|
|
|
|
"")
|
|
|
|
(format "French Revolutionary date: %s" odate))
|
|
|
|
(format "Mayan date: %s"
|
|
|
|
(calendar-mayan-date-string date))))))
|
|
|
|
|
2009-11-10 08:11:47 +00:00
|
|
|
(declare-function x-popup-menu "menu.c" (position menu))
|
2008-08-11 01:23:07 +00:00
|
|
|
|
2008-06-26 03:41:20 +00:00
|
|
|
(defun calendar-print-other-dates (&optional event)
|
|
|
|
"Show dates on other calendars for date under the cursor.
|
|
|
|
If called by a mouse-event, pops up a menu with the result."
|
|
|
|
(interactive (list last-nonmenu-event))
|
|
|
|
(let* ((date (calendar-cursor-to-date t event))
|
|
|
|
(title (format "%s (Gregorian)" (calendar-date-string date)))
|
2008-06-26 06:57:29 +00:00
|
|
|
(others (calendar-other-dates date))
|
2008-06-26 03:41:20 +00:00
|
|
|
selection)
|
|
|
|
(if (mouse-event-p event)
|
|
|
|
(and (setq selection (cal-menu-x-popup-menu event title
|
2008-06-26 06:57:29 +00:00
|
|
|
(mapcar 'list others)))
|
2008-06-26 03:41:20 +00:00
|
|
|
(call-interactively selection))
|
|
|
|
(calendar-in-read-only-buffer calendar-other-calendars-buffer
|
|
|
|
(calendar-set-mode-line title)
|
2008-06-26 06:57:29 +00:00
|
|
|
(insert (mapconcat 'identity others "\n"))))))
|
1998-05-27 20:18:40 +00:00
|
|
|
|
1992-08-12 12:50:10 +00:00
|
|
|
(defun calendar-print-day-of-year ()
|
(calendar-version): New function.
Adjustments to commentary at top of file.
(diary-entry-marker, calendar-today-marker,
calendar-holiday-marker): Don't autoload them; change definitions
to support monochrome and color workstations.
(calendar-french-date-string,calendar-mayan-date-string): Autoload them.
(calendar-day-of-year-string, calendar-iso-date-string,
calendar-julian-date-string,calendar-islamic-date-string,
calendar-hebrew-date-string,calendar-astro-date-string): New functions
(calendar-print-day-of-year, calendar-print-iso-date,
calendar-print-iso-date,calendar-print-julian-date,
calendar-print-islamic-date,calendar-print-hebrew-date,
calendar-print-astro-day-number): Use them.
(calendar-mode-map): Add mouse support.
(calendar-unmark,mark-visible-calendar-date,calendar-mark-today):
Rewritten.
1994-01-30 00:25:00 +00:00
|
|
|
"Show day number in year/days remaining in year for date under the cursor."
|
1992-05-04 16:48:30 +00:00
|
|
|
(interactive)
|
2007-12-08 01:02:29 +00:00
|
|
|
(message "%s" (calendar-day-of-year-string (calendar-cursor-to-date t))))
|
1992-05-04 16:48:30 +00:00
|
|
|
|
1992-08-12 12:50:10 +00:00
|
|
|
(defun calendar-set-mode-line (str)
|
|
|
|
"Set mode line to STR, centered, surrounded by dashes."
|
2006-01-24 17:07:29 +00:00
|
|
|
(let* ((edges (window-edges))
|
2004-03-24 18:37:08 +00:00
|
|
|
;; As per doc of window-width, total visible mode-line length.
|
2008-03-15 03:00:17 +00:00
|
|
|
(width (- (nth 2 edges) (car edges))))
|
2009-02-11 04:02:16 +00:00
|
|
|
;; Hack for --daemon. See bug #2199.
|
|
|
|
;; If no frame exists yet, we have no idea what width to use.
|
|
|
|
(and (= width 10)
|
|
|
|
(not window-system)
|
|
|
|
(setq width (or (getenv "COLUMNS") 80)))
|
2006-01-24 17:07:29 +00:00
|
|
|
(setq mode-line-format
|
|
|
|
(if buffer-file-name
|
|
|
|
`("-" mode-line-modified
|
|
|
|
,(calendar-string-spread (list str) ?- (- width 6))
|
|
|
|
"---")
|
|
|
|
(calendar-string-spread (list str) ?- width)))))
|
1992-08-12 12:50:10 +00:00
|
|
|
|
(calendar-version): Use emacs-version and make it obsolete. Move to end.
(calendar-offset, view-diary-entries-initially)
(mark-diary-entries-in-calendar)
(calendar-remove-frame-by-deleting)
(view-calendar-holidays-initially, all-hebrew-calendar-holidays)
(all-christian-calendar-holidays, all-islamic-calendar-holidays)
(all-bahai-calendar-holidays, calendar-load-hook)
(initial-calendar-window-hook, today-visible-calendar-hook)
(today-invisible-calendar-hook, calendar-move-hook)
(diary-nonmarking-symbol, hebrew-diary-entry-symbol)
(islamic-diary-entry-symbol, bahai-diary-entry-symbol)
(diary-include-string, sexp-diary-entry-symbol)
(abbreviated-calendar-year, american-date-diary-pattern)
(european-date-diary-pattern, european-calendar-display-form)
(american-calendar-display-form, print-diary-entries-hook)
(list-diary-entries-hook, diary-hook, diary-display-hook)
(nongregorian-diary-listing-hook, mark-diary-entries-hook)
(nongregorian-diary-marking-hook, diary-list-include-blanks)
(holidays-in-diary-buffer, general-holidays, oriental-holidays)
(local-holidays, other-holidays, hebrew-holidays-1)
(hebrew-holidays-2, hebrew-holidays-3, hebrew-holidays-4)
(hebrew-holidays, christian-holidays, islamic-holidays)
(bahai-holidays, solar-holidays, calendar-setup)
(calendar-week-start-day): Remove autoload cookies.
(diary-glob-file-regexp-prefix): Doc fix.
(calendar-goto-info-node): Use `info' rather than `Info-find-node'.
(Info-find-emacs-command-nodes, Info-find-node): Remove declarations.
(calendar-week-start-day, calendar-debug-sexp): Move to start.
2008-03-07 05:06:34 +00:00
|
|
|
(defun calendar-version ()
|
2008-03-10 02:46:24 +00:00
|
|
|
"Display the Calendar version."
|
(calendar-version): Use emacs-version and make it obsolete. Move to end.
(calendar-offset, view-diary-entries-initially)
(mark-diary-entries-in-calendar)
(calendar-remove-frame-by-deleting)
(view-calendar-holidays-initially, all-hebrew-calendar-holidays)
(all-christian-calendar-holidays, all-islamic-calendar-holidays)
(all-bahai-calendar-holidays, calendar-load-hook)
(initial-calendar-window-hook, today-visible-calendar-hook)
(today-invisible-calendar-hook, calendar-move-hook)
(diary-nonmarking-symbol, hebrew-diary-entry-symbol)
(islamic-diary-entry-symbol, bahai-diary-entry-symbol)
(diary-include-string, sexp-diary-entry-symbol)
(abbreviated-calendar-year, american-date-diary-pattern)
(european-date-diary-pattern, european-calendar-display-form)
(american-calendar-display-form, print-diary-entries-hook)
(list-diary-entries-hook, diary-hook, diary-display-hook)
(nongregorian-diary-listing-hook, mark-diary-entries-hook)
(nongregorian-diary-marking-hook, diary-list-include-blanks)
(holidays-in-diary-buffer, general-holidays, oriental-holidays)
(local-holidays, other-holidays, hebrew-holidays-1)
(hebrew-holidays-2, hebrew-holidays-3, hebrew-holidays-4)
(hebrew-holidays, christian-holidays, islamic-holidays)
(bahai-holidays, solar-holidays, calendar-setup)
(calendar-week-start-day): Remove autoload cookies.
(diary-glob-file-regexp-prefix): Doc fix.
(calendar-goto-info-node): Use `info' rather than `Info-find-node'.
(Info-find-emacs-command-nodes, Info-find-node): Remove declarations.
(calendar-week-start-day, calendar-debug-sexp): Move to start.
2008-03-07 05:06:34 +00:00
|
|
|
(interactive)
|
|
|
|
(message "GNU Emacs %s" emacs-version))
|
|
|
|
|
|
|
|
(make-obsolete 'calendar-version 'emacs-version "23.1")
|
|
|
|
|
|
|
|
|
1992-08-12 12:50:10 +00:00
|
|
|
(run-hooks 'calendar-load-hook)
|
1992-05-04 16:48:30 +00:00
|
|
|
|
|
|
|
(provide 'calendar)
|
|
|
|
|
2005-09-12 21:32:11 +00:00
|
|
|
;; Local variables:
|
|
|
|
;; byte-compile-dynamic: t
|
|
|
|
;; End:
|
1996-01-14 07:34:30 +00:00
|
|
|
|
2005-09-12 21:32:11 +00:00
|
|
|
;; arch-tag: 19c61596-c8fb-4c69-bcf1-7dd739919cd8
|
1992-06-03 02:55:55 +00:00
|
|
|
;;; calendar.el ends here
|