[Emacs-diffs] Changes to emacs/lisp/calendar/cal-x.el,v

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       08/04/06 20:53:45

Index: cal-x.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/calendar/cal-x.el,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- cal-x.el    5 Apr 2008 18:47:34 -0000       1.40
+++ cal-x.el    6 Apr 2008 20:53:45 -0000       1.41
@@ -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.