From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: martin rudalics Newsgroups: gmane.emacs.bugs Subject: bug#52491: 28.0.90; Regression in window deletion with minibuffer Date: Mon, 20 Dec 2021 19:08:40 +0100 Message-ID: <1cba0ff2-3345-d2f4-f9a3-a61c79487a50@gmx.at> References: <865yrqsxmu.fsf@mail.linkov.net> <865yro7csh.fsf@mail.linkov.net> <83h7b8fngd.fsf@gnu.org> <86v8zo4bma.fsf@mail.linkov.net> <83fsqsfh8i.fsf@gnu.org> <86tuf73aen.fsf@mail.linkov.net> <83h7b7e8t2.fsf@gnu.org> <4318fa2c-0127-4a14-f65e-399b5c097028@gmx.at> <86sfupu8xi.fsf@mail.linkov.net> <9c2cbe85-b1a0-f147-69c8-0f26ab2e7c4d@gmx.at> <86wnk0frfj.fsf@mail.linkov.net> <0a55b1f4-dd66-62ed-591a-75438033e357@gmx.at> <86a6gwe9kl.fsf@mail.linkov.net> <9373956f-4999-4e0c-96f9-626f30d4cdb9@gmx.at> <83mtkv18xz.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------D0A66BC8912D2DABEE900221" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="14341"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 52491@debbugs.gnu.org, juri@linkov.net To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Mon Dec 20 20:01:29 2021 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 1mzNua-0003bv-Qs for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 20 Dec 2021 20:01:28 +0100 Original-Received: from localhost ([::1]:59672 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mzNuZ-0001LZ-Jm for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 20 Dec 2021 14:01:27 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:60888) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mzN5q-0002sp-Sl for bug-gnu-emacs@gnu.org; Mon, 20 Dec 2021 13:09:03 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:39845) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mzN5q-00027i-IE for bug-gnu-emacs@gnu.org; Mon, 20 Dec 2021 13:09:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mzN5q-000845-4c for bug-gnu-emacs@gnu.org; Mon, 20 Dec 2021 13:09:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: martin rudalics Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 20 Dec 2021 18:09:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52491 X-GNU-PR-Package: emacs Original-Received: via spool by 52491-submit@debbugs.gnu.org id=B52491.164002373630989 (code B ref 52491); Mon, 20 Dec 2021 18:09:02 +0000 Original-Received: (at 52491) by debbugs.gnu.org; 20 Dec 2021 18:08:56 +0000 Original-Received: from localhost ([127.0.0.1]:51391 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mzN5i-00083h-15 for submit@debbugs.gnu.org; Mon, 20 Dec 2021 13:08:56 -0500 Original-Received: from mout.gmx.net ([212.227.17.22]:36623) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mzN5c-00083K-Q0 for 52491@debbugs.gnu.org; Mon, 20 Dec 2021 13:08:53 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1640023722; bh=bvEpTZTiQO194K/1WkINL+biFQ7kqpono/mhZcRWPyU=; h=X-UI-Sender-Class:Subject:To:Cc:References:From:Date:In-Reply-To; b=NdCLuvlopMEeQpo8fjzvAaxj0vkPcu2awLK+JoX6EYWFyNKsR1rCAposCFF6V2Zy5 LiHb5iXMwivCVodmn+ncwrI0S+uRmE2HLY1dH0OzPCNbRvVh5B/dQnr/MT286dAyKl HZgp/yGNbftqSMP9XjbjmJtPGup2YNl+QqbTQVvA= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Original-Received: from [192.168.1.102] ([213.142.96.93]) by mail.gmx.net (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MtOGU-1mCDi8027K-00uoFX; Mon, 20 Dec 2021 19:08:42 +0100 In-Reply-To: <83mtkv18xz.fsf@gnu.org> Content-Language: en-US X-Provags-ID: V03:K1:+q5hjyvpePyNcLdMUtP+3wnsOBIcKNWLY2/H8fzxAsIHmdKjdr0 WIBKhrgO/0jnn1t3k1wLtEUIGRr4sObw5dE1dXHk2a1QMsfrbsm8dZxTxx4MpUOqt+Mx7pA R2I8Av8wfXj1ikYkflZHosvJe2NUzHTy8dO9cDvHrjsC3+tFEu08IHH2km5odRsuofMA/2k ifzLA7G/lBGBWt6GxC/MA== X-UI-Out-Filterresults: notjunk:1;V03:K0:kG8dsj4U0+0=:UPKokM3/BrcTgRguUVB/U0 Wgs/7GLQ1Tc1i3iTAmUWdwPYukM88ZCXi6C0nq81K7Iq8vPM3MuY1l9r0VY+BcqiCNvQIba5b SE/kRpDtv+th/TGydOGnj/nnM6aKqr03mh1fM77ZgSL7v/q8E4Pfz6nJHCWtVV7APPuzRdfuq SL/iRw5oD4YZDFxuoYjypiwSaNCQEZLmWJ1hFvmKEVfnfZPmLevVvkqEToGZN0pXNrqM/zlPQ /9uJf06IeH42SY7KpCUgJpelXZBUiZbOhVe5Qtk5MO5MGQ7ZIEKyIcu70MzAJSKqVsXwUDSAj 3sajx4a//zpjnEsDEyToHCOouWI8AIsJWS70ZfRwagEsbVHDlX4nkYW8IAxdvdD+veZ4v6FmE fuNNivE59Shzl47Dbu/uKezyjTyaN6znM7AssMmwKGAWpgiONL/vJtS3JBLIxdZ0kcqYOia57 rdjTHRJ/qWGmH81govSof4LbC/rXYcU94dJ+IDsTSEXQTy7iIRVPQr0qZJPhKQqS6ZFm0S51s dLwmCOlS0HZA5Ndvmp3ihYUBoNHw1BMJbgwepyvKpuE5ky1J8uMaZH39oveL6OEoK1W9U7nPp 8LF+wvXKT/N/Du49injPyY8Lnahh9Gz9yVn6zSc1JjUTTjrlG/k1dzlz9vvND+KJgh/FCw/5O w+EFHnRMrqiBpk/SrVf7RGsSHzaJhuWoVgDW8xoFJljKe0nv/Do+1uw+G7aqrd3O4L10EJo4n VQArBzOdb5MbYExLu+d647dtfr4GYCew/LL6PlqG6VA7w96DHoYBefN511mZ2TvnBzX4I6TT 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" Xref: news.gmane.io gmane.emacs.bugs:222799 Archived-At: This is a multi-part message in MIME format. --------------D0A66BC8912D2DABEE900221 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit > Do you think this is safe enough to install on the release branch? Probably not. I'm confused as to which posts made it today to the list. A correct patch is attached now and should be safe for Emacs 28. martin --------------D0A66BC8912D2DABEE900221 Content-Type: text/x-patch; name="quit-restore.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="quit-restore.diff" diff --git a/lisp/window.el b/lisp/window.el index d12232641e..901bc0fc4d 100644 --- a/lisp/window.el +++ b/lisp/window.el @@ -5167,7 +5167,10 @@ quit-restore-window (cond ;; First try to delete dedicated windows that are not side windows. ((and dedicated (not (eq dedicated 'side)) - (window--delete window 'dedicated (eq bury-or-kill 'kill)))) + (window--delete window 'dedicated (eq bury-or-kill 'kill)) + (or (and (window-live-p (nth 2 quit-restore)) + (select-window (nth 2 quit-restore))) + t))) ((and (not prev-buffer) (eq (nth 1 quit-restore) 'tab) (eq (nth 3 quit-restore) buffer)) --------------D0A66BC8912D2DABEE900221--