Commit 9025db71 authored by Glenn Morris's avatar Glenn Morris

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

 and fancy display.
* diary-lib.el (diary-live-p): Doc fix.
parent c04714f7
2014-09-08 Glenn Morris <rgm@gnu.org>
* calendar/calendar.el (calendar-basic-setup):
Fix calendar-view-holidays-initially-flag and fancy display.
* calendar/diary-lib.el (diary-live-p): Doc fix.
* calendar/calendar.el (calendar-basic-setup):
Avoid clobbering calendar with diary. (Bug#18381)
......
......@@ -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?
......
;;; diary-lib.el --- diary functions
;; Copyright (C) 1989-1990, 1992-1995, 2001-2014 Free Software
;; Foundation, Inc.
;; Copyright (C) 1989-1990, 1992-1995, 2001-2014 Free Software Foundation, Inc.
;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
;; Maintainer: Glenn Morris <rgm@gnu.org>
......@@ -468,7 +467,8 @@ Only used if `diary-header-line-flag' is non-nil."
;; just visiting the diary-file. This is i) unlikely, and ii) no great loss.
;;;###cal-autoload
(defun diary-live-p ()
"Return non-nil if the diary is being displayed."
"Return non-nil if the diary is being displayed.
The actual return value is a diary buffer."
(or (get-buffer diary-fancy-buffer)
(and diary-file (find-buffer-visiting diary-file))))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment