[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r117840: * calendar.el (calendar-basic-setup): Fix c
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] trunk r117840: * calendar.el (calendar-basic-setup): Fix calendar-view-holidays-initially-flag |
Date: |
Mon, 08 Sep 2014 06:03:29 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 117840
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sun 2014-09-07 23:03:19 -0700
message:
* calendar.el (calendar-basic-setup): Fix
calendar-view-holidays-initially-flag
and fancy display.
* diary-lib.el (diary-live-p): Doc fix.
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/calendar/calendar.el calendar.el-20091113204419-o5vbwnq5f7feedwu-478
lisp/calendar/diary-lib.el diarylib.el-20091113204419-o5vbwnq5f7feedwu-902
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2014-09-08 06:00:58 +0000
+++ b/lisp/ChangeLog 2014-09-08 06:03:19 +0000
@@ -1,6 +1,10 @@
2014-09-08 Glenn Morris <address@hidden>
* 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)
2014-09-08 Stefan Monnier <address@hidden>
=== modified file 'lisp/calendar/calendar.el'
--- a/lisp/calendar/calendar.el 2014-09-08 06:00:58 +0000
+++ b/lisp/calendar/calendar.el 2014-09-08 06:03:19 +0000
@@ -1450,7 +1450,7 @@
'(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?
=== modified file 'lisp/calendar/diary-lib.el'
--- a/lisp/calendar/diary-lib.el 2014-05-04 23:49:33 +0000
+++ b/lisp/calendar/diary-lib.el 2014-09-08 06:03:19 +0000
@@ -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 <address@hidden>
;; Maintainer: Glenn Morris <address@hidden>
@@ -468,7 +467,8 @@
;; 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))))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r117840: * calendar.el (calendar-basic-setup): Fix calendar-view-holidays-initially-flag,
Glenn Morris <=