From 2c33e2889b4d711689a606d175ff56931c157fb4 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sun, 5 Feb 2023 08:24:32 +0200 Subject: [PATCH] Fix byte-compilation of *-ts-mode.el files * lisp/treesit.el (treesit-font-lock-settings): Move to before use, to prevent failure in byte-compiling modes which require this file. (Bug#61282) --- lisp/treesit.el | 49 ++++++++++++++++++++++++------------------------- 1 file changed, 24 insertions(+), 25 deletions(-) diff --git a/lisp/treesit.el b/lisp/treesit.el index 6426eb08fe6..948016dc723 100644 --- a/lisp/treesit.el +++ b/lisp/treesit.el @@ -555,7 +555,30 @@ omitted, default END to BEG." "Generic tree-sitter font-lock 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) "Custom setter for `treesit-font-lock-level'. 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 `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) "Return a value suitable for `treesit-font-lock-settings'. -- 2.39.5