# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1211922655 0
# Node ID 3e684bf03875b6edc23d390c1e7afb5116856d83
# Parent  953bf413e9a36d9bb78d2ac66a311fc6bf174d0a
(x_draw_glyph_string): If a clipmask is specified, use it.

diff -r 953bf413e9a3 -r 3e684bf03875 src/xterm.c
--- 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. */