* calendar.el (calendar-basic-setup): Fix calendar-view-holidays-initially-flag

[gnu-emacs] / lisp / calendar / calendar.el

diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el
index 39ab186d56d1602cc64df6192bc209efbd82a730..2b8c359047fd650b80e264b818c3ab47c2de9a9b 100644 (file)
--- a/lisp/calendar/calendar.el
+++ b/lisp/calendar/calendar.el
@@ -1450,7 +1450,7 @@ display the generated calendar."
                  '(nil . ((inhibit-same-window . t)))))
             (diary-view-entries)))))
   (if calendar-view-holidays-initially-flag
-      (let* ((diary-buffer (get-file-buffer diary-file))
+      (let* ((diary-buffer (diary-live-p))
              (diary-window (if diary-buffer (get-buffer-window diary-buffer)))
              (split-height-threshold (if diary-window 2 1000)))
         ;; FIXME display buffer?