;;; calendar.el --- calendar functions
;; Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1997,
-;; 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+;; 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
;; Free Software Foundation, Inc.
;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
;; This file is part of GNU Emacs.
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
;; unfortunately have rather common names. They are meant to be
;; available for external functions, so the names can't be changed.
-;; displayed-month, displayed-year: bound in generate-calendar, the
+;; displayed-month, displayed-year: bound in calendar-generate, the
;; central month of the 3 month calendar window
;; original-date, number: bound in diary-list-entries, the arguments
;; with which that function was called.
-;; date, entry: bound in list-sexp-diary-entries (qv)
+;; date, entry: bound in diary-list-sexp-entries (qv)
;; Bound in diary-list-entries:
-;; diary-entries-list: use in d-l, appt.el, and by add-to-diary-list
+;; diary-entries-list: use in d-l, appt.el, and by diary-add-to-list
;; diary-saved-point: only used in diary-lib.el, passed to the display func
;; date-string: only used in diary-lib.el
;; list-only: don't modify the diary-buffer, just return a list of entries
;;; Code:
-(require 'cal-loaddefs)
+(load "cal-loaddefs" nil t)
;; Avoid recursive load of calendar when loading cal-menu. Yuck.
(provide 'calendar)
(require 'cal-menu)
-
(defgroup calendar nil
"Calendar and time management support."
+ :prefix "calendar-"
:group 'applications)
(defgroup calendar-hooks nil
:prefix "calendar-"
:group 'calendar)
-(defgroup diary nil
- "Emacs diary."
- :group 'calendar)
-
-(defgroup holidays nil
- "Holidays support in calendar."
- :group 'calendar
+(defgroup calendar-faces nil
+ "Calendar faces."
:prefix "calendar-"
- :group 'local)
-
+ :group 'calendar)
(defcustom calendar-offset 0
"The offset of the principal month from the center of the calendar window.
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
-three options overrides the value of `view-diary-entries-initially'."
+three options overrides the value of `calendar-view-diary-initially-flag'."
:type '(choice
(const :tag "calendar and diary in separate frame" one-frame)
(const :tag "calendar and diary each in own frame" two-frames)
:group 'calendar)
(defcustom calendar-minimum-window-height 8
- "Minimum height `generate-calendar-window' should use for calendar window."
+ "Minimum height `calendar-generate-window' should use for calendar window."
:type 'integer
:version "22.1"
:group 'calendar)
+;; 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)
+
(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.
If you change this variable directly (without using customize)
-after starting `calendar', you should call `redraw-calendar' to
+after starting `calendar', you should call `calendar-redraw' to
update the calendar display to reflect the change, otherwise
movement commands will not work correctly."
:type 'integer
:initialize 'custom-initialize-default
:set (lambda (sym val)
(set sym val)
- (redraw-calendar))
+ (calendar-redraw))
:group 'calendar)
-(defcustom view-diary-entries-initially nil
+(define-obsolete-variable-alias 'view-diary-entries-initially
+ 'calendar-view-diary-initially-flag "23.1")
+
+(defcustom calendar-view-diary-initially-flag nil
"Non-nil means display current date's diary entries on entry to calendar.
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
-is governed by the variable `number-of-diary-entries'. This variable can
+is governed by the variable `diary-number-of-entries'. This variable can
be overridden by the value of `calendar-setup'."
:type 'boolean
:group 'diary)
-(defcustom mark-diary-entries-in-calendar nil
+(define-obsolete-variable-alias 'mark-diary-entries-in-calendar
+ 'calendar-mark-diary-entries-flag "23.1")
+
+;; FIXME :set
+(defcustom calendar-mark-diary-entries-flag nil
"Non-nil means mark dates with diary entries, in the calendar window.
The marking symbol is specified by the variable `diary-entry-marker'."
:type 'boolean
(defface calendar-today
'((t (:underline t)))
- "Face for indicating today's date."
- :group 'diary)
-;; Backward-compatibility alias. FIXME make obsolete.
-(put 'calendar-today-face 'face-alias 'calendar-today)
+ "Face for indicating today's date in the calendar.
+See the variable `calendar-today-marker'."
+ :group 'calendar-faces)
+
+(define-obsolete-face-alias 'calendar-today-face 'calendar-today "22.1")
(defface diary
'((((min-colors 88) (class color) (background light))
:foreground "yellow")
(t
:weight bold))
- "Face for highlighting diary entries."
- :group 'diary)
-;; Backward-compatibility alias. FIXME make obsolete.
-(put 'diary-face 'face-alias 'diary)
+ "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)
+
+(define-obsolete-face-alias 'diary-face 'diary "22.1")
(defface holiday
'((((class color) (background light))
:background "chocolate4")
(t
:inverse-video t))
- "Face for indicating dates that have holidays."
- :group 'diary)
-;; Backward-compatibility alias. FIXME make obsolete.
-(put 'holiday-face 'face-alias 'holiday)
-
-;; These don't respect changes in font-lock-mode after loading.
-(defcustom diary-entry-marker (if (and font-lock-mode (display-color-p))
- 'diary
- "+")
+ "Face for indicating in the calendar dates that have holidays.
+See `calendar-holiday-marker'."
+ :group 'calendar-faces)
+
+(define-obsolete-face-alias 'holiday-face 'holiday "22.1")
+
+;; 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
"How to mark dates that have diary entries.
-The value can be either a single-character string or a face."
- :type '(choice string face)
- :group 'diary)
+The value can be either a single-character string (e.g. \"+\") or a face."
+ :type '(choice (string :tag "Single character string") face)
+ :group 'diary
+ :version "23.1")
-(defcustom calendar-today-marker (if (and font-lock-mode (display-color-p))
- 'calendar-today
- "=")
+(defcustom calendar-today-marker 'calendar-today
"How to mark today's date in the calendar.
-The value can be either a single-character string or a face.
+The value can be either a single-character string (e.g. \"=\") or a face.
Used by `calendar-mark-today'."
- :type '(choice string face)
- :group 'calendar)
+ :type '(choice (string :tag "Single character string") face)
+ :group 'calendar
+ :version "23.1")
-(defcustom calendar-holiday-marker (if (and font-lock-mode (display-color-p))
- 'holiday
- "*")
+(defcustom calendar-holiday-marker 'holiday
"How to mark notable dates in the calendar.
-The value can be either a single-character string or a face."
- :type '(choice string face)
- :group 'calendar)
+The value can be either a single-character string (e.g. \"*\") or a face."
+ :type '(choice (string :tag "Single character string") face)
+ :group 'holidays
+ :version "23.1")
+
+(define-obsolete-variable-alias 'view-calendar-holidays-initially
+ 'calendar-view-holidays-initially-flag "23.1")
-(defcustom view-calendar-holidays-initially nil
+(defcustom calendar-view-holidays-initially-flag nil
"Non-nil means display holidays for current three month period on entry.
The holidays are displayed in another window when the calendar is first
displayed."
:type 'boolean
:group 'holidays)
-(defcustom mark-holidays-in-calendar nil
+(define-obsolete-variable-alias 'mark-holidays-in-calendar
+ 'calendar-mark-holidays-flag "23.1")
+
+;; FIXME :set
+(defcustom calendar-mark-holidays-flag nil
"Non-nil means mark dates of holidays in the calendar window.
The marking symbol is specified by the variable `calendar-holiday-marker'."
:type 'boolean
:type 'hook
:group 'calendar-hooks)
-(defcustom initial-calendar-window-hook nil
+(define-obsolete-variable-alias 'initial-calendar-window-hook
+ 'calendar-initial-window-hook "23.1")
+
+(defcustom calendar-initial-window-hook nil
"List of functions to be called when the calendar window is created.
Quitting the calendar and re-entering it will cause these functions
to be called again."
:type 'hook
:group 'calendar-hooks)
-(defcustom today-visible-calendar-hook nil
+(define-obsolete-variable-alias 'today-visible-calendar-hook
+ 'calendar-today-visible-hook "23.1")
+
+(defcustom calendar-today-visible-hook nil
"List of functions called whenever the current date is visible.
To mark today's date, add the function `calendar-mark-today'.
To replace the date with asterisks, add the function `calendar-star-date'.
-See also `today-invisible-calendar-hook'.
+See also `calendar-today-invisible-hook'.
In general, be careful about changing characters in the calendar buffer,
since it may cause the movement commands to fail."
:options '(calendar-mark-today calendar-star-date)
:group 'calendar-hooks)
-(defcustom today-invisible-calendar-hook nil
+(define-obsolete-variable-alias 'today-invisible-calendar-hook
+ 'calendar-today-invisible-hook "23.1")
+
+(defcustom calendar-today-invisible-hook nil
"List of functions called whenever the current date is not visible.
-See also `today-visible-calendar-hook'."
+See also `calendar-today-visible-hook'."
:type 'hook
:group 'calendar-hooks)
redisplays the diary for whatever date the cursor is moved to."
:type 'hook
+ :options '(calendar-update-mode-line)
:group 'calendar-hooks)
-;;;###autoload
+(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.
+Can be either a fixed string, or a lisp expression that returns one.
+When this expression is evaluated, DAY, MONTH, and YEAR are
+integers appropriate to the relevant date. For example, to
+display the ISO date:
+
+ (setq calendar-date-echo-text '(format \"ISO date: %s\"
+ (calendar-iso-date-string
+ (list month day year))))
+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))
+ :type '(choice (string :tag "Fixed string")
+ (sexp :value
+ (format "ISO date: %s"
+ (calendar-iso-date-string
+ (list month day year)))))
+ :version "23.1")
+
+
+(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.")
+
+(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)))
+
+(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))
+ (* 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)))
+
+;; 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")
+
+;; FIXME calendar-month-column-width?
+(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")
+
+(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")
+
(defcustom diary-file "~/diary"
"Name of the file in which one's personal diary of dates is kept.
The file's entries are lines beginning with any of the forms
specified by the variable `diary-date-forms', which by default
-uses the forms of `american-date-diary-pattern':
+uses the forms of `diary-american-date-forms':
MONTH/DAY
MONTH/DAY/YEAR
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
-digits (if `abbreviated-calendar-year' is non-nil). MONTHNAME
+digits (if `diary-abbreviated-year-flag' is non-nil). MONTHNAME
and DAYNAME can be spelled in full (as specified by the variables
`calendar-month-name-array' and `calendar-day-name-array'), or
abbreviated (as specified by `calendar-month-abbrev-array' and
DAYNAME entry applies to the appropriate day of the week in every week.
You can customize `diary-date-forms' to your preferred format.
-Three default styles are provided: `american-date-diary-pattern',
-`european-date-diary-pattern', and `iso-date-diary-pattern'.
+Three default styles are provided: `diary-american-date-forms',
+`diary-european-date-forms', and `diary-iso-date-forms'.
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.
causes the diary entry \"Vacation\" to appear from November 1 through
November 10, 1990. See the documentation for the function
-`list-sexp-diary-entries' for more details.
+`diary-list-sexp-entries' for more details.
Diary entries based on the Hebrew, the Islamic and/or the Baha'i
calendar are also possible, but because these are somewhat slow, they
-are ignored unless you set the `nongregorian-diary-listing-hook' and
-the `nongregorian-diary-marking-hook' appropriately. See the
+are ignored unless you set the `diary-nongregorian-listing-hook' and
+the `diary-nongregorian-marking-hook' appropriately. See the
documentation of these hooks for details.
Diary files can contain directives to include the contents of other files; for
-details, see the documentation for the variable `list-diary-entries-hook'."
+details, see the documentation for the variable `diary-list-entries-hook'."
:type 'file
:group 'diary)
:type 'string
:group 'diary)
+(define-obsolete-variable-alias 'hebrew-diary-entry-symbol
+ 'diary-hebrew-entry-symbol "23.1")
+
(defcustom diary-hebrew-entry-symbol "H"
"Symbol indicating a diary entry according to the Hebrew calendar."
:type 'string
:group 'diary)
-(define-obsolete-variable-alias 'hebrew-diary-entry-symbol
- 'diary-hebrew-entry-symbol "23.1")
+(define-obsolete-variable-alias 'islamic-diary-entry-symbol
+ 'diary-islamic-entry-symbol "23.1")
(defcustom diary-islamic-entry-symbol "I"
"Symbol indicating a diary entry according to the Islamic calendar."
:type 'string
:group 'diary)
-(define-obsolete-variable-alias 'islamic-diary-entry-symbol
- 'diary-islamic-entry-symbol "23.1")
+(define-obsolete-variable-alias 'bahai-diary-entry-symbol
+ 'diary-bahai-entry-symbol "23.1")
(defcustom diary-bahai-entry-symbol "B"
"Symbol indicating a diary entry according to the Baha'i calendar."
:type 'string
:group 'diary)
-(define-obsolete-variable-alias 'bahai-diary-entry-symbol
- 'diary-bahai-entry-symbol "23.1")
-
-;;;###autoload
(defcustom european-calendar-style nil
"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
-February 1, 1990. See `european-date-diary-pattern' for the
+February 1, 1990. See `diary-european-date-forms' for the
default European diary date styles.
Setting this variable directly does not take effect (if the
(if value
(calendar-set-date-style 'european)
(calendar-set-date-style 'american)))
- :group 'diary)
+ :group 'calendar)
-;;;###autoload
(make-obsolete-variable 'european-calendar-style 'calendar-date-style "23.1")
-;; Used by various other packages.
-;;;###autoload
+;; If this is autoloaded, c-d-s gets set before any customization of e-c-s.
(defcustom calendar-date-style (if european-calendar-style 'european
'american)
"Your preferred style for writing dates.
:group 'calendar)
;; Next three are provided to aid in setting diary-date-forms.
-(defcustom iso-date-diary-pattern
+;; FIXME move to diary-lib?
+(defcustom diary-iso-date-forms
'((month "[-/]" day "[^-/0-9]")
(year "[-/]" month "[-/]" day "[^0-9]")
- (monthname "-" day "[^-0-9]")
- (year "-" monthname "-" day "[^0-9]")
+ ;; Cannot allow [-/] as separators here, since it would also match
+ ;; the first element (bug#7377).
+ (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,
+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"
+ :version "23.3" ; bug#7377
:type '(repeat (choice (cons :tag "Backup"
:value (backup . nil)
(const backup)
(choice symbol regexp)))))
:group 'diary)
-(defcustom american-date-diary-pattern
+(define-obsolete-variable-alias 'american-date-diary-pattern
+ 'diary-american-date-forms "23.1")
+
+(defcustom diary-american-date-forms
'((month "/" day "[^/0-9]")
(month "/" day "/" year "[^0-9]")
(monthname " *" day "[^,0-9]")
(choice symbol regexp)))))
:group 'diary)
-(defcustom european-date-diary-pattern
+(define-obsolete-variable-alias 'european-date-diary-pattern
+ 'diary-european-date-forms "23.1")
+
+(defcustom diary-european-date-forms
'((day "/" month "[^/0-9]")
(day "/" month "/" year "[^0-9]")
(backup day " *" monthname "\\W+\\<\\([^*0-9]\\|\\([0-9]+[:aApP]\\)\\)")
(defvar diary-font-lock-keywords)
(defcustom diary-date-forms (cond ((eq calendar-date-style 'iso)
- iso-date-diary-pattern)
+ diary-iso-date-forms)
((eq calendar-date-style 'european)
- european-date-diary-pattern)
- (t american-date-diary-pattern))
+ diary-european-date-forms)
+ (t diary-american-date-forms))
"List of pseudo-patterns describing the forms of date used in the diary.
The patterns on the list must be MUTUALLY EXCLUSIVE and should not match
any portion of the diary entry itself, just the date component.
current word of the diary entry, so in no case can the pattern match more than
a portion of the first word of the diary entry.
-For examples of three common styles, see `american-date-diary-pattern',
-`european-date-diary-pattern', and `iso-date-diary-pattern'."
+For examples of three common styles, see `diary-american-date-forms',
+`diary-european-date-forms', and `diary-iso-date-forms'."
:type '(repeat (choice (cons :tag "Backup"
:value (backup . nil)
(const backup)
(repeat (list :inline t :format "%v"
(symbol :tag "Keyword")
(choice symbol regexp)))))
+ :set-after '(calendar-date-style diary-iso-date-forms
+ diary-european-date-forms
+ diary-american-date-forms)
:initialize 'custom-initialize-default
:set (lambda (symbol value)
(unless (equal value (eval symbol))
:group 'diary)
;; Next three are provided to aid in setting calendar-date-display-form.
-(defcustom iso-calendar-display-form '((format "%s-%.2d-%.2d" year
+(defcustom calendar-iso-date-display-form '((format "%s-%.2d-%.2d" year
(string-to-number month)
(string-to-number day)))
"Pseudo-pattern governing the way a date appears in the ISO style.
:version "23.1"
:group 'calendar)
-(defcustom european-calendar-display-form
+(define-obsolete-variable-alias 'european-calendar-display-form
+ 'calendar-european-date-display-form "23.1")
+
+(defcustom calendar-european-date-display-form
'((if dayname (concat dayname ", ")) day " " monthname " " year)
"Pseudo-pattern governing the way a date appears in the European style.
Normally you should not customize this, but `calendar-date-display-form'
:type 'sexp
:group 'calendar)
-(defcustom american-calendar-display-form
+(define-obsolete-variable-alias 'american-calendar-display-form
+ 'calendar-american-date-display-form "23.1")
+
+(defcustom calendar-american-date-display-form
'((if dayname (concat dayname ", ")) monthname " " day ", " year)
"Pseudo-pattern governing the way a date appears in the American style.
Normally you should not customize this, but `calendar-date-display-form'
:type 'sexp
:group 'calendar)
-(defcustom calendar-date-display-form (cond ((eq calendar-date-style 'iso)
- iso-calendar-display-form)
- ((eq calendar-date-style 'european)
- european-calendar-display-form)
- (t american-calendar-display-form))
+(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))
"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',
'((format \"%9s, %9s %2s, %4s\" dayname monthname day year))
would give the usual American style in fixed-length fields. The variables
-`iso-calendar-display-form', `european-calendar-display-form', and
-`american-calendar-display-form' provide some defaults for three common
+`calendar-iso-date-display-form', `calendar-european-date-display-form', and
+`calendar-american-date-display-form' provide some defaults for three common
styles."
:type 'sexp
+ :set-after '(calendar-date-style calendar-iso-date-display-form
+ calendar-european-date-display-form
+ calendar-american-date-display-form)
:group 'calendar)
(defun calendar-set-date-style (style)
(setq style 'american))
(setq calendar-date-style style
calendar-date-display-form
- (symbol-value (intern-soft (format "%s-calendar-display-form" style)))
+ (symbol-value (intern-soft
+ (format "calendar-%s-date-display-form" style)))
diary-date-forms
- (symbol-value (intern-soft (format "%s-date-diary-pattern" style))))
- (update-calendar-mode-line))
+ (symbol-value (intern-soft (format "diary-%s-date-forms" style))))
+ (calendar-update-mode-line))
(defun european-calendar ()
"Set the interpretation and display of dates to the European style."
(make-obsolete 'american-calendar 'calendar-set-date-style "23.1")
-;; FIXME move to diary-lib and adjust appt.
-;; Add appt-make-list as an option?
-(defcustom diary-hook nil
- "List of functions called after the display of the diary.
-Can be used for appointment notification."
- :type 'hook
- :group 'diary)
-
-(defcustom diary-display-hook nil
- "List of functions that handle the display of the diary.
-If nil (the default), `simple-diary-display' is used. Use
-`ignore' for no diary display.
-
-Ordinarily, this just displays the diary buffer (with holidays
-indicated in the mode line), if there are any relevant entries.
-At the time these functions are called, the variable
-`diary-entries-list' is a list, in order by date, of all relevant
-diary entries in the form of ((MONTH DAY YEAR) STRING), where
-string is the diary entry for the given date. This can be used,
-for example, a different buffer for display (perhaps combined
-with holidays), or produce hard copy output.
-
-A function `fancy-diary-display' is provided for use with this
-hook; this function prepares a special noneditable diary buffer
-with the relevant diary entries that has neat day-by-day
-arrangement with headings. The fancy diary buffer will show the
-holidays unless the variable `holidays-in-diary-buffer' is set to
-nil. Ordinarily, the fancy diary buffer will not show days for
-which there are no diary entries, even if that day is a holiday;
-if you want such days to be shown in the fancy diary buffer, set
-the variable `diary-list-include-blanks' non-nil."
- :type 'hook
- :options '(fancy-diary-display)
- :initialize 'custom-initialize-default
- :set 'diary-set-maybe-redraw
- :group 'diary)
+(define-obsolete-variable-alias 'holidays-in-diary-buffer
+ 'diary-show-holidays-flag "23.1")
-(defcustom holidays-in-diary-buffer t
+(defcustom diary-show-holidays-flag t
"Non-nil means include holidays in the diary display.
The holidays appear in the mode line of the diary buffer, or in the
fancy diary buffer next to the date. This slows down the diary functions
:type 'boolean
:group 'calendar)
-;; The various holiday variables are autoloaded because people
-;; are used to using them to set calendar-holidays without having to
-;; explicitly load this file.
-
-;;;###autoload
-(defcustom general-holidays
- '((holiday-fixed 1 1 "New Year's Day")
- (holiday-float 1 1 3 "Martin Luther King Day")
- (holiday-fixed 2 2 "Groundhog Day")
- (holiday-fixed 2 14 "Valentine's Day")
- (holiday-float 2 1 3 "President's Day")
- (holiday-fixed 3 17 "St. Patrick's Day")
- (holiday-fixed 4 1 "April Fools' Day")
- (holiday-float 5 0 2 "Mother's Day")
- (holiday-float 5 1 -1 "Memorial Day")
- (holiday-fixed 6 14 "Flag Day")
- (holiday-float 6 0 3 "Father's Day")
- (holiday-fixed 7 4 "Independence Day")
- (holiday-float 9 1 1 "Labor Day")
- (holiday-float 10 1 2 "Columbus Day")
- (holiday-fixed 10 31 "Halloween")
- (holiday-fixed 11 11 "Veteran's Day")
- (holiday-float 11 4 4 "Thanksgiving"))
- "General holidays. Default value is for the United States.
-See the documentation for `calendar-holidays' for details."
- :type 'sexp
- :group 'holidays)
-;;;###autoload
-(put 'general-holidays 'risky-local-variable t)
-
-;;;###autoload
-(defcustom oriental-holidays
- '((holiday-chinese-new-year))
- "Oriental holidays.
-See the documentation for `calendar-holidays' for details."
- :type 'sexp
- :group 'holidays)
-;;;###autoload
-(put 'oriental-holidays 'risky-local-variable t)
-
-;;;###autoload
-(defcustom local-holidays nil
- "Local holidays.
-See the documentation for `calendar-holidays' for details."
- :type 'sexp
- :group 'holidays)
-;;;###autoload
-(put 'local-holidays 'risky-local-variable t)
-
-;;;###autoload
-(defcustom other-holidays nil
- "User defined holidays.
-See the documentation for `calendar-holidays' for details."
- :type 'sexp
- :group 'holidays)
-;;;###autoload
-(put 'other-holidays 'risky-local-variable t)
+(define-obsolete-variable-alias 'all-hebrew-calendar-holidays
+ 'calendar-hebrew-all-holidays-flag "23.1")
(defcustom calendar-hebrew-all-holidays-flag nil
"If nil, show only major holidays from the Hebrew calendar.
:type 'boolean
:group 'holidays)
-(define-obsolete-variable-alias 'all-hebrew-calendar-holidays
- 'calendar-hebrew-all-holidays-flag "23.1")
-
-;;;###autoload
-(defvar hebrew-holidays-1
- '((holiday-rosh-hashanah-etc)
- (if calendar-hebrew-all-holidays-flag
- (holiday-julian
- 11
- (let ((m displayed-month)
- (y displayed-year)
- year)
- (increment-calendar-month m y -1)
- (setq year (extract-calendar-year
- (calendar-julian-from-absolute
- (calendar-absolute-from-gregorian (list m 1 y)))))
- (if (zerop (% (1+ year) 4))
- 22
- 21)) "\"Tal Umatar\" (evening)")))
- "Component of the default value of `hebrew-holidays'.")
-;;;###autoload
-(put 'hebrew-holidays-1 'risky-local-variable t)
-(make-obsolete-variable 'hebrew-holidays-1 'hebrew-holidays "23.1")
-
-;;;###autoload
-(defvar hebrew-holidays-2
- '((holiday-hanukkah) ; respects calendar-hebrew-all-holidays-flag
- (if calendar-hebrew-all-holidays-flag
- (holiday-hebrew
- 10
- (let ((h-year (extract-calendar-year
- (calendar-hebrew-from-absolute
- (calendar-absolute-from-gregorian
- (list displayed-month 28 displayed-year))))))
- (if (= 6 (% (calendar-absolute-from-hebrew (list 10 10 h-year))
- 7))
- 11 10))
- "Tzom Teveth"))
- (if calendar-hebrew-all-holidays-flag
- (holiday-hebrew 11 15 "Tu B'Shevat")))
- "Component of the default value of `hebrew-holidays'.")
-;;;###autoload
-(put 'hebrew-holidays-2 'risky-local-variable t)
-(make-obsolete-variable 'hebrew-holidays-2 'hebrew-holidays "23.1")
-
-;;;###autoload
-(defvar hebrew-holidays-3
- '((if calendar-hebrew-all-holidays-flag
- (holiday-hebrew
- 11
- (let* ((m displayed-month)
- (y displayed-year)
- (h-year (progn
- (increment-calendar-month m y 1)
- (extract-calendar-year
- (calendar-hebrew-from-absolute
- (calendar-absolute-from-gregorian
- (list m (calendar-last-day-of-month m y) y))))))
- (s-s
- (calendar-hebrew-from-absolute
- (if (= 6
- (% (calendar-absolute-from-hebrew
- (list 7 1 h-year))
- 7))
- (calendar-dayname-on-or-before
- 6 (calendar-absolute-from-hebrew
- (list 11 17 h-year)))
- (calendar-dayname-on-or-before
- 6 (calendar-absolute-from-hebrew
- (list 11 16 h-year))))))
- (day (extract-calendar-day s-s)))
- day)
- "Shabbat Shirah")))
- "Component of the default value of `hebrew-holidays'.")
-;;;###autoload
-(put 'hebrew-holidays-3 'risky-local-variable t)
-(make-obsolete-variable 'hebrew-holidays-3 'hebrew-holidays "23.1")
-
-;;;###autoload
-(defvar hebrew-holidays-4
- '((holiday-passover-etc)
- (and calendar-hebrew-all-holidays-flag
- (let* ((m displayed-month)
- (y displayed-year)
- (year (progn
- (increment-calendar-month m y -1)
- (extract-calendar-year
- (calendar-julian-from-absolute
- (calendar-absolute-from-gregorian (list m 1 y)))))))
- (= 21 (% year 28)))
- (holiday-julian 3 26 "Kiddush HaHamah"))
- (if calendar-hebrew-all-holidays-flag
- (holiday-tisha-b-av-etc)))
- "Component of the default value of `hebrew-holidays'.")
-;;;###autoload
-(put 'hebrew-holidays-4 'risky-local-variable t)
-(make-obsolete-variable 'hebrew-holidays-4 'hebrew-holidays "23.1")
-
-;;;###autoload
-(defcustom hebrew-holidays
- '((holiday-passover-etc)
- (holiday-rosh-hashanah-etc)
- (holiday-hanukkah)
- (if calendar-hebrew-all-holidays-flag
- (append
- (holiday-tisha-b-av-etc)
- (holiday-hebrew-misc))))
- "Jewish holidays.
-See the documentation for `calendar-holidays' for details."
- :type 'sexp
- :version "23.1" ; removed dependency on hebrew-holidays-N
- :group 'holidays)
-;;;###autoload
-(put 'hebrew-holidays 'risky-local-variable t)
+(define-obsolete-variable-alias 'all-christian-calendar-holidays
+ 'calendar-christian-all-holidays-flag "23.1")
(defcustom calendar-christian-all-holidays-flag nil
"If nil, show only major holidays from the Christian calendar.
:type 'boolean
:group 'holidays)
-(define-obsolete-variable-alias 'all-christian-calendar-holidays
- 'calendar-christian-all-holidays-flag "23.1")
-
-;;;###autoload
-(defcustom christian-holidays
- '((holiday-easter-etc) ; respects calendar-christian-all-holidays-flag
- (holiday-fixed 12 25 "Christmas")
- (if calendar-christian-all-holidays-flag
- (append
- (holiday-fixed 1 6 "Epiphany")
- (holiday-julian 12 25 "Eastern Orthodox Christmas")
- (holiday-greek-orthodox-easter)
- (holiday-fixed 8 15 "Assumption")
- (holiday-advent 0 "Advent"))))
- "Christian holidays.
-See the documentation for `calendar-holidays' for details."
- :type 'sexp
- :group 'holidays)
-;;;###autoload
-(put 'christian-holidays 'risky-local-variable t)
+(define-obsolete-variable-alias 'all-islamic-calendar-holidays
+ 'calendar-islamic-all-holidays-flag "23.1")
(defcustom calendar-islamic-all-holidays-flag nil
"If nil, show only major holidays from the Islamic calendar.
:type 'boolean
:group 'holidays)
-(define-obsolete-variable-alias 'all-islamic-calendar-holidays
- 'calendar-islamic-all-holidays-flag "23.1")
-
-;;;###autoload
-(defcustom islamic-holidays
- '((holiday-islamic-new-year)
- (holiday-islamic 9 1 "Ramadan Begins")
- (if calendar-islamic-all-holidays-flag
- (append
- (holiday-islamic 1 10 "Ashura")
- (holiday-islamic 3 12 "Mulad-al-Nabi")
- (holiday-islamic 7 26 "Shab-e-Mi'raj")
- (holiday-islamic 8 15 "Shab-e-Bara't")
- (holiday-islamic 9 27 "Shab-e Qadr")
- (holiday-islamic 10 1 "Id-al-Fitr")
- (holiday-islamic 12 10 "Id-al-Adha"))))
- "Islamic holidays.
-See the documentation for `calendar-holidays' for details."
- :type 'sexp
- :group 'holidays)
-;;;###autoload
-(put 'islamic-holidays 'risky-local-variable t)
+(define-obsolete-variable-alias 'all-bahai-calendar-holidays
+ 'calendar-bahai-all-holidays-flag "23.1")
(defcustom calendar-bahai-all-holidays-flag nil
"If nil, show only major holidays from the Baha'i calendar.
:type 'boolean
:group 'holidays)
-(define-obsolete-variable-alias 'all-bahai-calendar-holidays
- 'calendar-bahai-all-holidays-flag "23.1")
-
-;;;###autoload
-(defcustom bahai-holidays
- '((holiday-bahai-new-year)
- (holiday-bahai-ridvan) ; respects calendar-bahai-all-holidays-flag
- (holiday-fixed 5 23 "Declaration of the Bab")
- (holiday-fixed 5 29 "Ascension of Baha'u'llah")
- (holiday-fixed 7 9 "Martyrdom of the Bab")
- (holiday-fixed 10 20 "Birth of the Bab")
- (holiday-fixed 11 12 "Birth of Baha'u'llah")
- (if calendar-bahai-all-holidays-flag
- (append
- (holiday-fixed 11 26 "Day of the Covenant")
- (holiday-fixed 11 28 "Ascension of `Abdu'l-Baha"))))
- "Baha'i holidays.
-See the documentation for `calendar-holidays' for details."
- :type 'sexp
- :group 'holidays)
-;;;###autoload
-(put 'bahai-holidays 'risky-local-variable t)
-
-;;;###autoload
-(defcustom solar-holidays
- '((solar-equinoxes-solstices)
- (holiday-sexp calendar-daylight-savings-starts
- (format "Daylight Saving Time Begins %s"
- (solar-time-string
- (/ calendar-daylight-savings-starts-time (float 60))
- calendar-standard-time-zone-name)))
- (holiday-sexp calendar-daylight-savings-ends
- (format "Daylight Saving Time Ends %s"
- (solar-time-string
- (/ calendar-daylight-savings-ends-time (float 60))
- calendar-daylight-time-zone-name))))
- "Sun-related holidays.
-See the documentation for `calendar-holidays' for details."
- :type 'sexp
+(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)
-;;;###autoload
-(put 'solar-holidays 'risky-local-variable t)
-
-;;;###autoload
-(defcustom calendar-holidays
- (append general-holidays local-holidays other-holidays
- christian-holidays hebrew-holidays islamic-holidays
- bahai-holidays oriental-holidays solar-holidays)
- "List of notable days for the command \\[holidays].
-
-Additional holidays are easy to add to the list, just put them in the
-list `other-holidays' in your .emacs file. Similarly, by setting any
-of `general-holidays', `local-holidays' `christian-holidays',
-`hebrew-holidays', `islamic-holidays', `bahai-holidays',
-`oriental-holidays', or `solar-holidays' to nil in your .emacs file,
-you can eliminate unwanted categories of holidays.
-
-The aforementioned variables control the holiday choices offered
-by the function `holiday-list' when it is called interactively.
-
-They also initialize the default value of `calendar-holidays',
-which is the default list of holidays used by the function
-`holiday-list' in the non-interactive case. Note that these
-variables have no effect on `calendar-holidays' after it has been
-set (e.g. after the calendar is loaded). In that case, customize
-`calendar-holidays' directly.
-
-The intention is that (in the US) `local-holidays' be set in
-site-init.el and `other-holidays' be set by the user.
-
-Entries on the list are expressions that return (possibly empty) lists of
-items of the form ((month day year) string) of a holiday in the
-three-month period centered around `displayed-month' of `displayed-year'.
-Several basic functions are provided for this purpose:
-
- (holiday-fixed MONTH DAY STRING) is a fixed date on the Gregorian calendar
- (holiday-float MONTH DAYNAME K STRING &optional day) is the Kth DAYNAME in
- MONTH on the Gregorian calendar (0 for Sunday,
- etc.); K<0 means count back from the end of the
- month. An optional parameter DAY means the Kth
- DAYNAME after/before MONTH DAY.
- (holiday-hebrew MONTH DAY STRING) a fixed date on the Hebrew calendar
- (holiday-islamic MONTH DAY STRING) a fixed date on the Islamic calendar
- (holiday-bahai MONTH DAY STRING) a fixed date on the Baha'i calendar
- (holiday-julian MONTH DAY STRING) a fixed date on the Julian calendar
- (holiday-sexp SEXP STRING) SEXP is a Gregorian-date-valued expression
- in the variable `year'; if it evaluates to
- a visible date, that's the holiday; if it
- evaluates to nil, there's no holiday. STRING
- is an expression in the variable `date'.
-
-For example, to add Bastille Day, celebrated in France on July 14, add
-
- (holiday-fixed 7 14 \"Bastille Day\")
-
-to the list. To add Hurricane Supplication Day, celebrated in the Virgin
-Islands on the fourth Monday in August, add
-
- (holiday-float 8 1 4 \"Hurricane Supplication Day\")
-
-to the list (the last Monday would be specified with `-1' instead of `4').
-To add the last day of Hanukkah to the list, use
-
- (holiday-hebrew 10 2 \"Last day of Hanukkah\")
-
-since the Hebrew months are numbered with 1 starting from Nisan.
-To add the Islamic feast celebrating Mohammed's birthday, use
-
- (holiday-islamic 3 12 \"Mohammed's Birthday\")
-
-since the Islamic months are numbered from 1 starting with Muharram.
-To add an entry for the Baha'i festival of Ridvan, use
-
- (holiday-bahai 2 13 \"Festival of Ridvan\")
-
-since the Baha'i months are numbered from 1 starting with Baha.
-To add Thomas Jefferson's birthday, April 2, 1743 (Julian), use
-
- (holiday-julian 4 2 \"Jefferson's Birthday\")
-
-To include a holiday conditionally, use the sexp form or a conditional. For
-example, to include American presidential elections, which occur on the first
-Tuesday after the first Monday in November of years divisible by 4, add
-
- (holiday-sexp
- '(if (zerop (% year 4))
- (calendar-gregorian-from-absolute
- (1+ (calendar-dayname-on-or-before
- 1 (+ 6 (calendar-absolute-from-gregorian
- (list 11 1 year)))))))
- \"US Presidential Election\")
-
-or
-
- (if (zerop (% displayed-year 4))
- (holiday-fixed 11
- (extract-calendar-day
- (calendar-gregorian-from-absolute
- (1+ (calendar-dayname-on-or-before
- 1 (+ 6 (calendar-absolute-from-gregorian
- (list 11 1 displayed-year)))))))
- \"US Presidential Election\"))
-
-to the list. To include the phases of the moon, add
-
- (lunar-phases)
-to the holiday list, where `lunar-phases' is an Emacs-Lisp function that
-you've written to return a (possibly empty) list of the relevant VISIBLE dates
-with descriptive strings such as
+;;; End of user options.
- (((2 6 1989) \"New Moon\") ((2 12 1989) \"First Quarter Moon\") ... )."
- :type 'sexp
- :group 'holidays)
-;;;###autoload
-(put 'calendar-holidays 'risky-local-variable t)
+(calendar-recompute-layout-variables)
-;;; End of user options.
+(defconst calendar-first-date-row 3
+ "First row in the calendar with actual dates.")
(defconst calendar-buffer "*Calendar*"
"Name of the buffer used for the calendar.")
(defconst holiday-buffer "*Holidays*"
"Name of the buffer used for the displaying the holidays.")
-(defconst fancy-diary-buffer "*Fancy Diary Entries*"
+(defconst diary-fancy-buffer "*Fancy Diary Entries*"
"Name of the buffer used for the optional fancy display of the diary.")
-(defconst other-calendars-buffer "*Other Calendars*"
+(define-obsolete-variable-alias 'fancy-diary-buffer 'diary-fancy-buffer "23.1")
+
+(defconst calendar-other-calendars-buffer "*Other Calendars*"
"Name of the buffer used for the display of date on other calendars.")
(defconst lunar-phases-buffer "*Phases of Moon*"
"Name of the buffer used for the lunar phases.")
-(defconst cal-hebrew-yahrzeit-buffer "*Yahrzeits*"
+(defconst solar-sunrises-buffer "*Sunrise/Sunset Times*"
+ "Name of buffer used for sunrise/sunset times.")
+
+(defconst calendar-hebrew-yahrzeit-buffer "*Yahrzeits*"
"Name of the buffer used by `list-yahrzeit-dates'.")
-(defmacro increment-calendar-month (mon yr n &optional nmonths)
+(defmacro calendar-increment-month (mon yr n &optional nmonths)
"Increment the variables MON and YR by N months.
Forward if N is positive or backward if N is negative.
A negative YR is interpreted as BC; -1 being 1 BC, and so on.
(and (< macro-y 0) (> ,mon 1) (setq ,yr (1- ,yr)))
(if (< ,yr 1) (setq ,yr (1- ,yr))))) ; 0 AD -> -1 BC, etc
+(define-obsolete-function-alias 'increment-calendar-month
+ 'calendar-increment-month "23.1")
+
(defvar displayed-month)
(defvar displayed-year)
-(defun calendar-increment-month (n &optional mon yr)
+(defun calendar-increment-month-cons (n &optional mon yr)
"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))
(unless yr (setq yr displayed-year))
- (increment-calendar-month mon yr n)
+ (calendar-increment-month mon yr n)
(cons mon yr))
(defmacro calendar-for-loop (var from init to final do &rest body)
;; fancy diary display, for a moderately complex diary file, with functions
;; used instead of macros. There were a total of 10000 such calls:
;;
-;; 1934 extract-calendar-month
-;; 1852 extract-calendar-year
-;; 1819 extract-calendar-day
+;; 1934 calendar-extract-month
+;; 1852 calendar-extract-year
+;; 1819 calendar-extract-day
;; 845 calendar-leap-year-p
;; 837 calendar-day-number
;; 775 calendar-absolute-from-gregorian
;; 346 calendar-last-day-of-month
-;; 286 hebrew-calendar-last-day-of-month
-;; 188 hebrew-calendar-leap-year-p
-;; 180 hebrew-calendar-elapsed-days
-;; 163 hebrew-calendar-last-month-of-year
+;; 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
;; 66 calendar-date-compare
-;; 65 hebrew-calendar-days-in-year
+;; 65 calendar-hebrew-days-in-year
;; 60 calendar-julian-to-absolute
-;; 50 calendar-absolute-from-hebrew
+;; 50 calendar-hebrew-to-absolute
;; 43 calendar-date-equal
;; 38 calendar-gregorian-from-absolute
;; .
;; The use of these seven macros eliminates the overhead of 92% of the function
;; calls; it's faster this way.
-(defsubst extract-calendar-month (date)
+(defsubst calendar-extract-month (date)
"Extract the month part of DATE which has the form (month day year)."
(car date))
+(define-obsolete-function-alias 'extract-calendar-month
+ 'calendar-extract-month "23.1")
+
;; Note gives wrong answer for result of (calendar-read-date 'noday),
;; but that is only used by `calendar-other-month'.
-(defsubst extract-calendar-day (date)
+(defsubst calendar-extract-day (date)
"Extract the day part of DATE which has the form (month day year)."
(cadr date))
-(defsubst extract-calendar-year (date)
+(define-obsolete-function-alias 'extract-calendar-day
+ 'calendar-extract-day "23.1")
+
+(defsubst calendar-extract-year (date)
"Extract the year part of DATE which has the form (month day year)."
(nth 2 date))
+(define-obsolete-function-alias 'extract-calendar-year
+ 'calendar-extract-year "23.1")
+
(defsubst calendar-leap-year-p (year)
"Return t if YEAR is a Gregorian leap year.
A negative year is interpreted as BC; -1 being 1 BC, and so on."
"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."
- (let* ((month (extract-calendar-month date))
- (day (extract-calendar-day date))
- (year (extract-calendar-year date))
+ (let* ((month (calendar-extract-month date))
+ (day (calendar-extract-day date))
+ (year (calendar-extract-year date))
(day-of-year (+ day (* 31 (1- month)))))
(when (> month 2)
(setq day-of-year (- day-of-year (/ (+ 23 (* 4 month)) 10)))
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."
- (let ((year (extract-calendar-year date))
+ (let ((year (calendar-extract-year date))
offset-years)
(cond ((zerop year)
(error "There was no year zero"))
Displays the calendar in a separate window, or optionally in a
separate frame, depending on the value of `calendar-setup'.
-If `view-diary-entries-initially' is non-nil, also displays the
+If `calendar-view-diary-initially-flag' is non-nil, also displays the
diary entries for the current date (or however many days
-`number-of-diary-entries' specifies). This variable can be
+`diary-number-of-entries' specifies). This variable can be
overridden by `calendar-setup'. As well as being displayed,
diary entries can also be marked on the calendar (see
-`mark-diary-entries-in-calendar').
+`calendar-mark-diary-entries-flag').
Runs the following hooks:
`calendar-load-hook' - after loading calendar.el
-`today-visible-calendar-hook', `today-invisible-calendar-hook' - after
+`calendar-today-visible-hook', `calendar-today-invisible-hook' - after
generating a calendar, if today's date is visible or not, respectively
-`initial-calendar-window-hook' - after first creating a calendar
+`calendar-initial-window-hook' - after first creating a calendar
This function is suitable for execution in a .emacs file."
(interactive "P")
and year, else uses the current date. If NODISPLAY is non-nil, don't
display the generated calendar."
(interactive "P")
- (set-buffer (get-buffer-create calendar-buffer))
- (calendar-mode)
- (let* ((pop-up-windows t)
- (split-height-threshold 1000)
- (date (if arg (calendar-read-date t)
- (calendar-current-date)))
- (month (extract-calendar-month date))
- (year (extract-calendar-year date)))
- (increment-calendar-month month year (- calendar-offset))
- ;; Display the buffer before calling generate-calendar-window so that it
- ;; can get a chance to adjust the window sizes to the frame size.
- (or nodisplay (pop-to-buffer calendar-buffer))
- (generate-calendar-window month year)
- (if (and view-diary-entries-initially (calendar-date-is-visible-p date))
- (diary-view-entries)))
- (if view-calendar-holidays-initially
+ (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)
+ (split-width-threshold calendar-split-width-threshold)
+ (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))))
+ (if calendar-view-holidays-initially-flag
(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?
(calendar-list-holidays)))
- (run-hooks 'initial-calendar-window-hook))
+ (run-hooks 'calendar-initial-window-hook))
-(defun generate-calendar-window (&optional mon yr)
+(defun calendar-generate-window (&optional mon yr)
"Generate the calendar window for the current date.
Optional integers MON and YR are used instead of today's date."
(let* ((inhibit-read-only t)
(today (calendar-current-date))
- (month (extract-calendar-month today))
- (day (extract-calendar-day today))
- (year (extract-calendar-year today))
+ (month (calendar-extract-month today))
+ (day (calendar-extract-day today))
+ (year (calendar-extract-year today))
(today-visible (or (not mon)
(<= (abs (calendar-interval mon yr month year)) 1)))
(day-in-week (calendar-day-of-week today))
(in-calendar-window (eq (window-buffer (selected-window))
(get-buffer calendar-buffer))))
- (generate-calendar (or mon month) (or yr year))
- (update-calendar-mode-line)
+ (calendar-generate (or mon month) (or yr year))
+ (calendar-update-mode-line)
(calendar-cursor-to-visible-date
(if today-visible today (list displayed-month 1 displayed-year)))
(set-buffer-modified-p nil)
;; Don't do any window-related stuff if we weren't called from a
;; window displaying the calendar.
(when in-calendar-window
- (if (or (one-window-p t) (not (window-full-width-p)))
+ ;; 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)))
;; Don't mess with the window size, but ensure that the first
;; line is fully visible.
(set-window-vscroll nil 0)
(sit-for 0))
(and (bound-and-true-p font-lock-mode)
(font-lock-fontify-buffer))
- (and mark-holidays-in-calendar
+ (and calendar-mark-holidays-flag
;;; (calendar-date-is-valid-p today) ; useful for BC dates
(calendar-mark-holidays)
(and in-calendar-window (sit-for 0)))
(unwind-protect
- (if mark-diary-entries-in-calendar (mark-diary-entries))
+ (if calendar-mark-diary-entries-flag (diary-mark-entries))
(if today-visible
- (run-hooks 'today-visible-calendar-hook)
- (run-hooks 'today-invisible-calendar-hook)))))
+ (run-hooks 'calendar-today-visible-hook)
+ (run-hooks 'calendar-today-invisible-hook)))))
-(defun generate-calendar (month year)
+(defun calendar-generate (month year)
"Generate a three-month Gregorian calendar centered around MONTH, YEAR."
;; 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
(setq displayed-month month
displayed-year year)
(erase-buffer)
- (increment-calendar-month month year -1)
+ (calendar-increment-month month year -1)
(dotimes (i 3)
- (generate-calendar-month month year (+ 5 (* 25 i)))
- (increment-calendar-month month year 1)))
-
-(defun generate-calendar-month (month year indent)
+ (calendar-generate-month month year
+ (+ calendar-left-margin
+ (* calendar-month-width i)))
+ (calendar-increment-month month year 1)))
+
+(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")))
+
+(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)))
+
+(defun calendar-generate-month (month year indent)
"Produce a calendar for MONTH, YEAR on the Gregorian calendar.
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
calendar-week-start-day)
7))
(last (calendar-last-day-of-month month year))
+ (trunc (min calendar-intermonth-spacing
+ (1- calendar-left-margin)))
+ (day 1)
string)
(goto-char (point-min))
- (calendar-insert-indented
+ (calendar-move-to-column indent)
+ (insert
(calendar-string-spread
- (list (format "%s %d" (calendar-month-name month) year)) ?\s 20)
- indent t)
- (calendar-insert-indented "" indent) ; go to proper spot
+ (list (format "%s %d" (calendar-month-name month) year))
+ ?\s calendar-month-digit-width))
+ (calendar-ensure-newline)
+ (calendar-insert-at-column indent calendar-intermonth-header trunc)
;; Use the first two characters of each day to head the columns.
(dotimes (i 7)
(insert
(setq string
(calendar-day-name (mod (+ calendar-week-start-day i) 7) nil t))
(if enable-multibyte-characters
- (truncate-string-to-width string 2)
- (substring string 0 2)))
- " "))
- (calendar-insert-indented "" 0 t) ; force onto following line
- (calendar-insert-indented "" indent) ; go to proper spot
+ (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)
+ (calendar-insert-at-column indent calendar-intermonth-text trunc)
;; Add blank days before the first of the month.
- (dotimes (idummy blank-days) (insert " "))
+ (insert (make-string (* blank-days calendar-column-width) ?\s))
;; Put in the days of the month.
(dotimes (i last)
- (insert (format "%2d " (1+ i)))
- (add-text-properties
- (- (point) 3) (1- (point))
- '(mouse-face highlight
- help-echo "mouse-2: menu of operations for this date"))
- (and (zerop (mod (+ i 1 blank-days) 7))
- (/= i (1- last))
- (calendar-insert-indented "" 0 t) ; force onto following line
- (calendar-insert-indented "" indent))))) ; go to proper spot
-
-(defun calendar-insert-indented (string indent &optional newline)
- "Insert STRING at column INDENT.
-If the optional parameter NEWLINE is non-nil, leave point at start of next
-line, inserting a newline if there was no next line; otherwise, leave point
-after the inserted text. Returns t."
- ;; Try to move to that column.
- (move-to-column indent)
- ;; If line is too short, indent out to that column.
- (if (< (current-column) indent)
- (indent-to indent))
- (insert string)
- ;; Advance to next line, if requested.
- (when newline
- (end-of-line)
- (if (eobp)
- (newline)
- (forward-line 1)))
- t)
-
-(defun redraw-calendar ()
+ (setq day (1+ i))
+ ;; TODO should numbers be left-justified, centered...?
+ (insert (format (format "%%%dd%%s" calendar-day-digit-width) day
+ (make-string
+ (- calendar-column-width calendar-day-digit-width) ?\s)))
+ ;; 'date property prevents intermonth text confusing re-searches.
+ ;; (Tried intangible, it did not really work.)
+ (set-text-properties
+ (- (point) (1+ calendar-day-digit-width)) (1- (point))
+ `(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)))))
+
+(defun calendar-redraw ()
"Redraw the calendar display, if `calendar-buffer' is live."
(interactive)
(if (get-buffer calendar-buffer)
(with-current-buffer calendar-buffer
(let ((cursor-date (calendar-cursor-to-nearest-date)))
- (generate-calendar-window displayed-month displayed-year)
+ (calendar-generate-window displayed-month displayed-year)
(calendar-cursor-to-visible-date cursor-date)))))
(defvar calendar-mode-map
(define-key map "gD" 'calendar-goto-day-of-year)
(define-key map "gj" 'calendar-julian-goto-date)
(define-key map "ga" 'calendar-astro-goto-day-number)
- (define-key map "gh" 'calendar-goto-hebrew-date)
+ (define-key map "gh" 'calendar-hebrew-goto-date)
(define-key map "gi" 'calendar-islamic-goto-date)
(define-key map "gb" 'calendar-bahai-goto-date)
- (define-key map "gC" 'calendar-goto-chinese-date)
+ (define-key map "gC" 'calendar-chinese-goto-date)
(define-key map "gk" 'calendar-coptic-goto-date)
(define-key map "ge" 'calendar-ethiopic-goto-date)
(define-key map "gp" 'calendar-persian-goto-date)
(define-key map "Aa" 'appt-add)
(define-key map "Ad" 'appt-delete)
(define-key map "S" 'calendar-sunrise-sunset)
- (define-key map "M" 'calendar-phases-of-moon)
+ (define-key map "M" 'calendar-lunar-phases)
(define-key map " " 'scroll-other-window)
- (define-key map (kbd "DEL") 'scroll-other-window-down)
- (define-key map "\C-c\C-l" 'redraw-calendar)
+ (define-key map "\d" 'scroll-other-window-down)
+ (define-key map "\C-c\C-l" 'calendar-redraw)
(define-key map "." 'calendar-goto-today)
(define-key map "o" 'calendar-other-month)
- (define-key map "q" 'exit-calendar)
+ (define-key map "q" 'calendar-exit)
(define-key map "a" 'calendar-list-holidays)
(define-key map "h" 'calendar-cursor-holidays)
(define-key map "x" 'calendar-mark-holidays)
(define-key map "u" 'calendar-unmark)
- (define-key map "m" 'mark-diary-entries)
+ (define-key map "m" 'diary-mark-entries)
(define-key map "d" 'diary-view-entries)
- (define-key map "D" 'view-other-diary-entries)
+ (define-key map "D" 'diary-view-other-diary-entries)
(define-key map "s" 'diary-show-all-entries)
(define-key map "pd" 'calendar-print-day-of-year)
- (define-key map "pC" 'calendar-print-chinese-date)
+ (define-key map "pC" 'calendar-chinese-print-date)
(define-key map "pk" 'calendar-coptic-print-date)
(define-key map "pe" 'calendar-ethiopic-print-date)
(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)
- (define-key map "ph" 'calendar-print-hebrew-date)
+ (define-key map "ph" 'calendar-hebrew-print-date)
(define-key map "pi" 'calendar-islamic-print-date)
(define-key map "pb" 'calendar-bahai-print-date)
(define-key map "pf" 'calendar-french-print-date)
(define-key map "pm" 'calendar-mayan-print-date)
(define-key map "po" 'calendar-print-other-dates)
- (define-key map "id" 'insert-diary-entry)
- (define-key map "iw" 'insert-weekly-diary-entry)
- (define-key map "im" 'insert-monthly-diary-entry)
- (define-key map "iy" 'insert-yearly-diary-entry)
- (define-key map "ia" 'insert-anniversary-diary-entry)
- (define-key map "ib" 'insert-block-diary-entry)
- (define-key map "ic" 'insert-cyclic-diary-entry)
- (define-key map "ihd" 'insert-hebrew-diary-entry)
- (define-key map "ihm" 'insert-monthly-hebrew-diary-entry)
- (define-key map "ihy" 'insert-yearly-hebrew-diary-entry)
+ (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)
+ (define-key map "ihd" 'diary-hebrew-insert-entry)
+ (define-key map "ihm" 'diary-hebrew-insert-monthly-entry)
+ (define-key map "ihy" 'diary-hebrew-insert-yearly-entry)
(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)
(define-key map [menu-bar edit] 'undefined)
(define-key map [menu-bar search] 'undefined)
- ;; This ignores the mouse-up event after the mouse-down that pops up the
- ;; context menu. It should not be necessary because the mouse-up event
- ;; should be eaten up by the menu-handling toolkit.
- ;; (define-key map [mouse-2] 'ignore)
- (easy-menu-define nil map nil cal-menu-moon-menu)
+ (easy-menu-define nil map nil cal-menu-sunmoon-menu)
(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)
+ ;; These are referenced in the default calendar-date-echo-text.
(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))
+ ;; 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)
+
map)
"Keymap for `calendar-mode'.")
-(defun describe-calendar-mode ()
- "Create a help buffer with a brief description of the `calendar-mode'."
- (interactive)
- (help-setup-xref (list #'describe-calendar-mode) (interactive-p))
- (with-output-to-temp-buffer (help-buffer)
- (princ
- (format
- "Calendar Mode:\nFor a complete description, type %s\n%s\n"
- (substitute-command-keys
- "\\<calendar-mode-map>\\[describe-mode] from within the calendar")
- (substitute-command-keys "\\{calendar-mode-map}")))
- (print-help-return-message)))
-
;; Calendar mode is suitable only for specially formatted data.
(put 'calendar-mode 'mode-class 'special)
+(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)))
+
;; After calendar-mode-map.
(defcustom calendar-mode-line-format
(list
- (propertize "<"
- 'help-echo "mouse-1: previous month"
- 'mouse-face 'mode-line-highlight
- 'keymap (make-mode-line-mouse-map 'mouse-1
- 'calendar-scroll-right))
+ (calendar-mode-line-entry 'calendar-scroll-right "previous month" "<")
"Calendar"
(concat
- (propertize
- (substitute-command-keys
- "\\<calendar-mode-map>\\[calendar-goto-info-node] info")
- 'help-echo "mouse-1: read Info on Calendar"
- 'mouse-face 'mode-line-highlight
- 'keymap (make-mode-line-mouse-map 'mouse-1 'calendar-goto-info-node))
+ (calendar-mode-line-entry 'calendar-goto-info-node "read Info on Calendar"
+ nil "info")
" / "
- (propertize
- (substitute-command-keys
- " \\<calendar-mode-map>\\[calendar-other-month] other")
- 'help-echo "mouse-1: choose another month"
- 'mouse-face 'mode-line-highlight
- 'keymap (make-mode-line-mouse-map
- 'mouse-1 'mouse-calendar-other-month))
+ (calendar-mode-line-entry 'calendar-other-month "choose another month"
+ nil "other")
" / "
- (propertize
- (substitute-command-keys
- "\\<calendar-mode-map>\\[calendar-goto-today] today")
- 'help-echo "mouse-1: go to today's date"
- 'mouse-face 'mode-line-highlight
- 'keymap (make-mode-line-mouse-map 'mouse-1 #'calendar-goto-today)))
+ (calendar-mode-line-entry 'calendar-goto-today "go to today's date"
+ nil "today"))
'(calendar-date-string (calendar-current-date) t)
- (propertize ">"
- 'help-echo "mouse-1: next month"
- 'mouse-face 'mode-line-highlight
- 'keymap (make-mode-line-mouse-map
- 'mouse-1 'calendar-scroll-left)))
+ (calendar-mode-line-entry 'calendar-scroll-left "next month" ">"))
"The mode line of the calendar buffer.
+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:
-This must be a list of items that evaluate to strings--those strings are
-evaluated and concatenated together, evenly separated by blanks. The variable
-`date' is available for use as the date under (or near) the cursor; `date'
-defaults to the current date if it is otherwise undefined. Here is an example
-value that has the Hebrew date, the day number/days remaining in the year,
-and the ISO week/year numbers in the mode. When `calendar-move-hook' is set
-to `update-calendar-mode-line', the mode line shows these values for the date
-under the cursor:
-
- (list
- \"\"
- '(calendar-hebrew-date-string date)
- '(let* ((year (extract-calendar-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\"
- (extract-calendar-month iso-date)
- (extract-calendar-year iso-date)))
- \"\"))"
+ (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
:type 'sexp
:group 'calendar)
-(defun mouse-calendar-other-month (event)
- "Display a three-month calendar centered around a specified month and year.
-EVENT is the last mouse event."
- (interactive "e")
- (save-selected-window
- (select-window (posn-window (event-start event)))
- (call-interactively 'calendar-other-month)))
-
(defun calendar-goto-info-node ()
"Go to the info node for the calendar."
(interactive)
- (info "(emacs)Calendar/Diary"))
+ (info "(emacs)Calendar/Diary")
+ (fit-window-to-buffer))
(defvar calendar-mark-ring nil
"Used by `calendar-set-mark'.")
-(defun calendar-mode ()
+(define-derived-mode calendar-mode nil "Calendar"
"A major mode for the calendar window.
-
-For a complete description, type \
-\\<calendar-mode-map>\\[calendar-goto-info-node] from within the calendar.
+For a complete description, see the info node `Calendar/Diary'.
\\<calendar-mode-map>\\{calendar-mode-map}"
- (kill-all-local-variables)
- (setq major-mode 'calendar-mode
- mode-name "Calendar"
- buffer-read-only t
+ (setq buffer-read-only t
buffer-undo-list t
indent-tabs-mode nil)
- (use-local-map calendar-mode-map)
- (update-calendar-mode-line)
+ (calendar-update-mode-line)
(make-local-variable 'calendar-mark-ring)
(make-local-variable 'displayed-month) ; month in middle of window
(make-local-variable 'displayed-year) ; year in middle of window
;; 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
- ;; soon in generate-calendar, but better safe than sorry.
+ ;; soon in calendar-generate, but better safe than sorry.
(unless (boundp 'displayed-month) (setq displayed-month 1))
(unless (boundp 'displayed-year) (setq displayed-year 2001))
(set (make-local-variable 'font-lock-defaults)
- '(calendar-font-lock-keywords t))
- (run-mode-hooks 'calendar-mode-hook))
+ '(calendar-font-lock-keywords t)))
(defun calendar-string-spread (strings char length)
"Concatenate list of STRINGS separated with copies of CHAR to fill LENGTH.
i (1+ i)))
(substring s 0 length)))
-(defun update-calendar-mode-line ()
+(defun calendar-update-mode-line ()
"Update the calendar mode line with the current date and date style."
(if (bufferp (get-buffer calendar-buffer))
(with-current-buffer calendar-buffer
- (setq mode-line-format
- (calendar-string-spread
- (let ((date (condition-case nil
- (calendar-cursor-to-nearest-date)
- (error (calendar-current-date)))))
- (mapcar 'eval calendar-mode-line-format))
- ?\s (frame-width)))
+ (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))))))
(force-mode-line-update))))
(defun calendar-window-list ()
"List of all calendar-related windows."
(let ((calendar-buffers (calendar-buffer-list))
list)
+ ;; 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.
(walk-windows (lambda (w)
(if (memq (window-buffer w) calendar-buffers)
(push w list)))
- nil t)
+ nil 0)
list))
(defun calendar-buffer-list ()
"List of all calendar-related buffers (as buffers, not strings)."
(let (buffs)
- (dolist (b (list cal-hebrew-yahrzeit-buffer lunar-phases-buffer
- holiday-buffer fancy-diary-buffer
+ (dolist (b (list calendar-hebrew-yahrzeit-buffer lunar-phases-buffer
+ holiday-buffer diary-fancy-buffer solar-sunrises-buffer
(get-file-buffer diary-file)
- calendar-buffer other-calendars-buffer))
+ calendar-buffer calendar-other-calendars-buffer))
(and b (setq b (get-buffer b))
(push b buffs)))
buffs))
-(defun exit-calendar ()
+(defun calendar-exit ()
"Get out of the calendar window and hide it and related buffers."
(interactive)
(let ((diary-buffer (get-file-buffer diary-file)))
(mapc 'calendar-hide-window (calendar-window-list)))
(calendar-window-list)))))
+(define-obsolete-function-alias 'exit-calendar 'calendar-exit "23.1")
+
(defun calendar-hide-window (window)
"Hide WINDOW if it is calendar-related."
(let ((buffer (if (window-live-p window) (window-buffer window))))
(t (set-buffer buffer)
(bury-buffer))))))
-(defun calendar-current-date ()
- "Return the current date in a list (month day year)."
- (let ((now (decode-time)))
- (list (nth 4 now) (nth 3 now) (nth 5 now))))
-
-(defun calendar-cursor-to-date (&optional error)
+(defun calendar-current-date (&optional offset)
+ "Return the current date in a list (month day year).
+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))))))
+
+(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))))
+
+(defun calendar-cursor-to-date (&optional error event)
"Return a list (month day year) of current cursor position.
If cursor is not on a specific date, signals an error if optional parameter
-ERROR is non-nil, otherwise just returns nil."
- (let* ((segment (/ (current-column) 25))
- (month (% (+ displayed-month segment -1) 12))
- (month (if (zerop month) 12 month))
- (year
- (cond
- ((and (= 12 month) (zerop segment)) (1- displayed-year))
- ((and (= 1 month) (= segment 2)) (1+ displayed-year))
- (t displayed-year))))
- (if (and (looking-at "[ 0-9]?[0-9][^0-9]")
- (< 2 (count-lines (point-min) (point))))
- (save-excursion
- (if (not (looking-at " "))
+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
+ (and event (setq event (event-start event))
+ (goto-char (posn-point event)))
+ (let* ((segment (calendar-column-to-segment))
+ (month (% (+ displayed-month (1- segment)) 12)))
+ ;; 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.
+ (if (not (and (looking-at "[ 0-9]?[0-9][^0-9]")
+ (get-text-property (point) 'date)))
+ (if error (error "Not on a date!"))
+ ;; Convert segment to real month and year.
+ (if (zerop month) (setq month 12))
+ ;; Go back to before the first date digit.
+ (or (looking-at " ")
(re-search-backward "[^0-9]"))
(list month
- (string-to-number (buffer-substring (1+ (point)) (+ 4 (point))))
- year))
- (if error (error "Not on a date!")))))
+ (string-to-number
+ (buffer-substring (1+ (point))
+ (+ 1 calendar-day-digit-width (point))))
+ (cond
+ ((and (= 12 month) (zerop segment)) (1- displayed-year))
+ ((and (= 1 month) (= segment 2)) (1+ displayed-year))
+ (t displayed-year))))))))
(add-to-list 'debug-ignored-errors "Not on a date!")
month (1+ month)))
(list month day year))))
-(defun calendar-other-month (month year)
- "Display a three-month calendar centered around MONTH and YEAR."
- (interactive (calendar-read-date 'noday))
- (unless (and (= month displayed-month)
- (= year displayed-year))
- (let ((old-date (calendar-cursor-to-date))
- (today (calendar-current-date)))
- (generate-calendar-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)))))))
-
-(defun calendar-set-mark (arg)
+(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))))))))
+
+(defun calendar-set-mark (arg &optional event)
"Mark the date under the cursor, or jump to marked date.
With no prefix argument, push current date onto marked date ring.
With argument ARG, jump to mark, pop it, and put point at end of ring."
- (interactive "P")
- (let ((date (calendar-cursor-to-date t)))
+ (interactive
+ (list current-prefix-arg last-nonmenu-event))
+ (let ((date (calendar-cursor-to-date t event)))
(if arg
(if (null calendar-mark-ring)
(error "No mark set in this buffer")
(let* ((year (calendar-read
"Year (>0): "
(lambda (x) (> x 0))
- (int-to-string (extract-calendar-year
+ (number-to-string (calendar-extract-year
(calendar-current-date)))))
(month-array calendar-month-name-array)
(completion-ignore-case t)
" -?[0-9]+")
. font-lock-function-name-face) ; month and year
(,(regexp-opt
- (list (substring (aref calendar-day-name-array 6) 0 2)
- (substring (aref calendar-day-name-array 0) 0 2)))
+ (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)))
;; Saturdays and Sundays are highlighted differently.
. font-lock-comment-face)
;; First two chars of each day are used in the calendar.
- (,(regexp-opt (mapcar (lambda (x) (substring x 0 2))
+ (,(regexp-opt (mapcar (lambda (x) (substring x 0 calendar-day-header-width))
calendar-day-name-array))
. font-lock-reference-face))
"Default keywords to highlight in Calendar mode.")
interpreted as BC; -1 being 1 BC, and so on."
(mod (calendar-absolute-from-gregorian date) 7))
+(defun calendar-week-end-day ()
+ "Return the index (0 for Sunday, etc.) of the last day of the week."
+ (mod (+ calendar-week-start-day 6) 7))
+
(defun calendar-unmark ()
"Delete all diary/holiday marks/highlighting from the calendar."
(interactive)
- (setq mark-holidays-in-calendar nil
- mark-diary-entries-in-calendar nil)
+ (setq calendar-mark-holidays-flag nil
+ calendar-mark-diary-entries-flag nil)
(with-current-buffer calendar-buffer
(mapc 'delete-overlay (overlays-in (point-min) (point-max)))))
(and (calendar-date-is-valid-p date)
(< (abs (calendar-interval
displayed-month displayed-year
- (extract-calendar-month date) (extract-calendar-year date)))
+ (calendar-extract-month date) (calendar-extract-year date)))
2)))
+;; FIXME can this be generalized for holiday-chinese?
(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
(y2 displayed-year)
;; Absolute date of first/last dates in calendar window.
(start-date (progn
- (increment-calendar-month m1 y1 -1)
+ (calendar-increment-month m1 y1 -1)
(calendar-absolute-from-gregorian (list m1 1 y1))))
(end-date (progn
- (increment-calendar-month m2 y2 1)
+ (calendar-increment-month m2 y2 1)
(calendar-absolute-from-gregorian
(list m2 (calendar-last-day-of-month m2 y2) y2))))
;; Local date of first/last date in calendar window.
(local-end (funcall fromabs end-date))
;; Local year of first/last dates.
;; Can only differ if displayed-month = 12, 1, 2.
- (local-y1 (extract-calendar-year local-start))
- (local-y2 (extract-calendar-year local-end))
+ (local-y1 (calendar-extract-year local-start))
+ (local-y2 (calendar-extract-year local-end))
;; 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.
(defun calendar-date-is-valid-p (date)
"Return t if DATE is a valid date."
- (let ((month (extract-calendar-month date))
- (day (extract-calendar-day date))
- (year (extract-calendar-year date)))
+ (let ((month (calendar-extract-month date))
+ (day (calendar-extract-day date))
+ (year (calendar-extract-year date)))
(and (<= 1 month) (<= month 12)
;; (calendar-read-date t) used to return a date with day = nil.
;; Should not be valid (?), since many funcs prob assume integer.
;; (calendar-read-date 'noday) returns (month year), which
- ;; currently results in extract-calendar-year returning nil.
+ ;; currently results in calendar-extract-year returning nil.
day year (<= 1 day) (<= day (calendar-last-day-of-month month year))
;; BC dates left as non-valid, to suppress errors from
;; complex holiday algorithms not suitable for years BC.
(defun calendar-date-equal (date1 date2)
"Return t if the DATE1 and DATE2 are the same."
(and
- (= (extract-calendar-month date1) (extract-calendar-month date2))
- (= (extract-calendar-day date1) (extract-calendar-day date2))
- (= (extract-calendar-year date1) (extract-calendar-year date2))))
+ (= (calendar-extract-month date1) (calendar-extract-month date2))
+ (= (calendar-extract-day date1) (calendar-extract-day date2))
+ (= (calendar-extract-year date1) (calendar-extract-year date2))))
(defun calendar-make-temp-face (attrlist)
"Return a temporary face based on the attributes in ATTRLIST.
(apply 'set-face-attribute temp-face nil (nreverse faceinfo))
temp-face)))
-(defun mark-visible-calendar-date (date &optional mark)
+(defun calendar-mark-visible-date (date &optional mark)
"Mark DATE in the calendar window with MARK.
MARK is a single-character string, a list of face attributes/values, or a face.
MARK defaults to `diary-entry-marker'."
(calendar-cursor-to-visible-date date)
(setq mark
(or (and (stringp mark) (= (length mark) 1) mark) ; single-char
- (and font-lock-mode
- (or
+ ;; 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
(and (listp mark) (> (length mark) 0) mark) ; attrs
- (and (facep mark) mark))) ; face-name
- diary-entry-marker))
+ (and (facep mark) mark) ; )) face-name
+ diary-entry-marker))
(cond
;; Face or an attr-list that contained a face.
((facep mark)
(make-overlay (1- (point)) (1+ (point))) 'face
(calendar-make-temp-face mark))))))))
+(define-obsolete-function-alias 'mark-visible-calendar-date
+ 'calendar-mark-visible-date "23.1")
+
(defun calendar-star-date ()
"Replace the date under the cursor in the calendar window with asterisks.
-You might want to add this function to `today-visible-calendar-hook'."
+You might want to add this function to `calendar-today-visible-hook'."
(unless (catch 'found
(dolist (ol (overlays-at (point)))
(and (overlay-get ol 'calendar-star)
(defun calendar-mark-today ()
"Mark the date under the cursor in the calendar window.
The date is marked with `calendar-today-marker'. You might want to add
-this function to `today-visible-calendar-hook'."
- (mark-visible-calendar-date (calendar-cursor-to-date) calendar-today-marker))
+this function to `calendar-today-visible-hook'."
+ (calendar-mark-visible-date (calendar-cursor-to-date) calendar-today-marker))
+;; FIXME why the car? Almost every usage calls list on the args.
(defun calendar-date-compare (date1 date2)
"Return t if DATE1 is before DATE2, nil otherwise.
The actual dates are in the car of DATE1 and DATE2."
respectively. An optional parameter NODAYNAME, when t, omits the
name of the day of the week."
(let* ((dayname (unless nodayname (calendar-day-name date abbreviate)))
- (month (extract-calendar-month date))
+ (month (calendar-extract-month date))
(monthname (calendar-month-name month abbreviate))
- (day (int-to-string (extract-calendar-day date)))
- (month (int-to-string month))
- (year (int-to-string (extract-calendar-year date))))
+ (day (number-to-string (calendar-extract-day date)))
+ (month (number-to-string month))
+ (year (number-to-string (calendar-extract-year date))))
(mapconcat 'eval calendar-date-display-form "")))
(defun calendar-dayname-on-or-before (dayname date)
(- date (% (- date dayname) 7)))
(defun calendar-nth-named-absday (n dayname month year &optional day)
- "The absolute date of Nth DAYNAME in MONTH, YEAR before/after optional DAY.
-A DAYNAME of 0 means Sunday, 1 means Monday, and so on. If N<0,
-return the Nth DAYNAME before MONTH DAY, YEAR (inclusive).
+ "Absolute date of the Nth DAYNAME after/before MONTH YEAR DAY.
+A DAYNAME of 0 means Sunday, 1 means Monday, and so on.
If N>0, return the Nth DAYNAME after MONTH DAY, YEAR (inclusive).
-
-If DAY is omitted, it defaults to 1 if N>0, and MONTH's last day otherwise."
+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."
(if (> n 0)
(+ (* 7 (1- n))
(calendar-dayname-on-or-before
year))))))
(defun calendar-nth-named-day (n dayname month year &optional day)
- "The date of Nth DAYNAME in MONTH, YEAR before/after optional DAY.
+ "Date of the Nth DAYNAME after/before MONTH YEAR DAY.
Like `calendar-nth-named-absday', but returns a Gregorian date."
(calendar-gregorian-from-absolute
(calendar-nth-named-absday n dayname month year day)))
"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)))
- (year (extract-calendar-year d))
+ (year (calendar-extract-year d))
(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"
(format "Mayan date: %s"
(calendar-mayan-date-string date))))))
-(defun calendar-print-other-dates ()
- "Show dates on other calendars for date under the cursor."
- (interactive)
- (let ((date (calendar-cursor-to-date t)))
- (calendar-in-read-only-buffer other-calendars-buffer
- (calendar-set-mode-line (format "%s (Gregorian)"
- (calendar-date-string date)))
- (insert (mapconcat 'identity (calendar-other-dates date) "\n")))))
+(declare-function x-popup-menu "menu.c" (position menu))
+
+(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)))
+ (others (calendar-other-dates date))
+ selection)
+ (if (mouse-event-p event)
+ (and (setq selection (cal-menu-x-popup-menu event title
+ (mapcar 'list others)))
+ (call-interactively selection))
+ (calendar-in-read-only-buffer calendar-other-calendars-buffer
+ (calendar-set-mode-line title)
+ (insert (mapconcat 'identity others "\n"))))))
(defun calendar-print-day-of-year ()
"Show day number in year/days remaining in year for date under the cursor."
(let* ((edges (window-edges))
;; As per doc of window-width, total visible mode-line length.
(width (- (nth 2 edges) (car edges))))
+ ;; 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)))
(setq mode-line-format
(if buffer-file-name
`("-" mode-line-modified
;; byte-compile-dynamic: t
;; End:
-;; arch-tag: 19c61596-c8fb-4c69-bcf1-7dd739919cd8
;;; calendar.el ends here
HCoop / bpt / emacs.git / blobdiff