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#59935: 29.0.60; project-list-buffers is slow Date: Sun, 11 Dec 2022 19:07:27 +0200 Organization: LINKOV.NET Message-ID: <86bko9na29.fsf@mail.linkov.net> References: <86a63vi2lu.fsf@mail.linkov.net> <4a78ffcc-15fb-27ac-48b9-82fe84c596aa@yandex.ru> 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="23185"; 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: 59935@debbugs.gnu.org To: Dmitry Gutov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sun Dec 11 18:16:22 2022 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 1p4Pw6-0005te-7o for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 11 Dec 2022 18:16:22 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p4Pvo-0002Fw-LS; Sun, 11 Dec 2022 12:16:04 -0500 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 1p4Pvn-0002FQ-28 for bug-gnu-emacs@gnu.org; Sun, 11 Dec 2022 12:16:03 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p4Pvm-0006jh-NU for bug-gnu-emacs@gnu.org; Sun, 11 Dec 2022 12:16:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p4Pvm-0006o0-GN for bug-gnu-emacs@gnu.org; Sun, 11 Dec 2022 12:16:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Juri Linkov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 11 Dec 2022 17:16:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59935 X-GNU-PR-Package: emacs Original-Received: via spool by 59935-submit@debbugs.gnu.org id=B59935.167077894326151 (code B ref 59935); Sun, 11 Dec 2022 17:16:02 +0000 Original-Received: (at 59935) by debbugs.gnu.org; 11 Dec 2022 17:15:43 +0000 Original-Received: from localhost ([127.0.0.1]:47146 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p4PvT-0006nj-0B for submit@debbugs.gnu.org; Sun, 11 Dec 2022 12:15:43 -0500 Original-Received: from relay9-d.mail.gandi.net ([217.70.183.199]:44843) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p4PvF-0006nQ-It for 59935@debbugs.gnu.org; Sun, 11 Dec 2022 12:15:40 -0500 Original-Received: (Authenticated sender: juri@linkov.net) by mail.gandi.net (Postfix) with ESMTPSA id 36514FF803; Sun, 11 Dec 2022 17:15:20 +0000 (UTC) In-Reply-To: <4a78ffcc-15fb-27ac-48b9-82fe84c596aa@yandex.ru> (Dmitry Gutov's message of "Sat, 10 Dec 2022 21:22:20 +0200") 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:250629 Archived-At: --=-=-= Content-Type: text/plain > Do you have the time to finish the fix yourself? It was your feature, after > all. Here is a complete patch tested for all possible cases: - emacs 28/29 - with/without file arg - with/without reverting --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=Buffer-menu-buffer-list-function.patch diff --git a/lisp/progmodes/project.el b/lisp/progmodes/project.el index 38d4fdad5fc..64af86558e4 100644 --- a/lisp/progmodes/project.el +++ b/lisp/progmodes/project.el @@ -1321,18 +1321,31 @@ project-list-buffers start with a space (which are for internal use). With prefix argument ARG, show only buffers that are visiting files." (interactive "P") - (let ((pr (project-current t))) + (let* ((pr (project-current t)) + (buffer-list-function + (lambda () + (seq-filter + (lambda (buffer) + (let ((name (buffer-name buffer)) + (file (buffer-file-name buffer))) + (and (or (not (string= (substring name 0 1) " ")) + file) + (not (eq buffer (current-buffer))) + (or file (not Buffer-menu-files-only))))) + (project-buffers pr))))) (display-buffer (if (version< emacs-version "29.0.50") - (let ((buf (list-buffers-noselect arg (project-buffers pr)))) + (let ((buf (list-buffers-noselect + arg (let ((Buffer-menu-files-only arg)) + (funcall buffer-list-function))))) (with-current-buffer buf (setq-local revert-buffer-function (lambda (&rest _ignored) - (list-buffers--refresh (project-buffers pr)) + (list-buffers--refresh + (funcall buffer-list-function)) (tabulated-list-print t)))) buf) - (list-buffers-noselect - arg nil (lambda (buf) (memq buf (project-buffers pr)))))))) + (list-buffers-noselect arg buffer-list-function))))) (defcustom project-kill-buffer-conditions '(buffer-file-name ; All file-visiting buffers are included. diff --git a/lisp/buff-menu.el b/lisp/buff-menu.el index 588fe599a46..cabf7cb8fc4 100644 --- a/lisp/buff-menu.el +++ b/lisp/buff-menu.el @@ -100,12 +100,8 @@ Buffer-menu-files-only This is set by the prefix argument to `buffer-menu' and related commands.") -(defvar-local Buffer-menu-filter-predicate nil - "Function to filter out buffers in the buffer list. -Buffers that don't satisfy the predicate will be skipped. -The value should be a function of one argument; it will be -called with the buffer. If this function returns non-nil, -then the buffer will be displayed in the buffer list.") +(defvar-local Buffer-menu-buffer-list-function nil + "Function to return buffers for the buffer list.") (defvar-keymap Buffer-menu-mode-map :doc "Local keymap for `Buffer-menu-mode' buffers." @@ -623,23 +619,23 @@ Buffer-menu-view-other-window ;;; Functions for populating the Buffer Menu. ;;;###autoload -(defun list-buffers-noselect (&optional files-only buffer-list filter-predicate) +(defun list-buffers-noselect (&optional files-only buffer-list) "Create and return a Buffer Menu buffer. This is called by `buffer-menu' and others as a subroutine. If FILES-ONLY is non-nil, show only file-visiting buffers. -If BUFFER-LIST is non-nil, it should be a list of buffers; it -means list those buffers and no others. -If FILTER-PREDICATE is non-nil, it should be a function -that filters out buffers from the list of buffers. -See more at `Buffer-menu-filter-predicate'." +If BUFFER-LIST is non-nil, it should be either a list of buffers +or a function that returns a list of buffers; it means +list those buffers and no others. +See more at `Buffer-menu-buffer-list-function'." (let ((old-buffer (current-buffer)) (buffer (get-buffer-create "*Buffer List*"))) (with-current-buffer buffer (Buffer-menu-mode) (setq Buffer-menu-files-only (and files-only (>= (prefix-numeric-value files-only) 0))) - (setq Buffer-menu-filter-predicate filter-predicate) + (when (functionp buffer-list) + (setq Buffer-menu-buffer-list-function buffer-list)) (list-buffers--refresh buffer-list old-buffer) (tabulated-list-print)) buffer)) @@ -661,13 +657,17 @@ list-buffers--refresh (marked-buffers (Buffer-menu-marked-buffers)) (buffer-menu-buffer (current-buffer)) (show-non-file (not Buffer-menu-files-only)) - (filter-predicate (and (functionp Buffer-menu-filter-predicate) - Buffer-menu-filter-predicate)) entries name-width) ;; Collect info for each buffer we're interested in. - (dolist (buffer (or buffer-list - (buffer-list (if Buffer-menu-use-frame-buffer-list - (selected-frame))))) + (dolist (buffer (cond + ((functionp buffer-list) + (funcall buffer-list)) + (buffer-list) + (Buffer-menu-buffer-list-function + (funcall Buffer-menu-buffer-list-function)) + (t (buffer-list + (if Buffer-menu-use-frame-buffer-list + (selected-frame)))))) (with-current-buffer buffer (let* ((name (buffer-name)) (file buffer-file-name)) @@ -676,9 +676,7 @@ list-buffers--refresh (and (or (not (string= (substring name 0 1) " ")) file) (not (eq buffer buffer-menu-buffer)) - (or file show-non-file) - (or (not filter-predicate) - (funcall filter-predicate buffer))))) + (or file show-non-file)))) (push (list buffer (vector (cond ((eq buffer old-buffer) ".") --=-=-=--