master 7a51329 5/5: Merge from origin/emacs-27

[Glenn Morris]

branch: master
commit 7a5132954b89736001351d7e03a72beed9372c84
Merge: 2e33c3f 02a31c9
Author: Glenn Morris <rgm@gnu.org>
Commit: Glenn Morris <rgm@gnu.org>

    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>: ...
---
 doc/lispref/display.texi | 21 ++++++++++++---------
 doc/lispref/intro.texi   |  3 ++-
 etc/PROBLEMS             | 13 +++++++++++++
 src/frame.c              |  2 +-
 4 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index e549400..40978b4 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 254d4e9..a4b4795 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.
diff --git a/etc/PROBLEMS b/etc/PROBLEMS
index 67537f6..dada27f 100644
--- a/etc/PROBLEMS
+++ b/etc/PROBLEMS
@@ -967,6 +967,19 @@ index 5504171..431adf8 100644
 If you can't modify that file directly, copy it to the directory
 ~/.m17n.d/ (create it if it doesn't exist), and apply the patch.
 
+** On MS-Windows, some characters display as boxes with hex code.
+
+Also, some characters could display with wrong fonts.
+
+This can happen if Emacs was compiled without HarfBuzz support, and/or
+if the HarfBuzz DLLs are not available at run time.  Emacs will then
+fall back to the Uniscribe as its shaping engine; Uniscribe was
+deprecated by Microsoft, and sometimes fails to display correctly when
+modern fonts are used, such as Noto Emoji or Ebrima.
+
+The solution is to switch to a configuration that uses HarfBuzz as its
+shaping engine, where these problems don't exist.
+
 * Internationalization problems
 
 ** M-{ does not work on a Spanish PC keyboard.
diff --git a/src/frame.c b/src/frame.c
index c4dfc35..3f93450 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -6106,7 +6106,7 @@ when the mouse is over clickable text.  */);
   Vmouse_highlight = Qt;
 
   DEFVAR_LISP ("make-pointer-invisible", Vmake_pointer_invisible,
-               doc: /* If non-nil, make pointer invisible while typing.
+               doc: /* If non-nil, make mouse pointer invisible while typing.
 The pointer becomes visible again when the mouse is moved.  */);
   Vmake_pointer_invisible = Qt;