aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/emacs/misc.texi2
-rw-r--r--lisp/treesit.el5
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}).
430The protocols older than @acronym{TLS1.0} are believed to be 430The protocols older than @acronym{TLS1.0} are believed to be
431vulnerable to a variety of attacks, and you may want to avoid using 431vulnerable to a variety of attacks, and you may want to avoid using
432these if what you're doing requires higher security. (This is the 432these if what you're doing requires higher security. (This is the
433@code{ssl} check in @code{network-security-protocol-checks}). 433@code{version} check in @code{network-security-protocol-checks}).
434 434
435@item Triple DES (or @acronym{3DES}) cipher 435@item Triple DES (or @acronym{3DES}) cipher
436The @acronym{3DES} stream cipher provides at most 112 bits of 436The @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'.
3432Behavior of this function depends on `treesit-defun-type-regexp' 3432Behavior of this function depends on `treesit-defun-type-regexp'
3433and `treesit-defun-skipper'. If `treesit-defun-type-regexp' is 3433and `treesit-defun-skipper'. If `treesit-defun-type-regexp' is
3434not set, Emacs also looks for definition of defun in 3434not set, Emacs also looks for definition of defun in
3435`treesit-thing-settings'." 3435`treesit-thing-settings'.
3436
3437Whether this goes to the innermost nested defun or a top-level
3438one is determined by the value of `treesit-defun-tactic'."
3436 (interactive "^p") 3439 (interactive "^p")
3437 (or (not (eq this-command 'treesit-beginning-of-defun)) 3440 (or (not (eq this-command 'treesit-beginning-of-defun))
3438 (eq last-command 'treesit-beginning-of-defun) 3441 (eq last-command 'treesit-beginning-of-defun)