From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Juri Linkov Newsgroups: gmane.emacs.bugs Subject: bug#59862: quit-restore per window buffer Date: Sun, 02 Jun 2024 09:45:02 +0300 Organization: LINKOV.NET Message-ID: <86ttibq1w1.fsf@mail.linkov.net> References: <86fsds8mlm.fsf@mail.linkov.net> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="39278"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/30.0.50 (x86_64-pc-linux-gnu) Cc: martin rudalics To: 59862@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sun Jun 02 08:52:22 2024 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1sDf4o-000A77-4w for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 02 Jun 2024 08:52:22 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sDf4J-0008SH-Hc; Sun, 02 Jun 2024 02:51:51 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sDf4H-0008Rj-Ow for bug-gnu-emacs@gnu.org; Sun, 02 Jun 2024 02:51:49 -0400 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sDf4H-0004Ns-Gl for bug-gnu-emacs@gnu.org; Sun, 02 Jun 2024 02:51:49 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sDf4T-0007ws-JF for bug-gnu-emacs@gnu.org; Sun, 02 Jun 2024 02:52:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Juri Linkov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 02 Jun 2024 06:52:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59862 X-GNU-PR-Package: emacs Original-Received: via spool by 59862-submit@debbugs.gnu.org id=B59862.171731106430454 (code B ref 59862); Sun, 02 Jun 2024 06:52:01 +0000 Original-Received: (at 59862) by debbugs.gnu.org; 2 Jun 2024 06:51:04 +0000 Original-Received: from localhost ([127.0.0.1]:57712 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sDf3X-0007v8-GV for submit@debbugs.gnu.org; Sun, 02 Jun 2024 02:51:03 -0400 Original-Received: from relay7-d.mail.gandi.net ([217.70.183.200]:52351) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sDf3V-0007ua-8C for 59862@debbugs.gnu.org; Sun, 02 Jun 2024 02:51:02 -0400 Original-Received: by mail.gandi.net (Postfix) with ESMTPSA id F1B6C20003; Sun, 2 Jun 2024 06:50:41 +0000 (UTC) In-Reply-To: <86fsds8mlm.fsf@mail.linkov.net> (Juri Linkov's message of "Tue, 06 Dec 2022 19:32:05 +0200") X-GND-Sasl: juri@linkov.net X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:286366 Archived-At: Martin, do you agree with this? I tested this patch for a long time. > 1. C-x 4 d RET C-h C-t q q -- the bottom window is NOT deleted > 2. C-x 4 d RET C-h C-t C-x k RET q -- the bottom window is deleted > 3. C-x 4 d RET C-h C-n C-x k RET q -- the bottom window is NOT deleted > > The accidental difference between the last two is that the former uses > `switch-to-buffer' whereas the latter uses `pop-to-buffer-same-window'. > > The root of the problem is that displaying a buffer in an existing > window, or quitting a buffer in an existing window overwrites its > window parameter `quit-restore', and thus invalidates the history of > how the first window was displayed. > > A partial fix that solves only the first test case above is at least > not to overwrite `quit-restore' on quitting other buffers in the same > window: > > diff --git a/lisp/window.el b/lisp/window.el > index a11293d372a..e3b057599d5 100644 > --- a/lisp/window.el > +++ b/lisp/window.el > @@ -5275,14 +5276,14 @@ quit-restore-window > (set-window-prev-buffers > window (append (window-prev-buffers window) (list entry)))) > ;; Reset the quit-restore parameter. > - (set-window-parameter window 'quit-restore nil) > ;; Select old window. > ;; If the previously selected window is still alive, select it. > (window--quit-restore-select-window quit-restore-2)) > (t > ;; Show some other buffer in WINDOW and reset the quit-restore > ;; parameter. > - (set-window-parameter window 'quit-restore nil) > ;; Make sure that WINDOW is no more dedicated. > (set-window-dedicated-p window nil) > ;; Try to switch to a previous buffer. Delete the window only if > > But the proper fix for other problems would be to replace the window > parameter `quit-restore' currently shared by all buffers in the same window > by a stack where every window buffer should keep own quit-restore data. > There is already such a stack in `window-prev-buffers', so a possible > solution would be to add quit-restore data to each buffer > in window-prev-buffers. > > Alternatively, it would be nice to have an option that would prevent > overwriting the initial value of the window parameter `quit-restore', > thus `quit-restore-window' could delete the window regardless of > how many buffers were displayed in that window, like it does in case > of dedicated windows.