* cal-x.el (calendar-dedicate-diary): Drop support for deleted aliases.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e94ca37fe98fd1a1d96427f3acbc7ce7d27a6807..ef1bdfba0d6486902edafda4042a78097dbd6543 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-10-08  Glenn Morris  <rgm@gnu.org>
+
+       * calendar/cal-x.el (calendar-dedicate-diary):
+       Drop support for recently deleted aliases.
+
 2014-10-08  Leo Liu  <sdl.web@gmail.com>
 
        * progmodes/cfengine.el (cfengine3-make-syntax-cache): Always

diff --git a/lisp/calendar/cal-x.el b/lisp/calendar/cal-x.el
index e522649b4977b2cc8a1568b71412dd23d6b85bff..e510a513dcd65e6b2ff60f942c88a3822d369abd 100644 (file)
--- 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