# HG changeset patch
# User Karl Heuer <kwzh@gnu.org>
# Date 766447488 0
# Node ID 9e949c4d0e4c75ee24567d7a0eaf8acd4f27f656
# Parent  4b8dc0a39b47bd9cf9c98801317cf70b48c85472
(fix_glyph) [HAVE_X_WINDOWS]: When glyph face is 0, use the computed face as
given.

diff -r 4b8dc0a39b47 -r 9e949c4d0e4c src/xdisp.c
--- a/src/xdisp.c	Fri Apr 15 22:00:44 1994 +0000
+++ b/src/xdisp.c	Fri Apr 15 22:04:48 1994 +0000
@@ -1893,16 +1893,18 @@
    with a displayable computed face code.  */
 
 static GLYPH
-fix_glyph (f, glyph, current_face)
+fix_glyph (f, glyph, cface)
      FRAME_PTR f;
      GLYPH glyph;
-     int current_face;
+     int cface;
 {
 #ifdef HAVE_X_WINDOWS
-  if (! FRAME_TERMCAP_P (f) && FAST_GLYPH_FACE (glyph) != 0)
-    return FAST_MAKE_GLYPH (FAST_GLYPH_CHAR (glyph),
-			    compute_glyph_face (f, FAST_GLYPH_FACE (glyph),
-						current_face));
+  if (! FRAME_TERMCAP_P (f))
+    {
+      if (FAST_GLYPH_FACE (glyph) != 0)
+	cface = compute_glyph_face (f, FAST_GLYPH_FACE (glyph), cface);
+      glyph = FAST_MAKE_GLYPH (FAST_GLYPH_CHAR (glyph), cface);
+    }
 #endif
   return glyph;
 }