From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Glenn Morris Newsgroups: gmane.emacs.bugs Subject: bug#18381: 24.3.93; Diary can wrongly be displayed in Calendar's window Date: Thu, 04 Sep 2014 14:04:07 -0400 Message-ID: <7lr3zrjm94.fsf@fencepost.gnu.org> References: <87k35nqtdd.fsf@rosalinde.fritz.box> <54085AC5.5050304@gmx.at> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1409855472 4362 80.91.229.3 (4 Sep 2014 18:31:12 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 4 Sep 2014 18:31:12 +0000 (UTC) Cc: Stephen Berman , 18381@debbugs.gnu.org To: martin rudalics Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Thu Sep 04 20:31:06 2014 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1XPboG-0007y8-Ck for geb-bug-gnu-emacs@m.gmane.org; Thu, 04 Sep 2014 20:31:04 +0200 Original-Received: from localhost ([::1]:53586 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XPboG-0004Bi-0p for geb-bug-gnu-emacs@m.gmane.org; Thu, 04 Sep 2014 14:31:04 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:59572) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XPbo7-0003zD-S1 for bug-gnu-emacs@gnu.org; Thu, 04 Sep 2014 14:30:56 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XPbo6-0006M2-FL for bug-gnu-emacs@gnu.org; Thu, 04 Sep 2014 14:30:55 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:39209) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XPbo6-0006Lq-C3 for bug-gnu-emacs@gnu.org; Thu, 04 Sep 2014 14:30:54 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1XPbP3-000808-Qu for bug-gnu-emacs@gnu.org; Thu, 04 Sep 2014 14:05:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Glenn Morris Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 04 Sep 2014 18:05:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 18381 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 18381-submit@debbugs.gnu.org id=B18381.140985385230682 (code B ref 18381); Thu, 04 Sep 2014 18:05:01 +0000 Original-Received: (at 18381) by debbugs.gnu.org; 4 Sep 2014 18:04:12 +0000 Original-Received: from localhost ([127.0.0.1]:58996 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XPbOF-0007yo-RK for submit@debbugs.gnu.org; Thu, 04 Sep 2014 14:04:12 -0400 Original-Received: from fencepost.gnu.org ([208.118.235.10]:38283 ident=Debian-exim) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XPbOC-0007yd-Sv for 18381@debbugs.gnu.org; Thu, 04 Sep 2014 14:04:09 -0400 Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1XPbOB-0000uY-FY; Thu, 04 Sep 2014 14:04:07 -0400 X-Spook: White House Semtex CIDA sniper government mailbomb George X-Ran: :RCQ-h.hoCVl}n3J$=3QsGB{0$@7[Ax:iDF=0 (martin rudalics's message of "Thu, 04 Sep 2014 14:27:49 +0200") User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:93033 Archived-At: martin rudalics wrote: > ... is the same window where you first show the calendar here. As a > consequence, `display-buffer-in-previous-window' will find a window > where you have shown `diary' already and reuse that window. I'm not > sure what's the best thing to do here - maybe we should remove > `display-buffer-in-previous-window' from > `display-buffer-fallback-action' in `calendar-in-read-only-buffer'. The most conservative fix would seem to be to only change calendar-basic-setup, where it calls diary-view-entries. I guess what we really want to say is "don't display the diary in the window that you just displayed the calendar in" (is that possible?), but failing that, simply removing display-buffer-in-previous-window seems to work. What's the cleanest way to do that? Binding display-buffer-overriding-action or display-buffer-fallback-action to an explicit list? display-buffer-fallback-action does not have the friendliest format to make "remove element X" straightforward, and is marked as a constant. *** lisp/calendar/calendar.el 2014-03-17 16:04:32 +0000 --- lisp/calendar/calendar.el 2014-09-04 17:57:25 +0000 *************** *** 1432,1438 **** (calendar-generate-window month year) (if (and calendar-view-diary-initially-flag (calendar-date-is-visible-p date)) ! (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))) --- 1432,1444 ---- (calendar-generate-window month year) (if (and calendar-view-diary-initially-flag (calendar-date-is-visible-p date)) ! (let ((display-buffer-fallback-action ! '((display-buffer--maybe-same-window ! display-buffer-reuse-window ! display-buffer--maybe-pop-up-frame-or-window ! display-buffer-use-some-window ! display-buffer-pop-up-frame)))) ! (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)))