[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: tree-sitter branch broken
From: |
Yuan Fu |
Subject: |
Re: tree-sitter branch broken |
Date: |
Sat, 29 Oct 2022 09:12:30 -0700 |
> On Oct 29, 2022, at 1:26 AM, Theodor Thornhill <theo@thornhill.no> wrote:
>
> 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
Yes, sorry, I somehow didn’t catch the warning when make-ing. I’ve pushed the
fix.
Yuan