diff options
| author | Glenn Morris <rgm@gnu.org> | 2014-10-10 19:54:11 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2014-10-10 19:54:11 -0700 |
| commit | ab7af0222e427081b5b5269223746b87ac6a6cfc (patch) | |
| tree | 669c4302ffb5aab1b3c80f7fe4afd210cefe224d /lisp/calendar | |
| parent | 244a462a30cbb9c211d21de14de138ab8c291722 (diff) | |
| download | emacs-ab7af0222e427081b5b5269223746b87ac6a6cfc.tar.gz emacs-ab7af0222e427081b5b5269223746b87ac6a6cfc.tar.bz2 emacs-ab7af0222e427081b5b5269223746b87ac6a6cfc.zip | |
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.
Diffstat (limited to 'lisp/calendar')
| -rw-r--r-- | lisp/calendar/cal-x.el | 4 | ||||
| -rw-r--r-- | lisp/calendar/diary-lib.el | 17 |
2 files changed, 4 insertions, 17 deletions
diff --git a/lisp/calendar/cal-x.el b/lisp/calendar/cal-x.el index e510a513dcd..1ed2fa4bbb0 100644 --- a/lisp/calendar/cal-x.el +++ b/lisp/calendar/cal-x.el @@ -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." (set-window-dedicated-p (display-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) (progn ;; If there are no diary entries, there won't be a buffer ;; to dedicate, so make a basic one. diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el index 954cb5102bf..39ba6f4617e 100644 --- a/lisp/calendar/diary-lib.el +++ b/lisp/calendar/diary-lib.el @@ -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." 'display-buffer-in-previous-window (copy-sequence (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 - 'diary-simple-display))))) + (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")) |