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#48493: 28.0.50; quit-window doesn't work Date: Tue, 18 May 2021 10:01:20 +0200 Message-ID: References: <87h7j0wwkf.fsf@gmail.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------11B089DAD4F45D53CA98E2B5" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="12120"; mail-complaints-to="usenet@ciao.gmane.io" To: Sujith Manoharan , 48493@debbugs.gnu.org, pillule Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Tue May 18 10:02:39 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 1liugX-0002v1-Fo for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 18 May 2021 10:02:37 +0200 Original-Received: from localhost ([::1]:49232 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1liugW-0001Dg-6B for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 18 May 2021 04:02:36 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:41076) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1liufz-0001DB-5Q for bug-gnu-emacs@gnu.org; Tue, 18 May 2021 04:02:03 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:42847) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1liufy-00067y-Ly for bug-gnu-emacs@gnu.org; Tue, 18 May 2021 04:02:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1liufy-0002v5-K6 for bug-gnu-emacs@gnu.org; Tue, 18 May 2021 04:02:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: martin rudalics Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 18 May 2021 08:02:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48493 X-GNU-PR-Package: emacs Original-Received: via spool by 48493-submit@debbugs.gnu.org id=B48493.162132489611142 (code B ref 48493); Tue, 18 May 2021 08:02:02 +0000 Original-Received: (at 48493) by debbugs.gnu.org; 18 May 2021 08:01:36 +0000 Original-Received: from localhost ([127.0.0.1]:54379 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1liufY-0002te-BZ for submit@debbugs.gnu.org; Tue, 18 May 2021 04:01:36 -0400 Original-Received: from mout.gmx.net ([212.227.15.15]:56113) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1liufV-0002tO-GC for 48493@debbugs.gnu.org; Tue, 18 May 2021 04:01:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1621324883; bh=eUZhD6kn6qpa4OqQuFg+gAC0kRYkpxIZmGYmgv9BNU0=; h=X-UI-Sender-Class:Subject:To:References:From:Date:In-Reply-To; b=MQGQyhS1SXtb8DQDaLtcaz2ua/YT42s56gpi+ujgOhv/FGy1UcCCbwX3sPKmS5Cgz 59u2mtc4VnND7exOZp3gh4xf4qEFIXFFMnRoo9DeERTMWsuXA2LFkbxANpDVvc5PnZ YSCV0zfqa4wkSrkfvdIZwqSHpPe2Htj7ahPs23wU= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Original-Received: from [192.168.1.100] ([213.142.96.212]) by mail.gmx.net (mrgmx004 [212.227.17.190]) with ESMTPSA (Nemesis) id 1Mo6v3-1l6my015FD-00pbAU; Tue, 18 May 2021 10:01:23 +0200 In-Reply-To: <87h7j0wwkf.fsf@gmail.com> Content-Language: en-US X-Provags-ID: V03:K1:7fjRlEGfi25A/Ukpl9BFMETNLzDbug++IMf76FxkmRMUJH65oxa WOsqhQdJfcp0TaqwB1UBL+wapkSSTNzuTVeLVQTzsCUuhc/AB5rfyOWfdbJxO5cbJ1g40NZ omU0hjygqdrTJK3a2mVnq6WCtw4wUfE9iMx7IVNZtfso0Ml7CFic435j4iG2r+NgOVshMXN io3USVqHFq6siPTJwwnSg== X-UI-Out-Filterresults: notjunk:1;V03:K0:QoRh4GFgLTI=:s08AMnPQDvX2G4NUtiNUgQ kVVKZ9NL0CJjZIbHvUecGcWRO2i8cWlPQUvfZ7qA4bSmgxWj2diRSn7veeeNF4VtQvSr94ANa BMNDTfyES9IfuvaUeSXrXqjHGH7B3xfjzZdX4oDObGAN2Hkg4fPgLaISSYibbm3wtbNvoXI+0 Dno0oC2wNDkgrkusCUGx+B48wEtd/YT3Deo/FOgfOoS2MajKYRwppNaj2DWc7AjVYTCyGw8KB H4CgJh3bBPL8k9dEB6vrZygLn4XINGc6InVS093+G+wy8T9q5VlBDV/mw71ZMqHfOdVpQLcHp 9Qoaf3tBf1YcDUMorp7cIy/jc3LF3QJQOreDTWNOaL+gCGJWfgnAnWVsgnDmpHVjOPXILQafo 9WarY6eOoYfjEydWMbkNBA2O7tgq6K58izIRHTWwYxNlg43WUYLn6QDfs3UeoGivq+Gfh38aX aUGb/lCNx43MyYJ8+dDEe2l+vBabv2oOJXyp31Ny7GzXIsk8szjupvKx4kWzd+FDOsDxW8Hjd 0sbI38RKpir6aZ/ESetKtWmVvZy8f9Nh0nNDvanEj4cGsT/TJyN4oFyx66hXbwLRwxz8qP9Cu hlw5E8V7A+eJ9M0gQk9IaDlJFKJIWesHxqsZpACXljIyAelN/C06Dt+iyJBeO+komlxOb3kNS 6HQe6F0kGnpUqVgdVbgGWlNuccizafEjF8RPfkaxnuUQz/+iL6raPf2PClEBftur8NZu6anMg 7zJ/gD41dkIderqZstugjfUu/vD4avOn2m3ZtmL/Gd7wf6Vbv2asJqiYm7ch4rwEyzro4vaN 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:206761 Archived-At: This is a multi-part message in MIME format. --------------11B089DAD4F45D53CA98E2B5 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit > quit-window doesn't work properly with the master branch. > > To see the issue with emacs -Q, in any git repo: > > * C-x v L > * C-x 1 (if the screen is split). > * Hitting 'q' now doesn't close the window. > > Looks like commit 0a681590268a4039f95a5a919b6b6d4f4e880d4c is > the problem. Right. Can you try the attached patch? pillule, please also have a look into this. Thanks for the report, martin --------------11B089DAD4F45D53CA98E2B5 Content-Type: text/x-patch; name="quit-restore-window.diff" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="quit-restore-window.diff" diff --git a/lisp/window.el b/lisp/window.el index 026cde5901..8a767140bc 100644 =2D-- a/lisp/window.el +++ b/lisp/window.el @@ -5110,8 +5110,7 @@ quit-restore-window (set-window-parameter window 'quit-restore nil) ;; Make sure that WINDOW is no more dedicated. (set-window-dedicated-p window nil) - (if prev-buffer - (switch-to-prev-buffer window bury-or-kill) + (unless (switch-to-prev-buffer window bury-or-kill) ;; Delete WINDOW if there is no previous buffer (Bug#48367). (window--delete window nil (eq bury-or-kill 'kill))))) --------------11B089DAD4F45D53CA98E2B5--