From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Matthias Meulien Newsgroups: gmane.emacs.bugs Subject: bug#52148: Acknowledgement (29.0.50; [PATCH] Make `project-kill-buffers' display list of buffers to kill) Date: Sun, 28 Nov 2021 21:25:48 +0100 Message-ID: <87fsrgkoxf.fsf@gmail.com> References: <87zgppl1ag.fsf@gmail.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="33952"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/29.0.50 (gnu/linux) To: 52148@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sun Nov 28 21:26:10 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 1mrQkU-0008dI-5H for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 28 Nov 2021 21:26:10 +0100 Original-Received: from localhost ([::1]:38002 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mrQkS-0001QD-H1 for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 28 Nov 2021 15:26:08 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:59710) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mrQkM-0001Q5-MJ for bug-gnu-emacs@gnu.org; Sun, 28 Nov 2021 15:26:02 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:53095) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mrQkM-0001WP-ED for bug-gnu-emacs@gnu.org; Sun, 28 Nov 2021 15:26:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mrQkM-0003Hv-Ae for bug-gnu-emacs@gnu.org; Sun, 28 Nov 2021 15:26:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Matthias Meulien Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 28 Nov 2021 20:26:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52148 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch X-Debbugs-Original-To: help-debbugs@gnu.org (GNU bug Tracking System) X-Debbugs-Original-Cc: 52148@debbugs.gnu.org Original-Received: via spool by 52148-submit@debbugs.gnu.org id=B52148.163813115812629 (code B ref 52148); Sun, 28 Nov 2021 20:26:02 +0000 Original-Received: (at 52148) by debbugs.gnu.org; 28 Nov 2021 20:25:58 +0000 Original-Received: from localhost ([127.0.0.1]:36408 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mrQkI-0003Hc-9P for submit@debbugs.gnu.org; Sun, 28 Nov 2021 15:25:58 -0500 Original-Received: from mail-wr1-f48.google.com ([209.85.221.48]:41886) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mrQkF-0003HP-QW for 52148@debbugs.gnu.org; Sun, 28 Nov 2021 15:25:56 -0500 Original-Received: by mail-wr1-f48.google.com with SMTP id a9so32105685wrr.8 for <52148@debbugs.gnu.org>; Sun, 28 Nov 2021 12:25:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=0Z8jWywP1rqkk/4I2UfxdtMVJgtZ3qVZulZTzfZMtaQ=; b=dVDvzBhjKwYtmRZVJOTy1PCjeNh7zLzXF/77eTz2Zuv3fg++fb3kyUg5c13uPLdCHd YqsHb+BFD+rysNqOEpJdFDO1o57j/gMK0Ps65T9NtHtysFbgMAAVFjt9mt2DZ9OL3/fy V2glTnZaQUzTIt1zHZjRvglJ0aY79cklwJOmBX5CS31d0ZuQ/Xq1M/aE/s13LNaN/jqD udtDFxU0ZiUFERWIdkAAoBnKBBRpwRX33TtgYPMdIRgFoZaZTySvbSidLV18S/w+LZ8N qSTx4Yc8B3gDDawQrXJb8RfaiQ3o/MJ5p+nwnh8SeMNnuEfFIp9shGX3fWPNtLoKhFpr 7oFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=0Z8jWywP1rqkk/4I2UfxdtMVJgtZ3qVZulZTzfZMtaQ=; b=F3/+a8xF+Bf5emBb8RHqtXYCG6dukQBVXs62iBtJpNr/7K2PSrX6Glzuu1qSsgY97i 3476UX4aVVdjM0sgQrosuvWAp4YKIgD0PzLQ0jiq+F9LL2PPcZTulOQRECS0zNbVrEY+ 1gg0KtTE3oymw8Hd8QzuCjCHymfWuinSD5fqiAtProc2PBBWWprgLjn+o2aqVPlcmkIP clmtft+ogrLPhxwAGV4JBlkruE0PpLB2zexIRuvp4L/ddtgRTrrl5POAzHHd1tZ860CA XBkUY9JQf69+uz8JywOu5VM7TEtlUi+yke/p0bbR0YR1Hz9juwBbmfmHhgLmTtyBHnIE Y+gg== X-Gm-Message-State: AOAM532py2x3udRJgiXNYVmbx3/XMHOApv8ZMMEfsMFjVGmH6L37CCOC Pno8meoDB8/LiztsYxeIorf1VWOSthQ= X-Google-Smtp-Source: ABdhPJxsbHJvzlpytnRf/SPvLCjfYIT0l+/zd+2pS0hdPb4xVIl7Vixju1x0Oa22s0vDRxGdtLRgig== X-Received: by 2002:a5d:64ea:: with SMTP id g10mr29277078wri.137.1638131149887; Sun, 28 Nov 2021 12:25:49 -0800 (PST) Original-Received: from carbon.localdomain ([2a01:e0a:245:c850:98f5:429a:aa8e:95bb]) by smtp.gmail.com with ESMTPSA id m7sm11994592wml.38.2021.11.28.12.25.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Nov 2021 12:25:49 -0800 (PST) In-Reply-To: (GNU bug Tracking System's message of "Sat, 27 Nov 2021 21:47:02 +0000") 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:220977 Archived-At: --=-=-= Content-Type: text/plain Patch update: After I introduced the user option, the code was broken and buffers killed whatever the user answered. --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-project-kill-buffers-can-display-list-of-buffers-to-.patch >From 65225000aabd1464bb81b655b5c0e7103bea4333 Mon Sep 17 00:00:00 2001 From: Matthias Meulien Date: Sat, 27 Nov 2021 22:43:20 +0100 Subject: [PATCH] project-kill-buffers can display list of buffers to kill * lisp/progmodes/project.el (project-kill-buffers-display-buffer-list): Option to toggle temporarily display of the list of buffers to kill when calling project-kill-buffers (project-kill-buffers): Handle project-kill-buffers-display-buffer-list option --- etc/NEWS | 4 ++++ lisp/progmodes/project.el | 39 +++++++++++++++++++++++++++++++++++---- 2 files changed, 39 insertions(+), 4 deletions(-) diff --git a/etc/NEWS b/etc/NEWS index 87a7a43a5e..2bc1e0046a 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -427,6 +427,10 @@ it with new 'term-{faint,italic,slow-blink,fast-blink}' faces. *** 'project-find-file' and 'project-or-external-find-file' now accept a prefix argument which is interpreted to mean "include all files". +*** 'project-kill-buffers' can display the list of buffers to kill. +Customize the user option 'project-kill-buffers-display-buffer-list' +to enable the display of the buffer list. + +++ *** New command 'xref-go-forward'. It is bound to 'C-M-,' and jumps to the location where 'xref-go-back' diff --git a/lisp/progmodes/project.el b/lisp/progmodes/project.el index ed076a683d..fba9c7b2f5 100644 --- a/lisp/progmodes/project.el +++ b/lisp/progmodes/project.el @@ -1210,6 +1210,15 @@ project-kill-buffer-conditions :group 'project :package-version '(project . "0.6.0")) +(defcustom project-kill-buffers-display-buffer-list nil + "Non-nil to display list of buffers to kill before killing project buffers. +Used by `project-kill-buffers'." + :type 'boolean + :version "29.1" + :group 'project + :package-version '(project . "0.8.1") + :safe #'booleanp) + (defun project--buffer-list (pr) "Return the list of all buffers in project PR." (let ((conn (file-remote-p (project-root pr))) @@ -1276,14 +1285,36 @@ project-kill-buffers interactively." (interactive) (let* ((pr (project-current t)) - (bufs (project--buffers-to-kill pr))) + (bufs (project--buffers-to-kill pr)) + (query-user (lambda () + (yes-or-no-p + (format "Kill %d buffers in %s? " + (length bufs) + (project-root pr))))) + (confirm)) (cond (no-confirm (mapc #'kill-buffer bufs)) ((null bufs) (message "No buffers to kill")) - ((yes-or-no-p (format "Kill %d buffers in %s? " - (length bufs) - (project-root pr))) + (project-kill-buffers-display-buffer-list + (when + (with-current-buffer-window + (get-buffer-create "*Buffer List*") + `(display-buffer--maybe-at-bottom + (dedicated . t) + (window-height . (fit-window-to-buffer)) + (preserve-size . (nil . t)) + (body-function + . ,#'(lambda (_window) + (list-buffers-noselect nil bufs)))) + #'(lambda (window _value) + (with-selected-window window + (unwind-protect + (funcall query-user) + (when (window-live-p window) + (quit-restore-window window 'kill)))))) + (mapc #'kill-buffer bufs))) + ((funcall query-user) (mapc #'kill-buffer bufs))))) -- 2.30.2 --=-=-= Content-Type: text/plain -- Matthias --=-=-=--