[Emacs-diffs] emacs-24 r117485: * calendar.el (calendar-basic-setup): Avoid clobbering calendar with diary.

[Glenn Morris]

------------------------------------------------------------
revno: 117485
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/18381
committer: Glenn Morris <address@hidden>
branch nick: emacs-24
timestamp: Sun 2014-09-07 22:57:24 -0700
message:
  * calendar.el (calendar-basic-setup): Avoid clobbering calendar with diary.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/calendar/calendar.el      calendar.el-20091113204419-o5vbwnq5f7feedwu-478

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-09-05 17:37:12 +0000
+++ b/lisp/ChangeLog    2014-09-08 05:57:24 +0000
@@ -1,3 +1,8 @@
+2014-09-08  Glenn Morris  <address@hidden>
+
+       * calendar/calendar.el (calendar-basic-setup):
+       Avoid clobbering calendar with diary.  (Bug#18381)
+
 2014-09-05  Stefan Monnier  <address@hidden>
 
        * vc/vc-dir.el (vc-dir-update): Don't burp in corner case.

=== modified file 'lisp/calendar/calendar.el'
--- a/lisp/calendar/calendar.el 2014-03-17 16:04:32 +0000
+++ b/lisp/calendar/calendar.el 2014-09-08 05:57:24 +0000
@@ -1,7 +1,6 @@
 ;;; calendar.el --- calendar functions
 
-;; Copyright (C) 1988-1995, 1997, 2000-2014 Free Software Foundation,
-;; Inc.
+;; Copyright (C) 1988-1995, 1997, 2000-2014 Free Software Foundation, Inc.
 
 ;; Author: Edward M. Reingold <address@hidden>
 ;; Maintainer: Glenn Morris <address@hidden>
@@ -1432,7 +1431,12 @@
       (calendar-generate-window month year)
       (if (and calendar-view-diary-initially-flag
                (calendar-date-is-visible-p date))
-          (diary-view-entries))))
+          ;; Do not clobber the calendar with the diary, if the diary
+          ;; has previously been shown in the window that now shows the
+          ;; calendar (bug#18381).
+          (let ((display-buffer-overriding-action
+                 '(nil . ((inhibit-same-window . t)))))
+            (diary-view-entries)))))
   (if calendar-view-holidays-initially-flag
       (let* ((diary-buffer (get-file-buffer diary-file))
              (diary-window (if diary-buffer (get-buffer-window diary-buffer)))