mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-22 20:42:26 -08:00
Code Issues Projects Releases Wiki Activity

Merge from origin/emacs-30

Browse source 
e4ba279b01 ; * doc/emacs/misc.texi (Network Security): Fix typo.
8fdb2d19b4 ; * lisp/treesit.el (treesit-beginning-of-defun): Doc fix...
This commit is contained in:
Eli Zaretskii 2025-06-07 06:59:30 -04:00
commit 58797a6735
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
doc/emacs/misc.texi
View file

@ -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

5
lisp/treesit.el
View file

@ -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)