# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1207515225 0
# Node ID 1715d8011340df646cd7b61d430519be98df1546
# Parent  4ef65ad699dc46b7c1d2735bd6d2d55c9068b306
Update for diary-lib name changes.

diff -r 4ef65ad699dc -r 1715d8011340 lisp/calendar/cal-x.el
--- a/lisp/calendar/cal-x.el	Sun Apr 06 20:53:38 2008 +0000
+++ b/lisp/calendar/cal-x.el	Sun Apr 06 20:53:45 2008 +0000
@@ -95,7 +95,8 @@
   "Display and dedicate the window associated with the diary buffer."
   (set-window-dedicated-p
    (display-buffer
-    (if (not (memq 'fancy-diary-display diary-display-hook))
+    (if (not (or (memq 'diary-fancy-display diary-display-hook)
+                 (memq 'fancy-diary-display diary-display-hook)))
         (get-file-buffer diary-file)
       ;; If there are no diary entries, there won't be a fancy-diary
       ;; to dedicate, so make a basic one.