Merge from origin/emacs-26

83187cd (origin/emacs-26) Skip mouse-face overlap check when mouse-fa...
a6d8f2b Fix capitalization of "Mail-Followup-To"
f9640f9 * lisp/progmodes/grep.el (grep-compute-defaults):
3a26c8a Semantic manual fixes
106a9f6 More improvements in the Emacs manual
244db85 * doc/misc/viper.texi (File and Buffer Handling): Add missing...
f0d6a16 Fix documentation of 'x-underline-at-descent-line'
69a8f45 * lisp/textmodes/flyspell.el (flyspell-get-word): Doc fix.
05214c6 Correct variable markup in manuals
355c644 Improve the "Sending Mail" chapter of Emacs manual

Conflicts:
	src/nsterm.m
	src/w32term.c

2 files changed, 8 insertions, 4 deletions

diff --git a/src/xdisp.c b/src/xdisp.c
index 14286447d13..9170d6b777f 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -31377,10 +31377,12 @@ note_mouse_highlight (struct frame *f, int x, int y)
       /* Check mouse-face highlighting.  */
       if (! same_region
           /* If there exists an overlay with mouse-face overlapping
-             the one we are currently highlighting, we have to
-             check if we enter the overlapping overlay, and then
-             highlight only that.  */
-          || (OVERLAYP (hlinfo->mouse_face_overlay)
+             the one we are currently highlighting, we have to check
+             if we enter the overlapping overlay, and then highlight
+             only that.  Skip the check when mouse-face highlighting
+             is currently hidden to avoid Bug#30519.  */
+          || (!hlinfo->mouse_face_hidden
+              && OVERLAYP (hlinfo->mouse_face_overlay)
               && mouse_face_overlay_overlaps (hlinfo->mouse_face_overlay)))
         {
           /* Find the highest priority overlay with a mouse-face.  */
diff --git a/src/xterm.c b/src/xterm.c
index 2371058cd45..0d25c7f1a26 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -13250,6 +13250,8 @@ small font display sizes.  */);
   DEFVAR_BOOL ("x-underline-at-descent-line",
                x_underline_at_descent_line,
      doc: /* Non-nil means to draw the underline at the same place as the descent line.
+(If `line-spacing' is in effect, that moves the underline lower by
+that many pixels.)
 A value of nil means to draw the underline according to the value of the
 variable `x-use-underline-position-properties', which is usually at the
 baseline level.  The default value is nil.  */);