[Emacs-diffs] trunk r118075: * cal-x.el (calendar-dedicate-diary): Drop support for deleted aliases.

[Glenn Morris]

------------------------------------------------------------
revno: 118075
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2014-10-08 14:30:45 -0400
message:
  * cal-x.el (calendar-dedicate-diary): Drop support for deleted aliases.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/calendar/cal-x.el         calx.el-20091113204419-o5vbwnq5f7feedwu-818

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-10-08 15:34:58 +0000
+++ b/lisp/ChangeLog    2014-10-08 18:30:45 +0000
@@ -1,3 +1,8 @@
+2014-10-08  Glenn Morris  <address@hidden>
+
+       * calendar/cal-x.el (calendar-dedicate-diary):
+       Drop support for recently deleted aliases.
+
 2014-10-08  Leo Liu  <address@hidden>
 
        * progmodes/cfengine.el (cfengine3-make-syntax-cache): Always

=== modified file 'lisp/calendar/cal-x.el'
--- a/lisp/calendar/cal-x.el    2014-10-06 02:02:04 +0000
+++ b/lisp/calendar/cal-x.el    2014-10-08 18:30:45 +0000
@@ -94,12 +94,10 @@
   (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