procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix byte-compilation of *-ts-mode.el files

Browse source 
* lisp/treesit.el (treesit-font-lock-settings): Move to before
use, to prevent failure in byte-compiling modes which require this
file.  (Bug#61282)
This commit is contained in:
Eli Zaretskii 2023-02-05 08:24:32 +02:00
parent b40a929a3f
commit 2c33e2889b
1 changed files with 24 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

49
lisp/treesit.el
View file

@ -555,7 +555,30 @@ omitted, default END to BEG."
"Generic tree-sitter font-lock error" "Generic tree-sitter font-lock error"
'treesit-error) 'treesit-error)
(defvar treesit-font-lock-settings) (defvar-local treesit-font-lock-settings nil
"A list of SETTINGs for treesit-based fontification.
The exact format of each SETTING is considered internal. Use
`treesit-font-lock-rules' to set this variable.
Each SETTING has the form:
(QUERY ENABLE FEATURE OVERRIDE)
QUERY must be a compiled query. See Info node `(elisp)Pattern
Matching' for how to write a query and compile it.
For SETTING to be activated for font-lock, ENABLE must be t. To
disable this SETTING, set ENABLE to nil.
FEATURE is the \"feature name\" of the query. Users can control
which features are enabled with `treesit-font-lock-level' and
`treesit-font-lock-feature-list'.
OVERRIDE is the override flag for this query. Its value can be
t, nil, append, prepend, keep. See more in
`treesit-font-lock-rules'.")
(defun treesit--font-lock-level-setter (sym val) (defun treesit--font-lock-level-setter (sym val)
"Custom setter for `treesit-font-lock-level'. "Custom setter for `treesit-font-lock-level'.
Set the default value of SYM to VAL, recompute fontification Set the default value of SYM to VAL, recompute fontification
@ -638,30 +661,6 @@ See the manual for more explanations on some of the features.
For changes to this variable to take effect, run For changes to this variable to take effect, run
`treesit-font-lock-recompute-features'.") `treesit-font-lock-recompute-features'.")
(defvar-local treesit-font-lock-settings nil
"A list of SETTINGs for treesit-based fontification.
The exact format of each SETTING is considered internal. Use
`treesit-font-lock-rules' to set this variable.
Each SETTING has the form:
(QUERY ENABLE FEATURE OVERRIDE)
QUERY must be a compiled query. See Info node `(elisp)Pattern
Matching' for how to write a query and compile it.
For SETTING to be activated for font-lock, ENABLE must be t. To
disable this SETTING, set ENABLE to nil.
FEATURE is the \"feature name\" of the query. Users can control
which features are enabled with `treesit-font-lock-level' and
`treesit-font-lock-feature-list'.
OVERRIDE is the override flag for this query. Its value can be
t, nil, append, prepend, keep. See more in
`treesit-font-lock-rules'.")
(defun treesit-font-lock-rules (&rest query-specs) (defun treesit-font-lock-rules (&rest query-specs)
"Return a value suitable for `treesit-font-lock-settings'. "Return a value suitable for `treesit-font-lock-settings'.