From 289a43910e29999f125d76a48602b63cea7ed9b9 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 8 Oct 2014 14:30:45 -0400 Subject: [PATCH] * cal-x.el (calendar-dedicate-diary): Drop support for deleted aliases. --- lisp/ChangeLog | 5 +++++ lisp/calendar/cal-x.el | 8 +++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e94ca37fe98..ef1bdfba0d6 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-10-08 Glenn Morris + + * calendar/cal-x.el (calendar-dedicate-diary): + Drop support for recently deleted aliases. + 2014-10-08 Leo Liu * progmodes/cfengine.el (cfengine3-make-syntax-cache): Always diff --git a/lisp/calendar/cal-x.el b/lisp/calendar/cal-x.el index e522649b497..e510a513dcd 100644 --- a/lisp/calendar/cal-x.el +++ b/lisp/calendar/cal-x.el @@ -94,12 +94,10 @@ Runs `calendar-after-frame-setup-hook', selects frame, iconifies if needed." (set-window-dedicated-p (display-buffer (if (if (listp diary-display-function) - (or (memq 'diary-fancy-display diary-display-function) - (memq 'fancy-diary-display diary-display-function)) - (memq diary-display-function '(diary-fancy-display - fancy-diary-display))) + (memq 'diary-fancy-display diary-display-function) + (eq diary-display-function 'diary-fancy-display)) (progn - ;; If there are no diary entries, there won't be a fancy-diary + ;; If there are no diary entries, there won't be a buffer ;; to dedicate, so make a basic one. (or (get-buffer diary-fancy-buffer) (calendar-in-read-only-buffer diary-fancy-buffer -- 2.39.5