diff --git a/etc/NEWS.30 b/etc/NEWS.30 index d0534ad7538..6428ef651aa 100644 --- a/etc/NEWS.30 +++ b/etc/NEWS.30 @@ -2726,8 +2726,8 @@ some obvious cases. Examples: (aset "abc" 1 ?d) Such code may have unpredictable behavior because the constants are part -of the program, not of the data structures generated afresh during -execution, and the compiler does not expect them to change. +of the program and are not data structures generated afresh during +execution; the compiler does not expect them to change. To avoid the warning, operate on an object created by the program (maybe a copy of the constant), or use a non-destructive operation diff --git a/java/res/mipmap-v26/emacs_icon.xml b/java/res/mipmap-v26/emacs_icon.xml index f0a8df92846..5b720e8210f 100644 --- a/java/res/mipmap-v26/emacs_icon.xml +++ b/java/res/mipmap-v26/emacs_icon.xml @@ -20,4 +20,5 @@ along with GNU Emacs. If not, see . --> + diff --git a/lisp/textmodes/paragraphs.el b/lisp/textmodes/paragraphs.el index af99a96e045..be741e6517b 100644 --- a/lisp/textmodes/paragraphs.el +++ b/lisp/textmodes/paragraphs.el @@ -118,8 +118,28 @@ text indented by a margin setting." (defcustom sentence-end-double-space t "Non-nil means a single space does not end a sentence. -This is relevant for filling. See also `sentence-end-without-period' -and `colon-double-space'. +This user option affects fill commands and sentence commands. + +If this variable is non-nil, Emacs considers a period followed by two +spaces or by a newline as the end of a sentence. This means that: + + 1. The fill commands will not break a line after a period followed + by just one space. + + 2. The sentence commands stop only for double spaces. + +If this variable is nil, Emacs considers a period followed by one space +or by a newline as the end of a sentence. This means that: + + 1. The fill commands will break a line after a period followed by + one space, and put just one space after each period. + + 2. The sentence commands stop for single spaces. + +For more details, see Info node `(emacs) Fill Commands' and Info +node `(emacs) Sentences'. + +See also `sentence-end-without-period' and `colon-double-space'. This value is used by the function `sentence-end' to construct the regexp describing the end of a sentence, when the value of the variable diff --git a/src/treesit.c b/src/treesit.c index f0c786e921d..a0e41add475 100644 --- a/src/treesit.c +++ b/src/treesit.c @@ -2942,7 +2942,7 @@ the query. */) /* As of right now, the node returned by treesit_resolve_node always passes treesit_check_node; but it might not be true in the future, so adding the line below just to be safe. */ - treesit_check_node (node); + treesit_check_node (lisp_node); /* Extract C values from Lisp objects. */ TSNode treesit_node = XTS_NODE (lisp_node)->node;