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 18:39:02 -0400 Message-ID: <64a96fko3d.fsf@fencepost.gnu.org> References: <87k35nqtdd.fsf@rosalinde.fritz.box> <54085AC5.5050304@gmx.at> <7lr3zrjm94.fsf@fencepost.gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1409870417 28861 80.91.229.3 (4 Sep 2014 22:40:17 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 4 Sep 2014 22:40:17 +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 Fri Sep 05 00:40:09 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 1XPfhI-0004Vu-Rn for geb-bug-gnu-emacs@m.gmane.org; Fri, 05 Sep 2014 00:40:08 +0200 Original-Received: from localhost ([::1]:54458 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XPfhI-0002Mt-CL for geb-bug-gnu-emacs@m.gmane.org; Thu, 04 Sep 2014 18:40:08 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:51321) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XPfhF-0002MC-4m for bug-gnu-emacs@gnu.org; Thu, 04 Sep 2014 18:40:05 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XPfhE-0006v4-2F for bug-gnu-emacs@gnu.org; Thu, 04 Sep 2014 18:40:05 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:39325) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XPfhD-0006uY-V2 for bug-gnu-emacs@gnu.org; Thu, 04 Sep 2014 18:40:04 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1XPfhD-0006Nl-GH for bug-gnu-emacs@gnu.org; Thu, 04 Sep 2014 18:40:03 -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 22:40:03 +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.140987034724445 (code B ref 18381); Thu, 04 Sep 2014 22:40:03 +0000 Original-Received: (at 18381) by debbugs.gnu.org; 4 Sep 2014 22:39:07 +0000 Original-Received: from localhost ([127.0.0.1]:59119 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XPfgI-0006MC-Rb for submit@debbugs.gnu.org; Thu, 04 Sep 2014 18:39:07 -0400 Original-Received: from fencepost.gnu.org ([208.118.235.10]:43860 ident=Debian-exim) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XPfgF-0006M3-Rk for 18381@debbugs.gnu.org; Thu, 04 Sep 2014 18:39:04 -0400 Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1XPfgE-000899-Uo; Thu, 04 Sep 2014 18:39:03 -0400 X-Spook: Aladdin Comirex War on Terrorism Janet Reno quiche DES X-Ran: &$I1o$~0`,*S{1IpGv`cClA:uJjphXW`>n_O:E;\&1&X$#ZZ;v||dr#0VwBLb"26'HU;h9 X-Hue: yellow X-Attribution: GM In-Reply-To: (Glenn Morris's message of "Thu, 04 Sep 2014 15:48:17 -0400") 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:93044 Archived-At: Glenn Morris wrote: > Maybe "don't display the diary in the selected window" would suffice. > Sounds like adding '(inhibit-same-window . t) to display-buffer's alist > might do, but I cannot figure out how to do that. Following works, but having to use `ignore' seems odd? *** lisp/calendar/calendar.el 2014-03-17 16:04:32 +0000 --- lisp/calendar/calendar.el 2014-09-04 22:36:56 +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,1440 ---- (calendar-generate-window month year) (if (and calendar-view-diary-initially-flag (calendar-date-is-visible-p date)) ! (let ((display-buffer-overriding-action ! '(ignore . ((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)))