From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Yuan Fu Newsgroups: gmane.emacs.devel Subject: Re: tree-sitter branch broken Date: Sat, 29 Oct 2022 09:12:30 -0700 Message-ID: <5A6D8FD9-CA2B-4DBA-987E-C765FB80997B@gmail.com> References: <83bkpvhx0b.fsf@gnu.org> <87edurxcgo.fsf@thornhill.no> Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3696.120.41.1.1\)) Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="5806"; mail-complaints-to="usenet@ciao.gmane.io" Cc: Eli Zaretskii , emacs-devel@gnu.org To: Theodor Thornhill Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sat Oct 29 18:13: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 1oooSS-0001J1-9z for ged-emacs-devel@m.gmane-mx.org; Sat, 29 Oct 2022 18:13:16 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oooRp-0002R8-TI; Sat, 29 Oct 2022 12:12:37 -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 1oooRo-0002PW-60 for emacs-devel@gnu.org; Sat, 29 Oct 2022 12:12:36 -0400 Original-Received: from mail-pj1-x1034.google.com ([2607:f8b0:4864:20::1034]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oooRm-00080K-JC; Sat, 29 Oct 2022 12:12:35 -0400 Original-Received: by mail-pj1-x1034.google.com with SMTP id b11so7089720pjp.2; Sat, 29 Oct 2022 09:12:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=WCUBELdRca751Ideb04goBUV3rht+CwdxLQZ6IvaRV4=; b=p9PhZVB5DNaeU1YyVJ46pZBwom1beXaNWbXMKwswT5PlYtXl+2kxH4i5MW3TELI41V I1TbOQ391rsr51xmSFVmJIKbBX6plTHS7wuRV15d1Vzcx3tZO82DfrHEA5SdHAPUNASC gJRON+UlmiDbrd8NIqx4Qq+x7I+DLdU054MCry/ghZRdMg9aVqWDB9uAhJelK8HvaCkl BP1hnk3TEZfbpkCGFr6ydbp9T5r5c6gSxgtv/rxn2jsO0WyKUaDqyVAyCPBb6wbGf2t9 TM/wgvnsITdP8gtGQ4BWZO7RL6wkCB14TTou+88H/6IbqRdT30r4orCVO7/A5L7tVB+f KNNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=WCUBELdRca751Ideb04goBUV3rht+CwdxLQZ6IvaRV4=; b=m4lYsW2gzzPvZ/ZJGiSMHGPLLbsFlds1uo2vS5qf0AIiMQQO3m6/u4MKL7J4WuKRms egbb4lNpJ9fN05QcALyxlsKdEde5u/V79mz41GD3aeauhE+kpNE8LQb7C+6jktIVTAO9 ODdj8tOB9MY0aIkYAWsKTm8KjeLnVtcTThdm3TvudXEDqaEsbPAi3qAH+Qq2aNx2f+yO axvlPrp2hel+2LEFrLgfxCIEAE/U2rEnh66sLi0hs5JJWxGCLMn5QVsyKUUokiQjCpvn Yg7mHs9OBp1/EMA8/y41Q8UH89qGmsAlSArQ55Q0Ahxe6rvyTHz/FRuFRxopyGAN7m0n gH0A== X-Gm-Message-State: ACrzQf1/0Jj+TcyWBuuJ7GaxduVx2LblmhRJ6a6qO3yN6NctI0yE+wwo 9u8Lj2u4LdimBfsMCPi3e7ZOB+nq1Bg= X-Google-Smtp-Source: AMsMyM5NA/sqXZkpUin8tXh51WNF//qBPIMzFm6Jasc2o9PPByTLSn9kyTAqG2KVvCfEBURCSE60Aw== X-Received: by 2002:a17:90b:4a92:b0:213:2421:5f38 with SMTP id lp18-20020a17090b4a9200b0021324215f38mr5577269pjb.10.1667059952739; Sat, 29 Oct 2022 09:12:32 -0700 (PDT) Original-Received: from smtpclient.apple (cpe-172-117-161-177.socal.res.rr.com. [172.117.161.177]) by smtp.gmail.com with ESMTPSA id f26-20020aa7969a000000b0056bfd4a2702sm1384627pfk.45.2022.10.29.09.12.31 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 29 Oct 2022 09:12:32 -0700 (PDT) In-Reply-To: <87edurxcgo.fsf@thornhill.no> X-Mailer: Apple Mail (2.3696.120.41.1.1) Received-SPF: pass client-ip=2607:f8b0:4864:20::1034; envelope-from=casouri@gmail.com; helo=mail-pj1-x1034.google.com 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=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:298768 Archived-At: > On Oct 29, 2022, at 1:26 AM, Theodor Thornhill = wrote: >=20 > Hi Eli! >=20 >> The current branch seems to be broken by the penultimate commit: >>=20 >> ELC treesit.elc >>=20 >> 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 >>=20 >> It compiles cleanly if I revert the last two commits. >>=20 >=20 > Yeah, this seems to be the culprit: >=20 > Feel free to apply if you want :-) >=20 > 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 >=20 >=20 > --=20 > Theo Yes, sorry, I somehow didn=E2=80=99t catch the warning when make-ing. = I=E2=80=99ve pushed the fix. Yuan=