From 9025db71efa46e4b782c519a06954f53ddae6e94 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sun, 7 Sep 2014 23:03:19 -0700 Subject: [PATCH] * calendar.el (calendar-basic-setup): Fix calendar-view-holidays-initially-flag and fancy display. * diary-lib.el (diary-live-p): Doc fix. --- lisp/ChangeLog | 4 ++++ lisp/calendar/calendar.el | 2 +- lisp/calendar/diary-lib.el | 6 +++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 292156db155..90f91d14afe 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,9 @@ 2014-09-08 Glenn Morris + * 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) diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el index 39ab186d56d..2b8c359047f 100644 --- 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? diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el index a4e36d9abe8..155af0da623 100644 --- a/lisp/calendar/diary-lib.el +++ b/lisp/calendar/diary-lib.el @@ -1,7 +1,6 @@ ;;; 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 ;; Maintainer: Glenn Morris @@ -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)))) -- 2.39.5