Merge from origin/emacs-26

c26d452 (origin/emacs-26) * src/macfont.m (macfont_shape): Use conven...
140e7f8 Recommend using font-lock-face over face (Bug#35044)
7cb5364 Check if mouse_face_overlay was deleted (Bug#35273)

# Conflicts:
#	src/macfont.m

2 files changed, 4 insertions, 2 deletions

diff --git a/src/macfont.m b/src/macfont.m
index d8e86201f53..0ade77e7337 100644
--- a/src/macfont.m
+++ b/src/macfont.m
@@ -2991,7 +2991,7 @@ macfont_shape (Lisp_Object lgstring)
 
       if (NILP (lglyph))
         {
-          lglyph = make_nil_vector (LGLYPH_SIZE);
+          lglyph = LGLYPH_NEW ();
           LGSTRING_SET_GLYPH (lgstring, i, lglyph);
         }
 
diff --git a/src/xdisp.c b/src/xdisp.c
index d52d1333a04..95ff8513e30 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -31641,7 +31641,9 @@ note_mouse_highlight (struct frame *f, int x, int y)
              is currently hidden to avoid Bug#30519.  */
           || (!hlinfo->mouse_face_hidden
               && OVERLAYP (hlinfo->mouse_face_overlay)
-              && mouse_face_overlay_overlaps (hlinfo->mouse_face_overlay)))
+              /* It's possible the overlay was deleted (Bug#35273).  */
+              && XMARKER (OVERLAY_START (hlinfo->mouse_face_overlay))->buffer
+              && mouse_face_overlay_overlaps (hlinfo->mouse_face_overlay)))
         {
           /* Find the highest priority overlay with a mouse-face.  */
           Lisp_Object overlay = Qnil;