From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Juri Linkov Newsgroups: gmane.emacs.bugs Subject: bug#32790: 27.0.50; point jumps unexpectedly after delete-window Date: Sun, 25 Nov 2018 01:40:29 +0200 Organization: LINKOV.NET Message-ID: <87va4mdoya.fsf@mail.linkov.net> References: <87efdnsp2k.fsf@mail.linkov.net> <87tvklx4je.fsf@mail.linkov.net> <5BEA94A7.20809@gmx.at> <87r2foa8gq.fsf@mail.linkov.net> <5BEBDDCB.6090608@gmx.at> <87va4zfapq.fsf@mail.linkov.net> <5BED38A6.6020206@gmx.at> <87ftw2q74g.fsf@mail.linkov.net> <5BEE85A5.2070309@gmx.at> <878t1ruz4m.fsf@mail.linkov.net> <5BF12FB6.20203@gmx.at> <87o9am3smz.fsf@mail.linkov.net> <5BF2858C.40207@gmx.at> <87va4szo8n.fsf@mail.linkov.net> <5BF3D3D4.1080106@gmx.at> <87pnuzz2vf.fsf@mail.linkov.net> <5BF5151B.5000201@gmx.at> <87ftvu9f20.fsf@mail.linkov.net> <5BF65D56.9020806@gmx.at> <87pnuwenpk.fsf@mail.linkov.net> <5BF7AEC5.60808@gmx.at> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: blaine.gmane.org 1543103049 16473 195.159.176.226 (24 Nov 2018 23:44:09 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sat, 24 Nov 2018 23:44:09 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (x86_64-pc-linux-gnu) Cc: 32790@debbugs.gnu.org To: martin rudalics Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sun Nov 25 00:44:05 2018 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gQhan-0004Ak-1L for geb-bug-gnu-emacs@m.gmane.org; Sun, 25 Nov 2018 00:44:05 +0100 Original-Received: from localhost ([::1]:58112 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gQhct-0008Df-LS for geb-bug-gnu-emacs@m.gmane.org; Sat, 24 Nov 2018 18:46:15 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:53785) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gQhck-0008Cu-6a for bug-gnu-emacs@gnu.org; Sat, 24 Nov 2018 18:46:07 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gQhch-00030z-2E for bug-gnu-emacs@gnu.org; Sat, 24 Nov 2018 18:46:06 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:41694) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gQhcg-00030o-UE for bug-gnu-emacs@gnu.org; Sat, 24 Nov 2018 18:46:03 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gQhcg-0007NK-Qd for bug-gnu-emacs@gnu.org; Sat, 24 Nov 2018 18:46:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Juri Linkov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 24 Nov 2018 23:46:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 32790 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 32790-submit@debbugs.gnu.org id=B32790.154310310728247 (code B ref 32790); Sat, 24 Nov 2018 23:46:02 +0000 Original-Received: (at 32790) by debbugs.gnu.org; 24 Nov 2018 23:45:07 +0000 Original-Received: from localhost ([127.0.0.1]:45948 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gQhbm-0007LX-QR for submit@debbugs.gnu.org; Sat, 24 Nov 2018 18:45:07 -0500 Original-Received: from common.maple.relay.mailchannels.net ([23.83.214.38]:65098) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gQhbk-0007Kt-2w for 32790@debbugs.gnu.org; Sat, 24 Nov 2018 18:45:04 -0500 X-Sender-Id: dreamhost|x-authsender|jurta@jurta.org Original-Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id F209C2829F1; Sat, 24 Nov 2018 23:45:02 +0000 (UTC) Original-Received: from pdx1-sub0-mail-a3.g.dreamhost.com (unknown [100.96.30.62]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id AC18E282983; Sat, 24 Nov 2018 23:45:02 +0000 (UTC) X-Sender-Id: dreamhost|x-authsender|jurta@jurta.org Original-Received: from pdx1-sub0-mail-a3.g.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384) by 0.0.0.0:2500 (trex/5.16.2); Sat, 24 Nov 2018 23:45:02 +0000 X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|jurta@jurta.org X-MailChannels-Auth-Id: dreamhost X-Descriptive-Lyrical: 10758ee679f64708_1543103102851_532490117 X-MC-Loop-Signature: 1543103102851:1514703525 X-MC-Ingress-Time: 1543103102850 Original-Received: from pdx1-sub0-mail-a3.g.dreamhost.com (localhost [127.0.0.1]) by pdx1-sub0-mail-a3.g.dreamhost.com (Postfix) with ESMTP id 6E7BF80575; Sat, 24 Nov 2018 15:45:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=linkov.net; h=from:to:cc :subject:references:date:in-reply-to:message-id:mime-version :content-type; s=linkov.net; bh=1qny1f4Wq0HJESJKV8Y+s/sLR/c=; b= 3UK+V4Fi+0V6b0WjZ8AqkXsAUXRM4J6UDtTuEicRWmtLoPBA6+yd/+eT+HSxmUYA 0QTPXXwSd6VX7uOj4YJv1AMZR95YS02cmDLvGezpqb490BvTTyF4ca6c6MDHSL9Z E/Hv/sOvkzNtmv6qMpavXprPRp83bhBr8UZ0AMYuuzM= Original-Received: from mail.jurta.org (m91-129-107-242.cust.tele2.ee [91.129.107.242]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: jurta@jurta.org) by pdx1-sub0-mail-a3.g.dreamhost.com (Postfix) with ESMTPSA id 9FC3F80574; Sat, 24 Nov 2018 15:45:00 -0800 (PST) X-DH-BACKEND: pdx1-sub0-mail-a3 In-Reply-To: <5BF7AEC5.60808@gmx.at> (martin rudalics's message of "Fri, 23 Nov 2018 08:39:49 +0100") X-VR-OUT-STATUS: OK X-VR-OUT-SCORE: -100 X-VR-OUT-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedtkedruddufedgudejjecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucggtfgfnhhsuhgsshgtrhhisggvpdfftffgtefojffquffvnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenucfjughrpefhvffuohhfffgjkfgfgggtsehmtderredtredtnecuhfhrohhmpefluhhrihcunfhinhhkohhvuceojhhurhhisehlihhnkhhovhdrnhgvtheqnecukfhppeeluddruddvledruddtjedrvdegvdenucfrrghrrghmpehmohguvgepshhmthhppdhhvghlohepmhgrihhlrdhjuhhrthgrrdhorhhgpdhinhgvthepledurdduvdelrddutdejrddvgedvpdhrvghtuhhrnhdqphgrthhhpefluhhrihcunfhinhhkohhvuceojhhurhhisehlihhnkhhovhdrnhgvtheqpdhmrghilhhfrhhomhepjhhurhhisehlihhnkhhovhdrnhgvthdpnhhrtghpthhtoheprhhuuggrlhhitghssehgmhigrdgrthenucevlhhushhtvghrufhiiigvpedt X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.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" Xref: news.gmane.org gmane.emacs.bugs:152749 Archived-At: --=-=-= Content-Type: text/plain > Would we avoid that 'switch-to-buffer-pop-to' affects C-x b? 'C-x b' is one of main beneficiaries of this feature. > Anyway, if you know what you want, please write the code. > We can iron out any differences in the doc-strings, if needed. Do you see a problem with this implementation? --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=switch-to-buffer-pop-to.1.patch diff --git a/lisp/window.el b/lisp/window.el index 43a742b2d8..b76729e752 100644 --- a/lisp/window.el +++ b/lisp/window.el @@ -7779,6 +7787,13 @@ switch-to-buffer-in-dedicated-window :group 'windows :version "25.1") +(defcustom switch-to-buffer-pop-to nil + "If non-nil, use `pop-to-buffer-same-window' in the selected window. +This allows custmization of conditional actions for `display-buffer'." + :type 'boolean + :group 'windows + :version "27.1") + (defun switch-to-buffer (buffer-or-name &optional norecord force-same-window) "Display buffer BUFFER-OR-NAME in the selected window. @@ -7838,11 +7853,13 @@ switch-to-buffer (`pop nil) (_ (set-window-dedicated-p nil nil) 'force-same-window)))))) (list (read-buffer-to-switch "Switch to buffer: ") nil force-same-window))) - (let ((buffer (window-normalize-buffer-to-switch-to buffer-or-name))) + (let ((buffer (window-normalize-buffer-to-switch-to buffer-or-name)) + (set-window-data-p t)) (cond ;; Don't call set-window-buffer if it's not needed since it ;; might signal an error (e.g. if the window is dedicated). - ((eq buffer (window-buffer))) + ((and (eq buffer (window-buffer)) + (not switch-to-buffer-pop-to))) ((window-minibuffer-p) (if force-same-window (user-error "Cannot switch buffers in minibuffer window") @@ -7852,6 +7869,13 @@ switch-to-buffer (user-error "Cannot switch buffers in a dedicated window") (pop-to-buffer buffer norecord))) (t + (when switch-to-buffer-pop-to + (let ((selected-window (selected-window))) + (pop-to-buffer-same-window buffer norecord) + (unless (eq (selected-window) selected-window) + (setq set-window-data-p nil)))) + + (when set-window-data-p (let* ((entry (assq buffer (window-prev-buffers))) (displayed (and (eq switch-to-buffer-preserve-window-point 'already-displayed) @@ -7863,7 +7887,7 @@ switch-to-buffer ;; Try to restore start and point of buffer in the selected ;; window (Bug#4041). (set-window-start (selected-window) (nth 1 entry) t) - (set-window-point nil (nth 2 entry)))))) + (set-window-point nil (nth 2 entry))))))) (unless norecord (select-window (selected-window))) --=-=-=--