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: Wed, 9 Jun 2021 10:33:37 +0200 Message-ID: <3f8bf130-2723-27ed-8333-5db4de3515d8@gmx.at> References: <87h7j0wwkf.fsf@gmail.com> <87cztg41zy.fsf@host.localdomain> <878s434ls1.fsf@host.localdomain> <877djn3r3i.fsf@host.localdomain> <8735u94gt4.fsf@host.localdomain> <87r1hd8bsd.fsf@riseup.net> <87bl8gzov4.fsf@riseup.net> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="8277"; mail-complaints-to="usenet@ciao.gmane.io" Cc: Sujith Manoharan , 48493@debbugs.gnu.org To: pillule Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Wed Jun 09 10:34:12 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 1lqtf9-0001qy-Sa for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 09 Jun 2021 10:34:11 +0200 Original-Received: from localhost ([::1]:34862 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lqtf8-0000w9-US for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 09 Jun 2021 04:34:10 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:46322) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lqtf0-0000w1-Qm for bug-gnu-emacs@gnu.org; Wed, 09 Jun 2021 04:34:02 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:48859) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lqtf0-0004wp-3Z for bug-gnu-emacs@gnu.org; Wed, 09 Jun 2021 04:34:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lqtez-0000Vm-Pp for bug-gnu-emacs@gnu.org; Wed, 09 Jun 2021 04:34:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: martin rudalics Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 09 Jun 2021 08:34:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48493 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: fixed Original-Received: via spool by 48493-submit@debbugs.gnu.org id=B48493.16232276341950 (code B ref 48493); Wed, 09 Jun 2021 08:34:01 +0000 Original-Received: (at 48493) by debbugs.gnu.org; 9 Jun 2021 08:33:54 +0000 Original-Received: from localhost ([127.0.0.1]:60405 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lqter-0000VN-Rb for submit@debbugs.gnu.org; Wed, 09 Jun 2021 04:33:54 -0400 Original-Received: from mout.gmx.net ([212.227.17.20]:54911) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lqtem-0000V5-9f for 48493@debbugs.gnu.org; Wed, 09 Jun 2021 04:33:51 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1623227619; bh=tIi0PFvfrsUnufSh+jElTx/ufJhbKdJWlSOUR9Vfy3c=; h=X-UI-Sender-Class:Subject:To:Cc:References:From:Date:In-Reply-To; b=NnY7WD9PGsACkIjnE7W85etL4UXbAFbYjWXX0v+43XJde5eGy+/OpzFaX9prjcbia 7tWhnonTDjlE2R+SPCoLnzwKWfOkZAiZiL3XxhSvirW9FL6p7BVfvUHDXbACZRB5lf jQ6NafqJCRdmcNdOl18+I21EuLWH4JUMTmn5QRDE= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Original-Received: from [192.168.1.100] ([212.95.5.113]) by mail.gmx.net (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1McH5Q-1lL7fz0IkW-00cka6; Wed, 09 Jun 2021 10:33:39 +0200 In-Reply-To: <87bl8gzov4.fsf@riseup.net> Content-Language: en-US X-Provags-ID: V03:K1:P5Er0IiU1VZ8MRxCi27zH3ZnR6PKKiEIhk2e7SwkURjRcVSnb/L QzDZ9ea523MSKqD3SmpXPlu1UDlbYsFVb0QryB/+ObCQHThiZw6RXvIhPXLzSwOm2c1KdRA RfZ3Gei2jGTZsWwy8pGiC6QAwzyAudhjmZIUwEaa8V5jJbq6VmpAgEiqvlaO7/n/FLKkQic sRnRITFpK1OYuQblF1TXg== X-UI-Out-Filterresults: notjunk:1;V03:K0:qg/t3TRXQI0=:s8AUXiznGxE12jzVua1z1N 7e8LVQzCh6Th3YOhwHp3/f6M9NMcQCT84onEeBd2yRlYPSfpYsHAo9CnBuoIbZXp8PjtrbqCD Yy0f5nifKOF/3yjWfI1RqnqOIGOvdZooV1of9Zuq50tjot0//5gVpmGILVK7EN2UGI/zCVfCp k7Hqf8KGJY03Z8AkB/EykM0FaOddrvBZNIDiOOJ8iStWLp3xHFsk0FKDc4HPTJMxA9g7/BDnY 0O4cg1f/a6vHQtAyjQPWZZuyG5UUivQ4T4DyMo5LQPhqBWl+9/OE2fAYTctAED1399xBtoGbX F7AQOoe/t6qqzpTdrehWkY9LKd9zhtyR4nCYRoVSBMqa3eY100VXp1sPGtm+bZ5WNAvJ70Ogc YKVYidl5qUmkaHibbx7Ls8/mhGktIoy6gxRi0+MgJF2ChrqMZ7UvMgTvoh0LJEKC0yKT8jA+8 zedaEvW5wPPZqTrjfmWSXo0gFfgWKLTfouP+xrt5W5N6FCH+3TeqBU8IDO4ffYuTEdzc/2Tha HBmw480T52OmwBc9KOrR1gROUTMIkSSMD6Kj0itKlwO8389O7qQ7oKeq1S91ibtnDire30ypx V2G77N/iPtEEswz9hCsPjf+Aoj3Ii5cmVcir0wvN/GxNklpmSRIu9HgQzGvlVcf5Y3DfFzFac YdkRNyTnTZDW07TTZBKtRVTqAH7TgnhlyqZRu9n2ZEqSAX/VG/TOcZzJMXpFCyST26EIWmaQ5 VOTU0qNWVi51Xl93tArgTrLLj+VwEjzoEZitTVqKj+90Yn+m5vFf1jkNHGk5r5gFA6faayvW 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:208272 Archived-At: Thanks for the patches. Please follow ELi's suggestions first, I'll then comment on the manual changes. - (current (eq (window-buffer window) (current-buffer)))) + (current (eq (window-buffer window) (current-buffer))) + (dedicated (window-dedicated-p window))) (set-window-buffer window buffer) + ;; restore the dedicated side flag + (when (eq dedicated 'side) + (set-window-dedicated-p window 'side)) Here you could use the 'dedicated-side' solution you used below in `replace-buffer-in-windows'. + (or ;; 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))) + (cond + ((and (not prev-buffer) + (eq (nth 1 quit-restore) 'tab) + (eq (nth 3 quit-restore) buffer)) + (tab-bar-close-tab) + ;; If the previously selected window is still alive, select it. + (when (window-live-p (nth 2 quit-restore)) + (select-window (nth 2 quit-restore)))) What's wrong with putting the first disjunct into the conditional as in the below? In general, always try to avoid larger indentation changes - they can make forensics cumbersome while bisecting. (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)))) ((and (not prev-buffer) (eq (nth 1 quit-restore) 'tab) (eq (nth 3 quit-restore) buffer)) BTW, how's your paperwork process proceeding? martin