diff options
| author | Karl Heuer <kwzh@gnu.org> | 1994-04-15 22:04:48 +0000 |
|---|---|---|
| committer | Karl Heuer <kwzh@gnu.org> | 1994-04-15 22:04:48 +0000 |
| commit | 659a218f9564214823c9a98b7deea74b12be7e77 (patch) | |
| tree | 78a041fc714b9dba57b3858582099e9d79014b5f /src/xdisp.c | |
| parent | 2da0df4def332dcf77265011dffdfd83d02429b7 (diff) | |
| download | emacs-659a218f9564214823c9a98b7deea74b12be7e77.tar.gz | |
(fix_glyph) [HAVE_X_WINDOWS]: When glyph face is 0, use the computed face as
given.
Diffstat (limited to 'src/xdisp.c')
| -rw-r--r-- | src/xdisp.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/xdisp.c b/src/xdisp.c index fe981183e47..8cb80ad69d8 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -1893,16 +1893,18 @@ copy_part_of_rope (f, to, s, from, len, face) 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; } |