From: Yuan Fu <casouri@gmail.com>
Date: Sat, 18 Jan 2025 01:26:23 +0000 (-0800)
Subject: Remap language symbol in treesit-query-compile (bug#72388)
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a210f6e3a542b4dcc066989e8c1ebb1d89ac87c2;p=emacs.git

Remap language symbol in treesit-query-compile (bug#72388)

* src/treesit.c (Ftreesit_query_compile): Use remapped language.

(cherry picked from commit 197d09a5fa9e94a09b7569a42480253138a5b2fd)
---

diff --git a/src/treesit.c b/src/treesit.c
index 0d878a580eb..5de75219907 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -3081,6 +3081,9 @@ You can use `treesit-query-validate' to validate and debug a query.  */)
     wrong_type_argument (Qtreesit_query_p, query);
   CHECK_SYMBOL (language);
 
+  Lisp_Object remapped_lang = resolve_language_symbol (language);
+  CHECK_SYMBOL (remapped_lang);
+
   treesit_initialize ();
 
   if (TS_COMPILED_QUERY_P (query))
@@ -3091,7 +3094,7 @@ You can use `treesit-query-validate' to validate and debug a query.  */)
       return query;
     }
 
-  Lisp_Object lisp_query = make_treesit_query (query, language);
+  Lisp_Object lisp_query = make_treesit_query (query, remapped_lang);
 
   /* Maybe actually compile.  */
   if (NILP (eager))