# HG changeset patch
# User Gerd Moellmann <gerd@gnu.org>
# Date 1003140728 0
# Node ID df00f7799bb7ccabac67e55ce895cf1d2cc4108f
# Parent  f169b10c8e00319667e78f8d38a06805d51913d7
(x_draw_glyph_string): Restore clipping after
drawing box.

diff -r f169b10c8e00 -r df00f7799bb7 src/xterm.c
--- a/src/xterm.c	Mon Oct 15 10:04:31 2001 +0000
+++ b/src/xterm.c	Mon Oct 15 10:12:08 2001 +0000
@@ -4446,7 +4446,6 @@
 
   /* Set up S->gc, set clipping and draw S.  */
   x_set_glyph_string_gc (s);
-  x_set_glyph_string_clipping (s);
 
   /* Draw relief (if any) in advance for char/composition so that the
      glyph string can be drawn over it.  */
@@ -4456,10 +4455,14 @@
 	  || s->first_glyph->type == COMPOSITE_GLYPH))
 
     {
+      x_set_glyph_string_clipping (s);
       x_draw_glyph_string_background (s, 1);
       x_draw_glyph_string_box (s);
+      x_set_glyph_string_clipping (s);
       relief_drawn_p = 1;
     }
+  else
+    x_set_glyph_string_clipping (s);
 
   switch (s->first_glyph->type)
     {