Mercurial > emacs
changeset 95350:3e684bf03875
(x_draw_glyph_string): If a clipmask is specified, use it.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Tue, 27 May 2008 21:10:55 +0000 |
| parents | 953bf413e9a3 |
| children | d797842f5ca1 |
| files | src/xterm.c |
| diffstat | 1 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/xterm.c Tue May 27 21:10:39 2008 +0000 +++ b/src/xterm.c Tue May 27 21:10:55 2008 +0000 @@ -2664,8 +2664,10 @@ 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. */