* tree-sitter branch broken
@ 2022-10-29 8:09 Eli Zaretskii
2022-10-29 8:26 ` Theodor Thornhill via Emacs development discussions.
0 siblings, 1 reply; 3+ messages in thread
From: Eli Zaretskii @ 2022-10-29 8:09 UTC (permalink / raw)
To: Yuan Fu; +Cc: emacs-devel
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'
make[3]: Entering directory `/d/gnu/git/emacs/feature/lisp'
make[3]: Nothing to be done for `compile-targets'.
make[3]: Leaving directory `/d/gnu/git/emacs/feature/lisp'
make[3]: Entering directory `/d/gnu/git/emacs/feature/lisp'
ELC progmodes/js.elc
ELC progmodes/python.elc
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
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
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
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.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: tree-sitter branch broken
2022-10-29 8:09 tree-sitter branch broken Eli Zaretskii
@ 2022-10-29 8:26 ` Theodor Thornhill via Emacs development discussions.
2022-10-29 16:12 ` Yuan Fu
0 siblings, 1 reply; 3+ messages in thread
From: Theodor Thornhill via Emacs development discussions. @ 2022-10-29 8:26 UTC (permalink / raw)
To: Eli Zaretskii, Yuan Fu; +Cc: emacs-devel
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: tree-sitter branch broken
2022-10-29 8:26 ` Theodor Thornhill via Emacs development discussions.
@ 2022-10-29 16:12 ` Yuan Fu
0 siblings, 0 replies; 3+ messages in thread
From: Yuan Fu @ 2022-10-29 16:12 UTC (permalink / raw)
To: Theodor Thornhill; +Cc: Eli Zaretskii, emacs-devel
> 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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-10-29 16:12 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-10-29 8:09 tree-sitter branch broken Eli Zaretskii
2022-10-29 8:26 ` Theodor Thornhill via Emacs development discussions.
2022-10-29 16:12 ` Yuan Fu
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).