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: Tue, 09 Sep 2014 14:13:02 -0400 Message-ID: References: <87k35nqtdd.fsf@rosalinde.fritz.box> <54085AC5.5050304@gmx.at> <7lr3zrjm94.fsf@fencepost.gnu.org> <64a96fko3d.fsf@fencepost.gnu.org> <54099491.4040607@gmx.at> <540ACB49.8010405@gmx.at> <9l38c2bqbo.fsf@fencepost.gnu.org> <87bnqpj1k3.fsf@rosalinde.fritz.box> <540EA527.4050809@gmx.at> <540EC5D8.2000302@gmx.at> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1410286482 10838 80.91.229.3 (9 Sep 2014 18:14:42 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 9 Sep 2014 18:14:42 +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 Tue Sep 09 20:14:32 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 1XRPw0-00064t-A0 for geb-bug-gnu-emacs@m.gmane.org; Tue, 09 Sep 2014 20:14:32 +0200 Original-Received: from localhost ([::1]:51268 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XRPvz-0006zC-Ly for geb-bug-gnu-emacs@m.gmane.org; Tue, 09 Sep 2014 14:14:31 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:57680) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XRPvg-0006nB-M5 for bug-gnu-emacs@gnu.org; Tue, 09 Sep 2014 14:14:28 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XRPvX-00069i-0a for bug-gnu-emacs@gnu.org; Tue, 09 Sep 2014 14:14:12 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:44060) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XRPvW-00069c-Tf for bug-gnu-emacs@gnu.org; Tue, 09 Sep 2014 14:14:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1XRPvW-0002gW-Jq for bug-gnu-emacs@gnu.org; Tue, 09 Sep 2014 14:14: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: Tue, 09 Sep 2014 18:14:02 +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.141028638610234 (code B ref 18381); Tue, 09 Sep 2014 18:14:02 +0000 Original-Received: (at 18381) by debbugs.gnu.org; 9 Sep 2014 18:13:06 +0000 Original-Received: from localhost ([127.0.0.1]:35624 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XRPub-0002ex-O9 for submit@debbugs.gnu.org; Tue, 09 Sep 2014 14:13:06 -0400 Original-Received: from fencepost.gnu.org ([208.118.235.10]:40223 ident=Debian-exim) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XRPuZ-0002ep-BF for 18381@debbugs.gnu.org; Tue, 09 Sep 2014 14:13:04 -0400 Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1XRPuY-0002it-AZ; Tue, 09 Sep 2014 14:13:02 -0400 X-Spook: Vince Foster RSA MD4 Israel mania Defcon Mossad CNCIS X-Ran: tZ'C`Fp`G1QQ(Dj1Ownwn_SnDo'DJSttQ{)p2Wq_F,r[9RrT6dE5(<40M(j]q4W+9,F5.H X-Hue: magenta X-Attribution: GM In-Reply-To: <540EC5D8.2000302@gmx.at> (martin rudalics's message of "Tue, 09 Sep 2014 11:18:16 +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:93206 Archived-At: I went with the following. (I suspect it's going to be like when you press on a bubble in some wallpaper, and another one pops up somewhere else...) @@ -901,12 +900,20 @@ ;;; (diary-include-other-diary-files) ; recurse ;;; (run-hooks 'diary-list-entries-hook)) (unless list-only - (if (and diary-display-function - (listp diary-display-function)) - ;; Backwards compatibility. - (run-hooks 'diary-display-function) - (funcall (or diary-display-function - 'diary-simple-display)))) + ;; Avoid M-x diary; M-x calendar; M-x diary + ;; clobbering the calendar window. + ;; FIXME this is not the right solution. + (let ((display-buffer-fallback-action + (list (delq + 'display-buffer-in-previous-window + (copy-sequence + (car display-buffer-fallback-action)))))) + (if (and diary-display-function + (listp diary-display-function)) + ;; Backwards compatibility. + (run-hooks 'diary-display-function) + (funcall (or diary-display-function + 'diary-simple-display))))) (run-hooks 'diary-hook))))) (and temp-buff (buffer-name temp-buff) (kill-buffer temp-buff))) (or d-incp (message "Preparing diary...done"))