1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-05 11:45:45 +00:00

(x_draw_glyph_string): Use clipmask if specified.

This commit is contained in:
Jason Rumney 2008-05-28 16:13:20 +00:00
parent 5b813fe87e
commit a6e0b7e572
2 changed files with 8 additions and 2 deletions

View File

@ -1,3 +1,7 @@
2008-05-28 Jason Rumney <jasonr@gnu.org>
* w32term.c (x_draw_glyph_string): Use clipmask if specified.
2008-05-28 Stefan Monnier <monnier@iro.umontreal.ca>
* fileio.c (Fwrite_region): Delay the defaulting to beg&z to after

View File

@ -2830,8 +2830,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. */