From 7d02ffe87b401048fe10958cdc463f3bf7676ffd Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Thu, 1 May 2025 21:02:39 +0300 Subject: [PATCH 1/4] ; * lisp/international/mule.el (define-coding-system): Doc fix. --- lisp/international/mule.el | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lisp/international/mule.el b/lisp/international/mule.el index 8063ef68b7e..ddb2894daee 100644 --- a/lisp/international/mule.el +++ b/lisp/international/mule.el @@ -793,8 +793,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' From dc3e79a80ee5b958ab0f6ffc6861fb5ac9418bab Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Fri, 2 May 2025 10:26:08 +0800 Subject: [PATCH 2/4] ; * etc/DEBUG: Grammar fix. --- etc/DEBUG | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/DEBUG b/etc/DEBUG index f8186a429cd..450359dc323 100644 --- a/etc/DEBUG +++ b/etc/DEBUG @@ -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'. From 52183c9596cc4d346c872ad81ecbcf695e636f0b Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 2 May 2025 15:07:35 +0300 Subject: [PATCH 3/4] ; * lisp/battery.el (battery-status-function): Doc fix. --- lisp/battery.el | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lisp/battery.el b/lisp/battery.el index 0f39b3f7087..846cf22829f 100644 --- a/lisp/battery.el +++ b/lisp/battery.el @@ -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)) From 1f998d11a585a9915cc6e8b67050dc1bb9191107 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 3 May 2025 10:34:43 +0300 Subject: [PATCH 4/4] ; * doc/misc/ert.texi (erts files): Improve indexing. --- doc/misc/ert.texi | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/misc/ert.texi b/doc/misc/ert.texi index bde76d79394..205ed027f3e 100644 --- a/doc/misc/ert.texi +++ b/doc/misc/ert.texi @@ -939,6 +939,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.