diff options
| author | Juri Linkov | 2025-08-18 09:49:36 +0300 |
|---|---|---|
| committer | Juri Linkov | 2025-08-18 09:49:36 +0300 |
| commit | bf652e6844601bb42daaac2ed867e047f2eb615f (patch) | |
| tree | fbb72c29ec21ab3e522d8d4d9cca433663e23857 /lisp/textmodes | |
| parent | 888dc2a0b5e937ae8976ebef0f4b8091c0cd542c (diff) | |
| download | emacs-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.
Diffstat (limited to 'lisp/textmodes')
| -rw-r--r-- | lisp/textmodes/css-mode.el | 1 | ||||
| -rw-r--r-- | lisp/textmodes/markdown-ts-mode.el | 6 | ||||
| -rw-r--r-- | lisp/textmodes/mhtml-ts-mode.el | 1 | ||||
| -rw-r--r-- | lisp/textmodes/toml-ts-mode.el | 1 | ||||
| -rw-r--r-- | lisp/textmodes/yaml-ts-mode.el | 6 |
5 files changed, 13 insertions, 2 deletions
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. |
| 409 | Also propose to install the grammar when `treesit-enabled-modes' | ||
| 410 | is 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. |
| 233 | Also propose to install the grammar when `treesit-enabled-modes' | ||
| 234 | is 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 | ||