aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/textmodes
diff options
context:
space:
mode:
authorJuri Linkov2025-10-16 09:43:30 +0300
committerJuri Linkov2025-10-16 09:45:30 +0300
commit0a4503de3a5a94fda8a81c8847a5cc4bf8bbe545 (patch)
tree7ac345df0d9c9b0bac5246aeab90c8f64662ed28 /lisp/textmodes
parent88c18efb3a1b9e48a5fb72b80cc7cdd5d03fa894 (diff)
downloademacs-0a4503de3a5a94fda8a81c8847a5cc4bf8bbe545.tar.gz
emacs-0a4503de3a5a94fda8a81c8847a5cc4bf8bbe545.zip
Check if treesit-major-mode-remap-alist is bound in ts-modes autoload forms
* 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/python.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: In autoload forms replace '(treesit-available-p)' with (boundp 'treesit-major-mode-remap-alist). Calling 'treesit-available-p' in loaddefs.el is too early since the tree-sitter library might not be loaded yet. Checking if 'treesit-major-mode-remap-alist' is bound is equivalent to checking if Emacs is compiled with tree-sitter support. (bug#79622)
Diffstat (limited to 'lisp/textmodes')
-rw-r--r--lisp/textmodes/css-mode.el3
-rw-r--r--lisp/textmodes/markdown-ts-mode.el3
-rw-r--r--lisp/textmodes/mhtml-ts-mode.el3
-rw-r--r--lisp/textmodes/toml-ts-mode.el3
-rw-r--r--lisp/textmodes/yaml-ts-mode.el3
5 files changed, 5 insertions, 10 deletions
diff --git a/lisp/textmodes/css-mode.el b/lisp/textmodes/css-mode.el
index ffecc86cbe0..a83dc28dc15 100644
--- a/lisp/textmodes/css-mode.el
+++ b/lisp/textmodes/css-mode.el
@@ -1916,8 +1916,7 @@ can also be used to fill comments.
1916(derived-mode-add-parents 'css-ts-mode '(css-mode)) 1916(derived-mode-add-parents 'css-ts-mode '(css-mode))
1917 1917
1918;;;###autoload 1918;;;###autoload
1919(when (treesit-available-p) 1919(when (boundp 'treesit-major-mode-remap-alist)
1920 (defvar treesit-major-mode-remap-alist)
1921 (add-to-list 'treesit-major-mode-remap-alist 1920 (add-to-list 'treesit-major-mode-remap-alist
1922 '(css-mode . css-ts-mode))) 1921 '(css-mode . css-ts-mode)))
1923 1922
diff --git a/lisp/textmodes/markdown-ts-mode.el b/lisp/textmodes/markdown-ts-mode.el
index 4929f2d91ee..7e579f41628 100644
--- a/lisp/textmodes/markdown-ts-mode.el
+++ b/lisp/textmodes/markdown-ts-mode.el
@@ -422,10 +422,9 @@ is t or contains the mode name."
422 (fundamental-mode))) 422 (fundamental-mode)))
423 423
424;;;###autoload 424;;;###autoload
425(when (treesit-available-p) 425(when (boundp 'treesit-major-mode-remap-alist)
426 (add-to-list 'auto-mode-alist '("\\.md\\'" . markdown-ts-mode-maybe)) 426 (add-to-list 'auto-mode-alist '("\\.md\\'" . markdown-ts-mode-maybe))
427 ;; To be able to toggle between an external package and core ts-mode: 427 ;; To be able to toggle between an external package and core ts-mode:
428 (defvar treesit-major-mode-remap-alist)
429 (add-to-list 'treesit-major-mode-remap-alist 428 (add-to-list 'treesit-major-mode-remap-alist
430 '(markdown-mode . markdown-ts-mode))) 429 '(markdown-mode . markdown-ts-mode)))
431 430
diff --git a/lisp/textmodes/mhtml-ts-mode.el b/lisp/textmodes/mhtml-ts-mode.el
index 355c3201946..b97555de2fc 100644
--- a/lisp/textmodes/mhtml-ts-mode.el
+++ b/lisp/textmodes/mhtml-ts-mode.el
@@ -599,8 +599,7 @@ Powered by tree-sitter."
599(derived-mode-add-parents 'mhtml-ts-mode '(css-mode js-mode)) 599(derived-mode-add-parents 'mhtml-ts-mode '(css-mode js-mode))
600 600
601;;;###autoload 601;;;###autoload
602(when (treesit-available-p) 602(when (boundp 'treesit-major-mode-remap-alist)
603 (defvar treesit-major-mode-remap-alist)
604 (add-to-list 'treesit-major-mode-remap-alist 603 (add-to-list 'treesit-major-mode-remap-alist
605 '(mhtml-mode . mhtml-ts-mode))) 604 '(mhtml-mode . mhtml-ts-mode)))
606 605
diff --git a/lisp/textmodes/toml-ts-mode.el b/lisp/textmodes/toml-ts-mode.el
index f85ded35968..f52f7de7b42 100644
--- a/lisp/textmodes/toml-ts-mode.el
+++ b/lisp/textmodes/toml-ts-mode.el
@@ -173,8 +173,7 @@ Return nil if there is no name or if NODE is not a defun node."
173(derived-mode-add-parents 'toml-ts-mode '(toml-mode)) 173(derived-mode-add-parents 'toml-ts-mode '(toml-mode))
174 174
175;;;###autoload 175;;;###autoload
176(when (treesit-available-p) 176(when (boundp 'treesit-major-mode-remap-alist)
177 (defvar treesit-major-mode-remap-alist)
178 (add-to-list 'treesit-major-mode-remap-alist 177 (add-to-list 'treesit-major-mode-remap-alist
179 '(conf-toml-mode . toml-ts-mode))) 178 '(conf-toml-mode . toml-ts-mode)))
180 179
diff --git a/lisp/textmodes/yaml-ts-mode.el b/lisp/textmodes/yaml-ts-mode.el
index 61c70340f8e..c50daf8cead 100644
--- a/lisp/textmodes/yaml-ts-mode.el
+++ b/lisp/textmodes/yaml-ts-mode.el
@@ -240,10 +240,9 @@ is t or contains the mode name."
240 (fundamental-mode))) 240 (fundamental-mode)))
241 241
242;;;###autoload 242;;;###autoload
243(when (treesit-available-p) 243(when (boundp 'treesit-major-mode-remap-alist)
244 (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))
245 ;; 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)
247 (add-to-list 'treesit-major-mode-remap-alist 246 (add-to-list 'treesit-major-mode-remap-alist
248 '(yaml-mode . yaml-ts-mode))) 247 '(yaml-mode . yaml-ts-mode)))
249 248