Mercurial > emacs

changeset 6896:9e949c4d0e4c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(fix_glyph) [HAVE_X_WINDOWS]: When glyph face is 0, use the computed face as given.
author Karl Heuer <kwzh@gnu.org>
date Fri, 15 Apr 1994 22:04:48 +0000
parents 4b8dc0a39b47
children a4ce1a6d7423
files src/xdisp.c
diffstat 1 files changed, 8 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- 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;
 }