emacs-29 a588937094f: Fix documentation of the 'line-height' text property

[Eli Zaretskii]

branch: emacs-29
commit a588937094f7beb7c716c1badff681afa8c4d5ae
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>

    Fix documentation of the 'line-height' text property
    
    * doc/lispref/display.texi (Line Height): More accurate
    documentation of the value t of 'line-height' text property.
    (Bug#62048)
---
 doc/lispref/display.texi | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index a8311f5c9a2..550d711c73a 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -2345,10 +2345,11 @@ newline.  The property value can be one of several 
forms:
 @item t
 If the property value is @code{t}, the newline character has no
 effect on the displayed height of the line---the visible contents
-alone determine the height.  The @code{line-spacing} property,
-described below, is also ignored in this case.  This is useful for
-tiling small images (or image slices) without adding blank areas
-between the images.
+alone determine the height.  The @code{line-spacing} property of the
+newline, described below, is also ignored in this case.  This is
+useful for tiling small images (or image slices) without adding blank
+areas between the images.
+
 @item (@var{height} @var{total})
 If the property value is a list of the form shown, that adds extra
 space @emph{below} the display line.  First Emacs uses @var{height} as
@@ -2409,7 +2410,9 @@ overrides line spacings specified for the frame.
 property that can enlarge the default frame line spacing and the
 buffer local @code{line-spacing} variable: if its value is larger than
 the buffer or frame defaults, that larger value is used instead, for
-the display line ending in that newline.
+the display line ending in that newline (unless the newline also has
+the @code{line-height} property whose value is one of the special
+values which cause @code{line-spacing} to be ignored, see above).
 
   One way or another, these mechanisms specify a Lisp value for the
 spacing of each line.  The value is a height spec, and it translates