From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: ookami via "Bug reports for GNU Emacs, the Swiss army knife of text editors" Newsgroups: gmane.emacs.bugs Subject: bug#57714: [PATCH] Fix project-remember-projects-under recursive Date: Sat, 10 Sep 2022 15:46:35 +0800 Message-ID: <87a677fz8k.fsf@ookami.one> Reply-To: ookami Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="9294"; mail-complaints-to="usenet@ciao.gmane.io" To: 57714@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sat Sep 10 09:47:25 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 1oWvD2-0002Ct-O2 for geb-bug-gnu-emacs@m.gmane-mx.org; Sat, 10 Sep 2022 09:47:24 +0200 Original-Received: from localhost ([::1]:41332 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oWvD1-00043n-Nq for geb-bug-gnu-emacs@m.gmane-mx.org; Sat, 10 Sep 2022 03:47:23 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:51858) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oWvCg-00043H-Gb for bug-gnu-emacs@gnu.org; Sat, 10 Sep 2022 03:47:02 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:47815) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oWvCg-0007kc-5g for bug-gnu-emacs@gnu.org; Sat, 10 Sep 2022 03:47:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oWvCf-0002yJ-RS for bug-gnu-emacs@gnu.org; Sat, 10 Sep 2022 03:47:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: ookami Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 10 Sep 2022 07:47:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 57714 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.166279601011401 (code B ref -1); Sat, 10 Sep 2022 07:47:01 +0000 Original-Received: (at submit) by debbugs.gnu.org; 10 Sep 2022 07:46:50 +0000 Original-Received: from localhost ([127.0.0.1]:36514 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oWvCU-0002xp-1p for submit@debbugs.gnu.org; Sat, 10 Sep 2022 03:46:50 -0400 Original-Received: from lists.gnu.org ([209.51.188.17]:38398) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oWvCR-0002xh-PO for submit@debbugs.gnu.org; Sat, 10 Sep 2022 03:46:48 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:54246) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oWvCR-00042C-KK for bug-gnu-emacs@gnu.org; Sat, 10 Sep 2022 03:46:47 -0400 Original-Received: from ookami.one ([107.191.58.109]:44666) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oWvCP-0007jS-V2 for bug-gnu-emacs@gnu.org; Sat, 10 Sep 2022 03:46:47 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ookami.one; s=main; t=1662796000; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=8h4z7yBWI9ux9OqCFxTszK/ZVZajV/LHdCvMDT0M3Iw=; b=jg2KCslJi0CyVrTl3SnZpyZ/ufsZZg7l6+quJMX51G1uy9ovJi9UOYWzJUuNy6S3Ldiwc/ HuJieEoxMixArFfIt+fXSE+8HQs3+zReuwB5Ux+J+faH50CP4HWo2rF4AQgXLt6oQTCkTo E0J79Eg08f+RgNs6dtxF3WfoTToOaS+4/Nxzvf+KRPCpgnqXR4lBAGJ9318eSRnxD5gpAQ Iv2Gn3gA4tU69RIrRw9N99/nBovaQBELofpZzYnb4MBYt7zAfLxLXL76CK2QUOcI8jWGoB CY4kTBlJb4NdW+l6A5RLHVI59cqIoUmyMX3SpGEXu08vh/OTylPmC4f/WTo5nA== Original-Received: from localhost ( [219.140.34.221]) by ookami.one (OpenSMTPD) with ESMTPSA id 5d2df280 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for ; Sat, 10 Sep 2022 07:46:39 +0000 (UTC) Received-SPF: pass client-ip=107.191.58.109; envelope-from=mail@ookami.one; helo=ookami.one X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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:242085 Archived-At: >From 748928f579388b018f50265d0826075d5d12071c Mon Sep 17 00:00:00 2001 From: ookami Date: Sat, 10 Sep 2022 15:43:23 +0800 Subject: [PATCH] Fix project-remember-projects-under recursive --- lisp/progmodes/project.el | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/lisp/progmodes/project.el b/lisp/progmodes/project.el index 30f51704dc..d07acf361e 100644 --- a/lisp/progmodes/project.el +++ b/lisp/progmodes/project.el @@ -1498,7 +1498,9 @@ project-remember-projects-under projects." (interactive "DDirectory: \nP") (project--ensure-read-project-list) - (let ((queue (directory-files dir t nil t)) (count 0) + (let ((queue (directory-files + dir t directory-files-no-dot-files-regexp t)) + (count 0) (known (make-hash-table :size (* 2 (length project--list)) :test #'equal ))) @@ -1506,15 +1508,20 @@ project-remember-projects-under (puthash project t known)) (while queue (when-let ((subdir (pop queue)) - ((file-directory-p subdir)) - ((not (gethash subdir known)))) - (when-let (pr (project--find-in-directory subdir)) - (project-remember-project pr t) - (message "Found %s..." (project-root pr)) + ((file-directory-p subdir))) + (when-let ((project (project--find-in-directory subdir)) + (project-root (project-root project)) + ((not (gethash project-root known)))) + (project-remember-project project t) + (puthash project-root t known) + (message "Found %s..." project-root) (setq count (1+ count))) - (when (and recursive (file-symlink-p subdir)) - (setq queue (nconc (directory-files subdir t nil t) queue)) - (puthash subdir t known)))) + (when (and recursive (file-directory-p subdir)) + (setq queue + (nconc + (directory-files + subdir t directory-files-no-dot-files-regexp t) + queue))))) (unless (eq recursive 'in-progress) (if (zerop count) (message "No projects were found") -- 2.37.3