Merge from origin/emacs-30

e4ba279b014 ; * doc/emacs/misc.texi (Network Security): Fix typo.
8fdb2d19b49 ; * lisp/treesit.el (treesit-beginning-of-defun): Doc fix...

2 files changed, 5 insertions, 2 deletions

diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi
index d4f2de982d6..87cc2aea5b2 100644
--- a/doc/emacs/misc.texi
+++ b/doc/emacs/misc.texi
@@ -430,7 +430,7 @@ checks in @code{network-security-protocol-checks}).
 The protocols older than @acronym{TLS1.0} are believed to be
 vulnerable to a variety of attacks, and you may want to avoid using
 these if what you're doing requires higher security.  (This is the
-@code{ssl} check in @code{network-security-protocol-checks}).
+@code{version} check in @code{network-security-protocol-checks}).
 
 @item Triple DES (or @acronym{3DES}) cipher
 The @acronym{3DES} stream cipher provides at most 112 bits of
diff --git a/lisp/treesit.el b/lisp/treesit.el
index 45626e77b99..9bdea043bd3 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -3432,7 +3432,10 @@ This is a tree-sitter equivalent of `beginning-of-defun'.
 Behavior of this function depends on `treesit-defun-type-regexp'
 and `treesit-defun-skipper'.  If `treesit-defun-type-regexp' is
 not set, Emacs also looks for definition of defun in
-`treesit-thing-settings'."
+`treesit-thing-settings'.
+
+Whether this goes to the innermost nested defun or a top-level
+one is determined by the value of `treesit-defun-tactic'."
   (interactive "^p")
   (or (not (eq this-command 'treesit-beginning-of-defun))
       (eq last-command 'treesit-beginning-of-defun)