From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Theodor Thornhill via "Emacs development discussions." Newsgroups: gmane.emacs.devel Subject: Re: tree-sitter branch broken Date: Sat, 29 Oct 2022 10:26:15 +0200 Message-ID: <87edurxcgo.fsf@thornhill.no> References: <83bkpvhx0b.fsf@gnu.org> Reply-To: Theodor Thornhill Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="5277"; mail-complaints-to="usenet@ciao.gmane.io" Cc: emacs-devel@gnu.org To: Eli Zaretskii , Yuan Fu Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sat Oct 29 10:27:18 2022 Return-path: Envelope-to: ged-emacs-devel@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 1oohBV-0001FD-Lg for ged-emacs-devel@m.gmane-mx.org; Sat, 29 Oct 2022 10:27:17 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oohAn-0005kq-Ps; Sat, 29 Oct 2022 04:26:33 -0400 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 1oohAd-0005Zk-Rt for emacs-devel@gnu.org; Sat, 29 Oct 2022 04:26:24 -0400 Original-Received: from out2.migadu.com ([188.165.223.204]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oohAc-00034F-7A; Sat, 29 Oct 2022 04:26:23 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. In-Reply-To: <83bkpvhx0b.fsf@gnu.org> Received-SPF: pass client-ip=188.165.223.204; envelope-from=theo@thornhill.no; helo=out2.migadu.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: "Emacs-devel" Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.devel:298741 Archived-At: Hi Eli! > The current branch seems to be broken by the penultimate commit: > > ELC treesit.elc > > In end of data: > treesit.el: Warning: the function `,' is not known to be defined. > make[3]: Leaving directory `/d/gnu/git/emacs/feature/lisp' > Function provided is already compiled > Function provided is already compiled > Function provided is already compiled > Function provided is already compiled > Function provided is already compiled > > It compiles cleanly if I revert the last two commits. > Yeah, this seems to be the culprit: Feel free to apply if you want :-) diff --git a/lisp/treesit.el b/lisp/treesit.el index 264935f185..5c1cdf3a4d 100644 --- a/lisp/treesit.el +++ b/lisp/treesit.el @@ -724,10 +724,10 @@ treesit-simple-indent-presets (and (or (null node-t) (string-match-p node-t (or (treesit-node-type node) ""))) - (or (null ,parent-t) + (or (null parent-t) (string-match-p parent-t (treesit-node-type parent))) - (or (null ,grand-parent-t) + (or (null grand-parent-t) (string-match-p grand-parent-t (treesit-node-type -- Theo