aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuri Linkov2025-08-18 09:49:36 +0300
committerJuri Linkov2025-08-18 09:49:36 +0300
commitbf652e6844601bb42daaac2ed867e047f2eb615f (patch)
treefbb72c29ec21ab3e522d8d4d9cca433663e23857
parent888dc2a0b5e937ae8976ebef0f4b8091c0cd542c (diff)
downloademacs-bf652e6844601bb42daaac2ed867e047f2eb615f.tar.gz
emacs-bf652e6844601bb42daaac2ed867e047f2eb615f.zip
Silence byte-compile warnings when treesit is not available
* lisp/progmodes/c-ts-mode.el: * lisp/progmodes/cmake-ts-mode.el: * lisp/progmodes/csharp-mode.el: * lisp/progmodes/dockerfile-ts-mode.el: * lisp/progmodes/elixir-ts-mode.el: * lisp/progmodes/go-ts-mode.el: * lisp/progmodes/heex-ts-mode.el: * lisp/progmodes/java-ts-mode.el: * lisp/progmodes/js.el: * lisp/progmodes/json-ts-mode.el: * lisp/progmodes/lua-ts-mode.el: * lisp/progmodes/php-ts-mode.el: * lisp/progmodes/ruby-ts-mode.el: * lisp/progmodes/rust-ts-mode.el: * lisp/progmodes/sh-script.el: * lisp/progmodes/typescript-ts-mode.el: * lisp/textmodes/css-mode.el: * lisp/textmodes/markdown-ts-mode.el: * lisp/textmodes/mhtml-ts-mode.el: * lisp/textmodes/toml-ts-mode.el: * lisp/textmodes/yaml-ts-mode.el: Declare 'treesit-major-mode-remap-alist' and 'treesit-language-available-p' to silence warnings that are false alarms. Also improve docstrings.
-rw-r--r--lisp/progmodes/c-ts-mode.el1
-rw-r--r--lisp/progmodes/cmake-ts-mode.el6
-rw-r--r--lisp/progmodes/csharp-mode.el1
-rw-r--r--lisp/progmodes/dockerfile-ts-mode.el6
-rw-r--r--lisp/progmodes/elixir-ts-mode.el6
-rw-r--r--lisp/progmodes/go-ts-mode.el18
-rw-r--r--lisp/progmodes/heex-ts-mode.el6
-rw-r--r--lisp/progmodes/java-ts-mode.el1
-rw-r--r--lisp/progmodes/js.el1
-rw-r--r--lisp/progmodes/json-ts-mode.el1
-rw-r--r--lisp/progmodes/lua-ts-mode.el6
-rw-r--r--lisp/progmodes/php-ts-mode.el6
-rw-r--r--lisp/progmodes/ruby-ts-mode.el1
-rw-r--r--lisp/progmodes/rust-ts-mode.el6
-rw-r--r--lisp/progmodes/sh-script.el1
-rw-r--r--lisp/progmodes/typescript-ts-mode.el12
-rw-r--r--lisp/textmodes/css-mode.el1
-rw-r--r--lisp/textmodes/markdown-ts-mode.el6
-rw-r--r--lisp/textmodes/mhtml-ts-mode.el1
-rw-r--r--lisp/textmodes/toml-ts-mode.el1
-rw-r--r--lisp/textmodes/yaml-ts-mode.el6
21 files changed, 80 insertions, 14 deletions
diff --git a/lisp/progmodes/c-ts-mode.el b/lisp/progmodes/c-ts-mode.el
index 55240c3869a..174eb47cb3a 100644
--- a/lisp/progmodes/c-ts-mode.el
+++ b/lisp/progmodes/c-ts-mode.el
@@ -1675,6 +1675,7 @@ the code is C or C++, and based on that chooses whether to enable
1675 1675
1676;;;###autoload 1676;;;###autoload
1677(when (treesit-available-p) 1677(when (treesit-available-p)
1678 (defvar treesit-major-mode-remap-alist)
1678 (add-to-list 'treesit-major-mode-remap-alist 1679 (add-to-list 'treesit-major-mode-remap-alist
1679 '(c-mode . c-ts-mode)) 1680 '(c-mode . c-ts-mode))
1680 (add-to-list 'treesit-major-mode-remap-alist 1681 (add-to-list 'treesit-major-mode-remap-alist
diff --git a/lisp/progmodes/cmake-ts-mode.el b/lisp/progmodes/cmake-ts-mode.el
index 3f879e37ba2..84589b1eb73 100644
--- a/lisp/progmodes/cmake-ts-mode.el
+++ b/lisp/progmodes/cmake-ts-mode.el
@@ -257,7 +257,10 @@ Return nil if there is no name or if NODE is not a defun node."
257 257
258;;;###autoload 258;;;###autoload
259(defun cmake-ts-mode-maybe () 259(defun cmake-ts-mode-maybe ()
260 "Enable `cmake-ts-mode' when its grammar is available." 260 "Enable `cmake-ts-mode' when its grammar is available.
261Also propose to install the grammar when `treesit-enabled-modes'
262is t or contains the mode name."
263 (declare-function treesit-language-available-p "treesit.c")
261 (if (or (treesit-language-available-p 'cmake) 264 (if (or (treesit-language-available-p 'cmake)
262 (eq treesit-enabled-modes t) 265 (eq treesit-enabled-modes t)
263 (memq 'cmake-ts-mode treesit-enabled-modes)) 266 (memq 'cmake-ts-mode treesit-enabled-modes))
@@ -269,6 +272,7 @@ Return nil if there is no name or if NODE is not a defun node."
269 (add-to-list 'auto-mode-alist 272 (add-to-list 'auto-mode-alist
270 '("\\(?:CMakeLists\\.txt\\|\\.cmake\\)\\'" . cmake-ts-mode-maybe)) 273 '("\\(?:CMakeLists\\.txt\\|\\.cmake\\)\\'" . cmake-ts-mode-maybe))
271 ;; To be able to toggle between an external package and core ts-mode: 274 ;; To be able to toggle between an external package and core ts-mode:
275 (defvar treesit-major-mode-remap-alist)
272 (add-to-list 'treesit-major-mode-remap-alist 276 (add-to-list 'treesit-major-mode-remap-alist
273 '(cmake-mode . cmake-ts-mode))) 277 '(cmake-mode . cmake-ts-mode)))
274 278
diff --git a/lisp/progmodes/csharp-mode.el b/lisp/progmodes/csharp-mode.el
index fb05389ba91..2ef97ccc687 100644
--- a/lisp/progmodes/csharp-mode.el
+++ b/lisp/progmodes/csharp-mode.el
@@ -1225,6 +1225,7 @@ Key bindings:
1225 1225
1226;;;###autoload 1226;;;###autoload
1227(when (treesit-available-p) 1227(when (treesit-available-p)
1228 (defvar treesit-major-mode-remap-alist)
1228 (add-to-list 'treesit-major-mode-remap-alist 1229 (add-to-list 'treesit-major-mode-remap-alist
1229 '(csharp-mode . csharp-ts-mode))) 1230 '(csharp-mode . csharp-ts-mode)))
1230 1231
diff --git a/lisp/progmodes/dockerfile-ts-mode.el b/lisp/progmodes/dockerfile-ts-mode.el
index 79a2197c078..40259792b52 100644
--- a/lisp/progmodes/dockerfile-ts-mode.el
+++ b/lisp/progmodes/dockerfile-ts-mode.el
@@ -204,7 +204,10 @@ Return nil if there is no name or if NODE is not a stage node."
204 204
205;;;###autoload 205;;;###autoload
206(defun dockerfile-ts-mode-maybe () 206(defun dockerfile-ts-mode-maybe ()
207 "Enable `dockerfile-ts-mode' when its grammar is available." 207 "Enable `dockerfile-ts-mode' when its grammar is available.
208Also propose to install the grammar when `treesit-enabled-modes'
209is t or contains the mode name."
210 (declare-function treesit-language-available-p "treesit.c")
208 (if (or (treesit-language-available-p 'dockerfile) 211 (if (or (treesit-language-available-p 'dockerfile)
209 (eq treesit-enabled-modes t) 212 (eq treesit-enabled-modes t)
210 (memq 'dockerfile-ts-mode treesit-enabled-modes)) 213 (memq 'dockerfile-ts-mode treesit-enabled-modes))
@@ -218,6 +221,7 @@ Return nil if there is no name or if NODE is not a stage node."
218 '("\\(?:Dockerfile\\(?:\\..*\\)?\\|\\.[Dd]ockerfile\\)\\'" 221 '("\\(?:Dockerfile\\(?:\\..*\\)?\\|\\.[Dd]ockerfile\\)\\'"
219 . dockerfile-ts-mode-maybe)) 222 . dockerfile-ts-mode-maybe))
220 ;; To be able to toggle between an external package and core ts-mode: 223 ;; To be able to toggle between an external package and core ts-mode:
224 (defvar treesit-major-mode-remap-alist)
221 (add-to-list 'treesit-major-mode-remap-alist 225 (add-to-list 'treesit-major-mode-remap-alist
222 '(dockerfile-mode . dockerfile-ts-mode))) 226 '(dockerfile-mode . dockerfile-ts-mode)))
223 227
diff --git a/lisp/progmodes/elixir-ts-mode.el b/lisp/progmodes/elixir-ts-mode.el
index 05ad76d100f..04227599630 100644
--- a/lisp/progmodes/elixir-ts-mode.el
+++ b/lisp/progmodes/elixir-ts-mode.el
@@ -808,7 +808,10 @@ Return nil if NODE is not a defun node or doesn't have a name."
808 808
809;;;###autoload 809;;;###autoload
810(defun elixir-ts-mode-maybe () 810(defun elixir-ts-mode-maybe ()
811 "Enable `elixir-ts-mode' when its grammar is available." 811 "Enable `elixir-ts-mode' when its grammar is available.
812Also propose to install the grammar when `treesit-enabled-modes'
813is t or contains the mode name."
814 (declare-function treesit-language-available-p "treesit.c")
812 (if (or (treesit-language-available-p 'elixir) 815 (if (or (treesit-language-available-p 'elixir)
813 (eq treesit-enabled-modes t) 816 (eq treesit-enabled-modes t)
814 (memq 'elixir-ts-mode treesit-enabled-modes)) 817 (memq 'elixir-ts-mode treesit-enabled-modes))
@@ -822,6 +825,7 @@ Return nil if NODE is not a defun node or doesn't have a name."
822 (add-to-list 'auto-mode-alist '("\\.exs\\'" . elixir-ts-mode-maybe)) 825 (add-to-list 'auto-mode-alist '("\\.exs\\'" . elixir-ts-mode-maybe))
823 (add-to-list 'auto-mode-alist '("mix\\.lock" . elixir-ts-mode-maybe)) 826 (add-to-list 'auto-mode-alist '("mix\\.lock" . elixir-ts-mode-maybe))
824 ;; To be able to toggle between an external package and core ts-mode: 827 ;; To be able to toggle between an external package and core ts-mode:
828 (defvar treesit-major-mode-remap-alist)
825 (add-to-list 'treesit-major-mode-remap-alist 829 (add-to-list 'treesit-major-mode-remap-alist
826 '(elixir-mode . elixir-ts-mode))) 830 '(elixir-mode . elixir-ts-mode)))
827 831
diff --git a/lisp/progmodes/go-ts-mode.el b/lisp/progmodes/go-ts-mode.el
index 40f3de0bc15..e149e9230ec 100644
--- a/lisp/progmodes/go-ts-mode.el
+++ b/lisp/progmodes/go-ts-mode.el
@@ -361,7 +361,10 @@
361 361
362;;;###autoload 362;;;###autoload
363(defun go-ts-mode-maybe () 363(defun go-ts-mode-maybe ()
364 "Enable `go-ts-mode' when its grammar is available." 364 "Enable `go-ts-mode' when its grammar is available.
365Also propose to install the grammar when `treesit-enabled-modes'
366is t or contains the mode name."
367 (declare-function treesit-language-available-p "treesit.c")
365 (if (or (treesit-language-available-p 'go) 368 (if (or (treesit-language-available-p 'go)
366 (eq treesit-enabled-modes t) 369 (eq treesit-enabled-modes t)
367 (memq 'go-ts-mode treesit-enabled-modes)) 370 (memq 'go-ts-mode treesit-enabled-modes))
@@ -372,6 +375,7 @@
372(when (treesit-available-p) 375(when (treesit-available-p)
373 (add-to-list 'auto-mode-alist '("\\.go\\'" . go-ts-mode-maybe)) 376 (add-to-list 'auto-mode-alist '("\\.go\\'" . go-ts-mode-maybe))
374 ;; To be able to toggle between an external package and core ts-mode: 377 ;; To be able to toggle between an external package and core ts-mode:
378 (defvar treesit-major-mode-remap-alist)
375 (add-to-list 'treesit-major-mode-remap-alist 379 (add-to-list 'treesit-major-mode-remap-alist
376 '(go-mode . go-ts-mode))) 380 '(go-mode . go-ts-mode)))
377 381
@@ -635,7 +639,10 @@ what the parent of the node would be if it were a node."
635 639
636;;;###autoload 640;;;###autoload
637(defun go-mod-ts-mode-maybe () 641(defun go-mod-ts-mode-maybe ()
638 "Enable `go-mod-ts-mode' when its grammar is available." 642 "Enable `go-mod-ts-mode' when its grammar is available.
643Also propose to install the grammar when `treesit-enabled-modes'
644is t or contains the mode name."
645 (declare-function treesit-language-available-p "treesit.c")
639 (if (or (treesit-language-available-p 'gomod) 646 (if (or (treesit-language-available-p 'gomod)
640 (eq treesit-enabled-modes t) 647 (eq treesit-enabled-modes t)
641 (memq 'go-mod-ts-mode treesit-enabled-modes)) 648 (memq 'go-mod-ts-mode treesit-enabled-modes))
@@ -646,6 +653,7 @@ what the parent of the node would be if it were a node."
646(when (treesit-available-p) 653(when (treesit-available-p)
647 (add-to-list 'auto-mode-alist '("/go\\.mod\\'" . go-mod-ts-mode-maybe)) 654 (add-to-list 'auto-mode-alist '("/go\\.mod\\'" . go-mod-ts-mode-maybe))
648 ;; To be able to toggle between an external package and core ts-mode: 655 ;; To be able to toggle between an external package and core ts-mode:
656 (defvar treesit-major-mode-remap-alist)
649 (add-to-list 'treesit-major-mode-remap-alist 657 (add-to-list 'treesit-major-mode-remap-alist
650 '(go-mod-mode . go-mod-ts-mode))) 658 '(go-mod-mode . go-mod-ts-mode)))
651 659
@@ -736,7 +744,10 @@ what the parent of the node would be if it were a node."
736 744
737;;;###autoload 745;;;###autoload
738(defun go-work-ts-mode-maybe () 746(defun go-work-ts-mode-maybe ()
739 "Enable `go-work-ts-mode' when its grammar is available." 747 "Enable `go-work-ts-mode' when its grammar is available.
748Also propose to install the grammar when `treesit-enabled-modes'
749is t or contains the mode name."
750 (declare-function treesit-language-available-p "treesit.c")
740 (if (or (treesit-language-available-p 'gowork) 751 (if (or (treesit-language-available-p 'gowork)
741 (eq treesit-enabled-modes t) 752 (eq treesit-enabled-modes t)
742 (memq 'go-work-ts-mode treesit-enabled-modes)) 753 (memq 'go-work-ts-mode treesit-enabled-modes))
@@ -747,6 +758,7 @@ what the parent of the node would be if it were a node."
747(when (treesit-available-p) 758(when (treesit-available-p)
748 (add-to-list 'auto-mode-alist '("/go\\.work\\'" . go-work-ts-mode-maybe)) 759 (add-to-list 'auto-mode-alist '("/go\\.work\\'" . go-work-ts-mode-maybe))
749 ;; To be able to toggle between an external package and core ts-mode: 760 ;; To be able to toggle between an external package and core ts-mode:
761 (defvar treesit-major-mode-remap-alist)
750 (add-to-list 'treesit-major-mode-remap-alist 762 (add-to-list 'treesit-major-mode-remap-alist
751 '(go-work-mode . go-work-ts-mode))) 763 '(go-work-mode . go-work-ts-mode)))
752 764
diff --git a/lisp/progmodes/heex-ts-mode.el b/lisp/progmodes/heex-ts-mode.el
index 41634d0e6a4..2b8b75c444e 100644
--- a/lisp/progmodes/heex-ts-mode.el
+++ b/lisp/progmodes/heex-ts-mode.el
@@ -267,7 +267,10 @@ Return nil if NODE is not a defun node or doesn't have a name."
267 267
268;;;###autoload 268;;;###autoload
269(defun heex-ts-mode-maybe () 269(defun heex-ts-mode-maybe ()
270 "Enable `heex-ts-mode' when its grammar is available." 270 "Enable `heex-ts-mode' when its grammar is available.
271Also propose to install the grammar when `treesit-enabled-modes'
272is t or contains the mode name."
273 (declare-function treesit-language-available-p "treesit.c")
271 (if (or (treesit-language-available-p 'heex) 274 (if (or (treesit-language-available-p 'heex)
272 (eq treesit-enabled-modes t) 275 (eq treesit-enabled-modes t)
273 (memq 'heex-ts-mode treesit-enabled-modes)) 276 (memq 'heex-ts-mode treesit-enabled-modes))
@@ -280,6 +283,7 @@ Return nil if NODE is not a defun node or doesn't have a name."
280 ;; with the tree-sitter-heex grammar. 283 ;; with the tree-sitter-heex grammar.
281 (add-to-list 'auto-mode-alist '("\\.[hl]?eex\\'" . heex-ts-mode-maybe)) 284 (add-to-list 'auto-mode-alist '("\\.[hl]?eex\\'" . heex-ts-mode-maybe))
282 ;; To be able to toggle between an external package and core ts-mode: 285 ;; To be able to toggle between an external package and core ts-mode:
286 (defvar treesit-major-mode-remap-alist)
283 (add-to-list 'treesit-major-mode-remap-alist 287 (add-to-list 'treesit-major-mode-remap-alist
284 '(heex-mode . heex-ts-mode))) 288 '(heex-mode . heex-ts-mode)))
285 289
diff --git a/lisp/progmodes/java-ts-mode.el b/lisp/progmodes/java-ts-mode.el
index e989d1b3f5d..979f5456c6d 100644
--- a/lisp/progmodes/java-ts-mode.el
+++ b/lisp/progmodes/java-ts-mode.el
@@ -526,6 +526,7 @@ Return nil if there is no name or if NODE is not a defun node."
526 526
527;;;###autoload 527;;;###autoload
528(when (treesit-available-p) 528(when (treesit-available-p)
529 (defvar treesit-major-mode-remap-alist)
529 (add-to-list 'treesit-major-mode-remap-alist 530 (add-to-list 'treesit-major-mode-remap-alist
530 '(java-mode . java-ts-mode))) 531 '(java-mode . java-ts-mode)))
531 532
diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index c44b2adf146..1e4c832254c 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -4111,6 +4111,7 @@ See `treesit-thing-settings' for more information.")
4111 4111
4112;;;###autoload 4112;;;###autoload
4113(when (treesit-available-p) 4113(when (treesit-available-p)
4114 (defvar treesit-major-mode-remap-alist)
4114 (add-to-list 'treesit-major-mode-remap-alist 4115 (add-to-list 'treesit-major-mode-remap-alist
4115 '(javascript-mode . js-ts-mode))) 4116 '(javascript-mode . js-ts-mode)))
4116 4117
diff --git a/lisp/progmodes/json-ts-mode.el b/lisp/progmodes/json-ts-mode.el
index b0db0a12210..a08e9a29fe8 100644
--- a/lisp/progmodes/json-ts-mode.el
+++ b/lisp/progmodes/json-ts-mode.el
@@ -183,6 +183,7 @@ Return nil if there is no name or if NODE is not a defun node."
183 183
184;;;###autoload 184;;;###autoload
185(when (treesit-available-p) 185(when (treesit-available-p)
186 (defvar treesit-major-mode-remap-alist)
186 (add-to-list 'treesit-major-mode-remap-alist 187 (add-to-list 'treesit-major-mode-remap-alist
187 '(js-json-mode . json-ts-mode))) 188 '(js-json-mode . json-ts-mode)))
188 189
diff --git a/lisp/progmodes/lua-ts-mode.el b/lisp/progmodes/lua-ts-mode.el
index 07a8f0aef55..5089e17c287 100644
--- a/lisp/progmodes/lua-ts-mode.el
+++ b/lisp/progmodes/lua-ts-mode.el
@@ -771,7 +771,10 @@ Calls REPORT-FN directly."
771 771
772;;;###autoload 772;;;###autoload
773(defun lua-ts-mode-maybe () 773(defun lua-ts-mode-maybe ()
774 "Enable `lua-ts-mode' when its grammar is available." 774 "Enable `lua-ts-mode' when its grammar is available.
775Also propose to install the grammar when `treesit-enabled-modes'
776is t or contains the mode name."
777 (declare-function treesit-language-available-p "treesit.c")
775 (if (or (treesit-language-available-p 'lua) 778 (if (or (treesit-language-available-p 'lua)
776 (eq treesit-enabled-modes t) 779 (eq treesit-enabled-modes t)
777 (memq 'lua-ts-mode treesit-enabled-modes)) 780 (memq 'lua-ts-mode treesit-enabled-modes))
@@ -783,6 +786,7 @@ Calls REPORT-FN directly."
783 (add-to-list 'auto-mode-alist '("\\.lua\\'" . lua-ts-mode-maybe)) 786 (add-to-list 'auto-mode-alist '("\\.lua\\'" . lua-ts-mode-maybe))
784 (add-to-list 'interpreter-mode-alist '("\\<lua\\(?:jit\\)?" . lua-ts-mode-maybe)) 787 (add-to-list 'interpreter-mode-alist '("\\<lua\\(?:jit\\)?" . lua-ts-mode-maybe))
785 ;; To be able to toggle between an external package and core ts-mode: 788 ;; To be able to toggle between an external package and core ts-mode:
789 (defvar treesit-major-mode-remap-alist)
786 (add-to-list 'treesit-major-mode-remap-alist 790 (add-to-list 'treesit-major-mode-remap-alist
787 '(lua-mode . lua-ts-mode))) 791 '(lua-mode . lua-ts-mode)))
788 792
diff --git a/lisp/progmodes/php-ts-mode.el b/lisp/progmodes/php-ts-mode.el
index 7c2a22024f8..e23293bdd3b 100644
--- a/lisp/progmodes/php-ts-mode.el
+++ b/lisp/progmodes/php-ts-mode.el
@@ -1924,7 +1924,10 @@ file to use."
1924 1924
1925;;;###autoload 1925;;;###autoload
1926(defun php-ts-mode-maybe () 1926(defun php-ts-mode-maybe ()
1927 "Enable `php-ts-mode' when its grammar is available." 1927 "Enable `php-ts-mode' when its grammar is available.
1928Also propose to install the grammar when `treesit-enabled-modes'
1929is t or contains the mode name."
1930 (declare-function treesit-language-available-p "treesit.c")
1928 (if (or (treesit-language-available-p 'php) 1931 (if (or (treesit-language-available-p 'php)
1929 (eq treesit-enabled-modes t) 1932 (eq treesit-enabled-modes t)
1930 (memq 'php-ts-mode treesit-enabled-modes)) 1933 (memq 'php-ts-mode treesit-enabled-modes))
@@ -1943,6 +1946,7 @@ file to use."
1943 'interpreter-mode-alist 1946 'interpreter-mode-alist
1944 (cons "php\\(?:-?[34578]\\(?:\\.[0-9]+\\)*\\)?" 'php-ts-mode-maybe)) 1947 (cons "php\\(?:-?[34578]\\(?:\\.[0-9]+\\)*\\)?" 'php-ts-mode-maybe))
1945 ;; To be able to toggle between an external package and core ts-mode: 1948 ;; To be able to toggle between an external package and core ts-mode:
1949 (defvar treesit-major-mode-remap-alist)
1946 (add-to-list 'treesit-major-mode-remap-alist 1950 (add-to-list 'treesit-major-mode-remap-alist
1947 '(php-mode . php-ts-mode))) 1951 '(php-mode . php-ts-mode)))
1948 1952
diff --git a/lisp/progmodes/ruby-ts-mode.el b/lisp/progmodes/ruby-ts-mode.el
index 1bb4f4fb890..742331ccddb 100644
--- a/lisp/progmodes/ruby-ts-mode.el
+++ b/lisp/progmodes/ruby-ts-mode.el
@@ -1279,6 +1279,7 @@ leading double colon is not added."
1279 1279
1280;;;###autoload 1280;;;###autoload
1281(when (treesit-available-p) 1281(when (treesit-available-p)
1282 (defvar treesit-major-mode-remap-alist)
1282 (add-to-list 'treesit-major-mode-remap-alist 1283 (add-to-list 'treesit-major-mode-remap-alist
1283 '(ruby-mode . ruby-ts-mode))) 1284 '(ruby-mode . ruby-ts-mode)))
1284 1285
diff --git a/lisp/progmodes/rust-ts-mode.el b/lisp/progmodes/rust-ts-mode.el
index b9b39a0d341..a5c217c0a4b 100644
--- a/lisp/progmodes/rust-ts-mode.el
+++ b/lisp/progmodes/rust-ts-mode.el
@@ -656,7 +656,10 @@ See `prettify-symbols-compose-predicate'."
656 656
657;;;###autoload 657;;;###autoload
658(defun rust-ts-mode-maybe () 658(defun rust-ts-mode-maybe ()
659 "Enable `rust-ts-mode' when its grammar is available." 659 "Enable `rust-ts-mode' when its grammar is available.
660Also propose to install the grammar when `treesit-enabled-modes'
661is t or contains the mode name."
662 (declare-function treesit-language-available-p "treesit.c")
660 (if (or (treesit-language-available-p 'rust) 663 (if (or (treesit-language-available-p 'rust)
661 (eq treesit-enabled-modes t) 664 (eq treesit-enabled-modes t)
662 (memq 'rust-ts-mode treesit-enabled-modes)) 665 (memq 'rust-ts-mode treesit-enabled-modes))
@@ -667,6 +670,7 @@ See `prettify-symbols-compose-predicate'."
667(when (treesit-available-p) 670(when (treesit-available-p)
668 (add-to-list 'auto-mode-alist '("\\.rs\\'" . rust-ts-mode-maybe)) 671 (add-to-list 'auto-mode-alist '("\\.rs\\'" . rust-ts-mode-maybe))
669 ;; To be able to toggle between an external package and core ts-mode: 672 ;; To be able to toggle between an external package and core ts-mode:
673 (defvar treesit-major-mode-remap-alist)
670 (add-to-list 'treesit-major-mode-remap-alist 674 (add-to-list 'treesit-major-mode-remap-alist
671 '(rust-mode . rust-ts-mode))) 675 '(rust-mode . rust-ts-mode)))
672 676
diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index f69647b435d..3b2601d251d 100644
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -1650,6 +1650,7 @@ not written in Bash or sh."
1650 1650
1651;;;###autoload 1651;;;###autoload
1652(when (treesit-available-p) 1652(when (treesit-available-p)
1653 (defvar treesit-major-mode-remap-alist)
1653 (add-to-list 'treesit-major-mode-remap-alist 1654 (add-to-list 'treesit-major-mode-remap-alist
1654 '(sh-mode . bash-ts-mode))) 1655 '(sh-mode . bash-ts-mode)))
1655 1656
diff --git a/lisp/progmodes/typescript-ts-mode.el b/lisp/progmodes/typescript-ts-mode.el
index 428ae11f653..e83ee70d7e9 100644
--- a/lisp/progmodes/typescript-ts-mode.el
+++ b/lisp/progmodes/typescript-ts-mode.el
@@ -724,7 +724,10 @@ This mode is intended to be inherited by concrete major modes."
724 724
725;;;###autoload 725;;;###autoload
726(defun typescript-ts-mode-maybe () 726(defun typescript-ts-mode-maybe ()
727 "Enable `typescript-ts-mode' when its grammar is available." 727 "Enable `typescript-ts-mode' when its grammar is available.
728Also propose to install the grammar when `treesit-enabled-modes'
729is t or contains the mode name."
730 (declare-function treesit-language-available-p "treesit.c")
728 (if (or (treesit-language-available-p 'typescript) 731 (if (or (treesit-language-available-p 'typescript)
729 (eq treesit-enabled-modes t) 732 (eq treesit-enabled-modes t)
730 (memq 'typescript-ts-mode treesit-enabled-modes)) 733 (memq 'typescript-ts-mode treesit-enabled-modes))
@@ -735,6 +738,7 @@ This mode is intended to be inherited by concrete major modes."
735(when (treesit-available-p) 738(when (treesit-available-p)
736 (add-to-list 'auto-mode-alist '("\\.ts\\'" . typescript-ts-mode-maybe)) 739 (add-to-list 'auto-mode-alist '("\\.ts\\'" . typescript-ts-mode-maybe))
737 ;; To be able to toggle between an external package and core ts-mode: 740 ;; To be able to toggle between an external package and core ts-mode:
741 (defvar treesit-major-mode-remap-alist)
738 (add-to-list 'treesit-major-mode-remap-alist 742 (add-to-list 'treesit-major-mode-remap-alist
739 '(typescript-mode . typescript-ts-mode))) 743 '(typescript-mode . typescript-ts-mode)))
740 744
@@ -857,7 +861,10 @@ at least 3 (which is the default value)."
857 861
858;;;###autoload 862;;;###autoload
859(defun tsx-ts-mode-maybe () 863(defun tsx-ts-mode-maybe ()
860 "Enable `tsx-ts-mode' when its grammar is available." 864 "Enable `tsx-ts-mode' when its grammar is available.
865Also propose to install the grammar when `treesit-enabled-modes'
866is t or contains the mode name."
867 (declare-function treesit-language-available-p "treesit.c")
861 (if (or (treesit-language-available-p 'tsx) 868 (if (or (treesit-language-available-p 'tsx)
862 (eq treesit-enabled-modes t) 869 (eq treesit-enabled-modes t)
863 (memq 'tsx-ts-mode treesit-enabled-modes)) 870 (memq 'tsx-ts-mode treesit-enabled-modes))
@@ -868,6 +875,7 @@ at least 3 (which is the default value)."
868(when (treesit-available-p) 875(when (treesit-available-p)
869 (add-to-list 'auto-mode-alist '("\\.tsx\\'" . tsx-ts-mode-maybe)) 876 (add-to-list 'auto-mode-alist '("\\.tsx\\'" . tsx-ts-mode-maybe))
870 ;; To be able to toggle between an external package and core ts-mode: 877 ;; To be able to toggle between an external package and core ts-mode:
878 (defvar treesit-major-mode-remap-alist)
871 (add-to-list 'treesit-major-mode-remap-alist 879 (add-to-list 'treesit-major-mode-remap-alist
872 '(tsx-mode . tsx-ts-mode))) 880 '(tsx-mode . tsx-ts-mode)))
873 881
diff --git a/lisp/textmodes/css-mode.el b/lisp/textmodes/css-mode.el
index 0a02aedfa4f..ffecc86cbe0 100644
--- a/lisp/textmodes/css-mode.el
+++ b/lisp/textmodes/css-mode.el
@@ -1917,6 +1917,7 @@ can also be used to fill comments.
1917 1917
1918;;;###autoload 1918;;;###autoload
1919(when (treesit-available-p) 1919(when (treesit-available-p)
1920 (defvar treesit-major-mode-remap-alist)
1920 (add-to-list 'treesit-major-mode-remap-alist 1921 (add-to-list 'treesit-major-mode-remap-alist
1921 '(css-mode . css-ts-mode))) 1922 '(css-mode . css-ts-mode)))
1922 1923
diff --git a/lisp/textmodes/markdown-ts-mode.el b/lisp/textmodes/markdown-ts-mode.el
index 4af80f80b5f..7f705ddb8b2 100644
--- a/lisp/textmodes/markdown-ts-mode.el
+++ b/lisp/textmodes/markdown-ts-mode.el
@@ -405,7 +405,10 @@ the same features enabled in MODE."
405 405
406;;;###autoload 406;;;###autoload
407(defun markdown-ts-mode-maybe () 407(defun markdown-ts-mode-maybe ()
408 "Enable `markdown-ts-mode' when its grammar is available." 408 "Enable `markdown-ts-mode' when its grammar is available.
409Also propose to install the grammar when `treesit-enabled-modes'
410is t or contains the mode name."
411 (declare-function treesit-language-available-p "treesit.c")
409 (if (or (treesit-language-available-p 'markdown) 412 (if (or (treesit-language-available-p 'markdown)
410 (eq treesit-enabled-modes t) 413 (eq treesit-enabled-modes t)
411 (memq 'markdown-ts-mode treesit-enabled-modes)) 414 (memq 'markdown-ts-mode treesit-enabled-modes))
@@ -416,6 +419,7 @@ the same features enabled in MODE."
416(when (treesit-available-p) 419(when (treesit-available-p)
417 (add-to-list 'auto-mode-alist '("\\.md\\'" . markdown-ts-mode-maybe)) 420 (add-to-list 'auto-mode-alist '("\\.md\\'" . markdown-ts-mode-maybe))
418 ;; To be able to toggle between an external package and core ts-mode: 421 ;; To be able to toggle between an external package and core ts-mode:
422 (defvar treesit-major-mode-remap-alist)
419 (add-to-list 'treesit-major-mode-remap-alist 423 (add-to-list 'treesit-major-mode-remap-alist
420 '(markdown-mode . markdown-ts-mode))) 424 '(markdown-mode . markdown-ts-mode)))
421 425
diff --git a/lisp/textmodes/mhtml-ts-mode.el b/lisp/textmodes/mhtml-ts-mode.el
index be3873e848a..793e28ed0de 100644
--- a/lisp/textmodes/mhtml-ts-mode.el
+++ b/lisp/textmodes/mhtml-ts-mode.el
@@ -589,6 +589,7 @@ Powered by tree-sitter."
589 589
590;;;###autoload 590;;;###autoload
591(when (treesit-available-p) 591(when (treesit-available-p)
592 (defvar treesit-major-mode-remap-alist)
592 (add-to-list 'treesit-major-mode-remap-alist 593 (add-to-list 'treesit-major-mode-remap-alist
593 '(mhtml-mode . mhtml-ts-mode))) 594 '(mhtml-mode . mhtml-ts-mode)))
594 595
diff --git a/lisp/textmodes/toml-ts-mode.el b/lisp/textmodes/toml-ts-mode.el
index 511a6b5f8ed..f85ded35968 100644
--- a/lisp/textmodes/toml-ts-mode.el
+++ b/lisp/textmodes/toml-ts-mode.el
@@ -174,6 +174,7 @@ Return nil if there is no name or if NODE is not a defun node."
174 174
175;;;###autoload 175;;;###autoload
176(when (treesit-available-p) 176(when (treesit-available-p)
177 (defvar treesit-major-mode-remap-alist)
177 (add-to-list 'treesit-major-mode-remap-alist 178 (add-to-list 'treesit-major-mode-remap-alist
178 '(conf-toml-mode . toml-ts-mode))) 179 '(conf-toml-mode . toml-ts-mode)))
179 180
diff --git a/lisp/textmodes/yaml-ts-mode.el b/lisp/textmodes/yaml-ts-mode.el
index 95c9c1abd7d..61c70340f8e 100644
--- a/lisp/textmodes/yaml-ts-mode.el
+++ b/lisp/textmodes/yaml-ts-mode.el
@@ -229,7 +229,10 @@ Return nil if there is no name or if NODE is not a defun node."
229 229
230;;;###autoload 230;;;###autoload
231(defun yaml-ts-mode-maybe () 231(defun yaml-ts-mode-maybe ()
232 "Enable `yaml-ts-mode' when its grammar is available." 232 "Enable `yaml-ts-mode' when its grammar is available.
233Also propose to install the grammar when `treesit-enabled-modes'
234is t or contains the mode name."
235 (declare-function treesit-language-available-p "treesit.c")
233 (if (or (treesit-language-available-p 'yaml) 236 (if (or (treesit-language-available-p 'yaml)
234 (eq treesit-enabled-modes t) 237 (eq treesit-enabled-modes t)
235 (memq 'yaml-ts-mode treesit-enabled-modes)) 238 (memq 'yaml-ts-mode treesit-enabled-modes))
@@ -240,6 +243,7 @@ Return nil if there is no name or if NODE is not a defun node."
240(when (treesit-available-p) 243(when (treesit-available-p)
241 (add-to-list 'auto-mode-alist '("\\.ya?ml\\'" . yaml-ts-mode-maybe)) 244 (add-to-list 'auto-mode-alist '("\\.ya?ml\\'" . yaml-ts-mode-maybe))
242 ;; To be able to toggle between an external package and core ts-mode: 245 ;; To be able to toggle between an external package and core ts-mode:
246 (defvar treesit-major-mode-remap-alist)
243 (add-to-list 'treesit-major-mode-remap-alist 247 (add-to-list 'treesit-major-mode-remap-alist
244 '(yaml-mode . yaml-ts-mode))) 248 '(yaml-mode . yaml-ts-mode)))
245 249