Commit ab7af022 authored by Glenn Morris's avatar Glenn Morris
Browse files

Drop support for deprecated (since 23.1) forms of diary-display-function

* lisp/calendar/diary-lib.el (diary-display-function):
Drop support for deprecated nil and list forms.
(diary-list-entries): Update for the above.

* lisp/calendar/cal-x.el (calendar-dedicate-diary): Simplify accordingly.
parent 244a462a
......@@ -169,6 +169,8 @@ The remainder were:
**** Variables `european-calendar-style', `diary-face', `hebrew-holidays-{1,4}'.
**** The nil and list forms of `diary-display-function'.
** New ERT function `ert-summarize-tests-batch-and-exit'.
2014-10-11 Glenn Morris <>
* calendar/diary-lib.el (diary-display-function):
Drop support for deprecated nil and list forms.
(diary-list-entries): Update for the above.
* calendar/cal-x.el (calendar-dedicate-diary): Simplify accordingly.
2014-10-10 Leo Liu <>
* window.el (temp-buffer-window-show): Make BUFFER a required arg.
......@@ -93,9 +93,7 @@ Runs `calendar-after-frame-setup-hook', selects frame, iconifies if needed."
"Display and dedicate the window associated with the diary buffer."
(if (if (listp diary-display-function)
(memq 'diary-fancy-display diary-display-function)
(eq diary-display-function 'diary-fancy-display))
(if (eq diary-display-function 'diary-fancy-display)
;; If there are no diary entries, there won't be a buffer
;; to dedicate, so make a basic one.
......@@ -159,11 +159,6 @@ Used for example by the appointment package - see `appt-activate'."
"Function used to display the diary.
The two standard options are `diary-fancy-display' and `diary-simple-display'.
For historical reasons, `nil' is the same as `diary-simple-display'
\(so you must use `ignore' for no display). Also for historical
reasons, this variable can be a list of functions to run. These
uses are not recommended and may be removed at some point.
When this function is 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
......@@ -172,9 +167,8 @@ produce a different buffer for display (perhaps combined with
holidays), or hard copy output."
:type '(choice (const diary-fancy-display :tag "Fancy display")
(const diary-simple-display :tag "Basic display")
(const ignore :tag "No display")
(const nil :tag "Obsolete way to choose basic display")
(hook :tag "Obsolete form with list of display functions"))
(const :tag "No display" ignore)
(function :tag "User-specified function"))
:initialize 'custom-initialize-default
:set 'diary-set-maybe-redraw
:version "23.2" ; simple->fancy
......@@ -867,12 +861,7 @@ LIST-ONLY is non-nil, in which case it just returns the list."
(car display-buffer-fallback-action))))))
(if (and diary-display-function
(listp diary-display-function))
;; Backwards compatibility.
(run-hooks 'diary-display-function)
(funcall (or diary-display-function
(funcall diary-display-function)))
(run-hooks 'diary-hook)))))
(and temp-buff (buffer-name temp-buff) (kill-buffer temp-buff)))
(or d-incp (message "Preparing diary...done"))
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment