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/cal-x.el | |
| 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/cal-x.el')
| -rw-r--r-- | lisp/calendar/cal-x.el | 4 |
1 files changed, 1 insertions, 3 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. |