sergiodj/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-07-08 09:42:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge from savannah/emacs-30

Browse source 
1647494c04 ; * etc/NEWS: Clarify.
b2c966f839 ; * src/treesit.c (Ftreesit_query_capture): Fix typo.
ae38579420 * java/res/mipmap-v26/emacs_icon.xml: Define monospace icon.
b2d99c0d0a Improve `sentence-end-double-space` docstring

# Conflicts:
#	etc/NEWS
This commit is contained in:
Po Lu 2024-07-01 18:12:40 +08:00
parent 311c677343 1647494c04
commit 71530ab1ae
4 changed files with 26 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
etc/NEWS.30
View file

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

1
java/res/mipmap-v26/emacs_icon.xml
View file

@ -20,4 +20,5 @@
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@drawable/emacs_background"/>
<foreground android:drawable="@drawable/emacs_foreground"/>
<monochrome android:drawable="@drawable/emacs_foreground"/>
</adaptive-icon>

24
lisp/textmodes/paragraphs.el
View file

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

2
src/treesit.c
View file

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