Merge from origin/emacs-30

38fec86281e ; Improve the documentation of 'slice' display spec (bug#...
3f05b455f7e ; * src/editfns.c (Fmessage): Mention 'inhibit-message' (...

2 files changed, 17 insertions, 6 deletions

diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index 0ba3b9d8d05..55c6206cf4d 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -5615,12 +5615,20 @@ instead of the text that has the display specification.
 
 @item (slice @var{x} @var{y} @var{width} @var{height})
 This specification together with @code{image} specifies a @dfn{slice}
-(a partial area) of the image to display.  The elements @var{y} and
-@var{x} specify the top left corner of the slice, within the image;
-@var{width} and @var{height} specify the width and height of the
-slice.  Integers are numbers of pixels.  A floating-point number
-in the range 0.0--1.0 stands for that fraction of the width or height
-of the entire image.
+(a partial area) of the image to display.  More precisely, the
+specification should have the following form:
+
+@lisp
+ ((slice @var{x} @var{y} @var{width} @var{height}) @var{image-desc})
+@end lisp
+
+@noindent
+where @var{image-desc} is an image descriptor described above.  The
+elements @var{x} and @var{y} specify the top left corner of the slice,
+within the image; @var{width} and @var{height} specify the width and
+height of the slice.  Integers are numbers of pixels.  A floating-point
+number in the range 0.0--1.0 stands for that fraction of the width or
+height of the entire image.
 
 @item ((margin nil) @var{string})
 A display specification of this form means to display @var{string}
diff --git a/src/editfns.c b/src/editfns.c
index ebb308ea796..9590b49dc25 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -3159,6 +3159,9 @@ Return the message.
 In batch mode, the message is printed to the standard error stream,
 followed by a newline.
 
+If the variable `inhibit-message' is non-nil, the message is not
+displayed, only logged in the `*Messages*' buffer.
+
 The first argument is a format control string, and the rest are data
 to be formatted under control of the string.  Percent sign (%), grave
 accent (\\=`) and apostrophe (\\=') are special in the format; see