From c1e4782a8afe46dbe3745fc50e71f58144023295 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Tue, 27 May 2008 21:10:55 +0000 Subject: [PATCH] (x_draw_glyph_string): If a clipmask is specified, use it. --- src/xterm.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/xterm.c b/src/xterm.c index 42049c6939..a14a8ed20e 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -2664,8 +2664,10 @@ x_draw_glyph_string (s) x_set_glyph_string_clipping (s); relief_drawn_p = 1; } - else if ((s->prev && s->prev->hl != s->hl && s->left_overhang) - || (s->next && s->next->hl != s->hl && s->right_overhang)) + else if (!s->clip_head /* draw_glyphs didn't specify a clip mask. */ + && !s->clip_tail + && ((s->prev && s->prev->hl != s->hl && s->left_overhang) + || (s->next && s->next->hl != s->hl && s->right_overhang))) /* We must clip just this glyph. left_overhang part has already drawn when s->prev was drawn, and right_overhang part will be drawn later when s->next is drawn. */ -- 2.20.1