2 files changed, 8 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index b4a3e74c453..78afe35a8bb 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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
diff --git a/src/w32term.c b/src/w32term.c
index 0fbbf370fa2..a9bbbbe23fc 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -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. */