Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-16 17:24:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge from origin/emacs-30

Browse source 
1f998d11a5 ; * doc/misc/ert.texi (erts files): Improve indexing.
52183c9596 ; * lisp/battery.el (battery-status-function): Doc fix.
dc3e79a80e ; * etc/DEBUG: Grammar fix.
7d02ffe87b ; * lisp/international/mule.el (define-coding-system): Do...
This commit is contained in:
Eli Zaretskii 2025-05-03 06:26:31 -04:00
commit 3bf5a1cda7
4 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
doc/misc/ert.texi
View file

@ -946,6 +946,7 @@ where the @samp{|} character is in the ``after'' form (and issue a
test failure if that isn't the case). (This is used in all subsequent
tests, unless overridden by a new @samp{Point-Char} spec.)
@cindex skipping tests, in erts file
@item Skip
If this is present and value is a form that evaluates to a
non-@code{nil} value, the test will be skipped.

2
etc/DEBUG
View file

@ -541,7 +541,7 @@ related data structures in a terse and user-friendly format:
'pgrow' dumps all glyphs in current glyph_row 'row'.
'pcursor' dumps current output_cursor.
The above commands also exist in a version with an 'x' suffix which takes an
The above commands also exist in versions with an 'x' suffix which take an
object of the relevant type as argument. For example, 'pgrowx' dumps all
glyphs in its argument, which must be of type 'struct glyph_row'.

8
lisp/battery.el
View file

@ -136,7 +136,13 @@ Its cons cells are of the form
(CONVERSION . REPLACEMENT-TEXT)
CONVERSION is the character code of a \"conversion specification\"
introduced by a `%' character in a control string."
introduced by a `%' character in a control string. See the
documentation of `battery-echo-area-format' for supported conversion
specifications and the format used by `battery' to show battery
status in the echo area.
The default value of the function is determined at startup, and depends
on the battery-related services available on the system."
:version "28.1"
:type '(choice (const nil) function))

5
lisp/international/mule.el
View file

@ -809,8 +809,9 @@ coding-system, to avoid infinite recursion.
`:default-char'
VALUE must be a character. On encoding, a character not supported by
the coding system is replaced with VALUE.
VALUE must be a character. On encoding, characters that are not
supported by the coding system are each replaced with VALUE. If
not specified, the default is the space character #x20.
`:for-unibyte'