Merge from origin/emacs-27

02a31c9632 (origin/emacs-27) Minor improvement in the ELisp manual's ...
f750def778 Mention in PROBLEMS the problems with fonts and Uniscribe
082d8a21b1 Minor copyedits in 'line-height' documentation
5b23393bcc ; * src/frame.c (syms_of_frame) <make-pointer-invisible>: ...

2 files changed, 14 insertions, 10 deletions

diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index e5494002ce8..40978b408ae 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -2182,21 +2182,24 @@ actual line height can never be less than the default.
 @kindex line-height @r{(text property)}
   A newline can have a @code{line-height} text or overlay property
 that controls the total height of the display line ending in that
-newline.
+newline.  The property value can be one of several forms:
 
-  If the property value is @code{t}, the newline character has no
+@table @code
+@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.
-
-  If the property value is a list of the form @code{(@var{height}
-@var{total})}, that adds extra space @emph{below} the display line.
-First Emacs uses @var{height} as a height spec to control extra space
-@emph{above} the line; then it adds enough space @emph{below} the line
-to bring the total line height up to @var{total}.  In this case, any
-value of @code{line-spacing} property for the newline is ignored.
+@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
+a height spec to control extra space @emph{above} the line; then it
+adds enough space @emph{below} the line to bring the total line height
+up to @var{total}.  In this case, any value of @code{line-spacing}
+property for the newline is ignored.
+@end table
 
 @cindex height spec
   Any other kind of property value is a height spec, which translates
diff --git a/doc/lispref/intro.texi b/doc/lispref/intro.texi
index 254d4e9b033..a4b479597ea 100644
--- a/doc/lispref/intro.texi
+++ b/doc/lispref/intro.texi
@@ -251,7 +251,8 @@ indicated with @samp{@equiv{}}.
 
   Many of the examples in this manual print text when they are
 evaluated.  If you execute example code in a Lisp Interaction buffer
-(such as the buffer @file{*scratch*}), the printed text is inserted into
+(such as the buffer @file{*scratch*}) by typing @kbd{C-j} after the
+closing parenthesis of the example, the printed text is inserted into
 the buffer.  If you execute the example by other means (such as by
 evaluating the function @code{eval-region}), the printed text is
 displayed in the echo area.