Documentation for treesit-font-lock-rules change

* doc/lispref/modes.texi (Parser-based Font Lock): Update manual.
* lisp/treesit.el (treesit-font-lock-rules): Update docstring.

diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi
index 0014842089336082038c158a0d416ef90681d27a..f365d88fade8fff2c21d108561c74868e512c2ee 100644 (file)
--- a/doc/lispref/modes.texi
+++ b/doc/lispref/modes.texi
@@ -4149,7 +4149,7 @@ it add meta information to it.  The @code{:language} keyword declares
 name of @var{query}.  Users can control which features are enabled
 with @code{treesit-font-lock-level} and
 @code{treesit-font-lock-feature-list} (described below).  These two
-keywords are mandatory.
+keywords are mandatory (with exceptions).
 
 Other keywords are optional:
 
@@ -4161,6 +4161,9 @@ Other keywords are optional:
 @item @tab @code{append} @tab Append the new face to existing ones
 @item @tab @code{prepend} @tab Prepend the new face to existing ones
 @item @tab @code{keep} @tab Fill-in regions without an existing face
+@item @code{:default-language} @tab @var{language}
+@tab Every @var{query} after this keyword will use @var{language}
+by default.
 @end multitable
 
 Lisp programs mark patterns in @var{query} with capture names (names

diff --git a/etc/NEWS b/etc/NEWS
index 3810305e9f4c333d57c7a1f5777bf5a3f1d4459f..5d42d88fb60e00dd538bbb48449780187e738c48 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1353,6 +1353,11 @@ Since circular alias chains now cannot occur, 'function-alias-p',
 'indirect-function' and 'indirect-variable' will never signal an error.
 Their 'noerror' arguments have no effect and are therefore obsolete.
 
++++
+** 'treesit-font-lock-rules' now accepts additional global keywords.
+When supplied with ':default-language LANGUAGE', rules after it will
+default to use 'LANGUAGE'.
+
 \f
 * Changes in Emacs 30.1 on Non-Free Operating Systems
 

diff --git a/lisp/treesit.el b/lisp/treesit.el
index 669f41d8015d1b9ef357b25756862b6ab00d6e05..80bdf164b075a3cb20e6b816e73b53f488d46c78 100644 (file)
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -892,6 +892,8 @@ Other keywords include:
              `append'   Append the new face to existing ones.
              `prepend'  Prepend the new face to existing ones.
              `keep'     Fill-in regions without an existing face.
+  :default-language  LANGUAGE  Every QUERY after this keyword
+                               will use LANGUAGE by default.
 
 Capture names in QUERY should be face names like
 `font-lock-keyword-face'.  The captured node will be fontified