(special-display-buffer-names):

Don't put (get-file-buffer diary-file) on this list.

diff --git a/lisp/calendar/cal-x.el b/lisp/calendar/cal-x.el
index a52933d67f0fe68baa853dc5311fbeb7b72418ad..1e6cf4b0dcf7fc93771fd33ed7d9010b6c56c1b0 100644 (file)
--- a/lisp/calendar/cal-x.el
+++ b/lisp/calendar/cal-x.el
@@ -131,10 +131,12 @@ Can be used to change frame parameters, such as font, color, location, etc.")
             fancy-diary-buffer))
          'diary)))))
 
+;; Formerly (get-file-buffer diary-file) was added to the list here,
+;; but that isn't clean, and the value could even be nil.
 (setq special-display-buffer-names
       (append special-display-buffer-names
               (list "*Yahrzeits*" lunar-phases-buffer holiday-buffer
-                    fancy-diary-buffer (get-file-buffer diary-file)
+                    fancy-diary-buffer
                     other-calendars-buffer calendar-buffer)))
 
 (run-hooks 'cal-x-load-hook)