From: Gerd Moellmann <gerd@gnu.org>
Date: Fri, 2 Jun 2000 19:03:31 +0000 (+0000)
Subject: (x_set_mouse_face_gc): If first glyph isn't a character
X-Git-Tag: emacs-pretest-21.0.90~3544
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=033e3e18df29b7e9cf98f4ae66125b06774b0af1;p=emacs.git

(x_set_mouse_face_gc): If first glyph isn't a character
glyph, use the ASCII NUL character to determine the face.
---

diff --git a/src/xterm.c b/src/xterm.c
index 28280a4bd46..ba719f76897 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -2611,7 +2611,10 @@ x_set_mouse_face_gc (s)
   /* What face has to be used for the mouse face?  */
   face_id = FRAME_X_DISPLAY_INFO (s->f)->mouse_face_face_id;
   face = FACE_FROM_ID (s->f, face_id);
-  face_id = FACE_FOR_CHAR (s->f, face, s->first_glyph->u.ch);
+  if (s->first_glyph->type == CHAR_GLYPH)
+    face_id = FACE_FOR_CHAR (s->f, face, s->first_glyph->u.ch);
+  else
+    face_id = FACE_FOR_CHAR (s->f, face, 0);
   s->face = FACE_FROM_ID (s->f, face_id);
   PREPARE_FACE_FOR_DISPLAY (s->f, s->face);