From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 24 Jun 2023 10:57:25 +0000 (-0400)
Subject: Merge from origin/emacs-29
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5fa9458511a17ff79a822e5cf8cc00f7bfb89364;p=emacs.git

Merge from origin/emacs-29

8f62e7b85f6 Describe primarily the Emacs s-exp dialect for treesit qu...
eacd75df4e4 ; Improve documentation of overlay priorities
b3f11e94fad Fix documentation of :predicate in 'define-globalized-min...
---

5fa9458511a17ff79a822e5cf8cc00f7bfb89364
diff --cc doc/lispref/parsing.texi
index 1ec985f6d70,9e1df07d25c..3bb5071f02f
--- a/doc/lispref/parsing.texi
+++ b/doc/lispref/parsing.texi
@@@ -1351,15 -1302,15 +1349,16 @@@ strings or capture names.  Capture name
  captured node spans in the buffer.
  @end deffn
  
- @deffn Predicate match regexp capture-name
+ @deffn Predicate :match regexp capture-name
  Matches if the text that @var{capture-name}'s node spans in the buffer
- matches regular expression @var{regexp}.  Matching is case-sensitive.
+ matches regular expression @var{regexp}, given as a string literal.
+ Matching is case-sensitive.
  @end deffn
  
- @deffn Predicate pred fn &rest nodes
+ @deffn Predicate :pred fn &rest nodes
  Matches if function @var{fn} returns non-@code{nil} when passed each
 -node in @var{nodes} as arguments.
 +node in @var{nodes} as arguments.  The function runs with the current
 +buffer set to the buffer of node being queried.
  @end deffn
  
  Note that a predicate can only refer to capture names that appear in