From: Gerd Moellmann <gerd@gnu.org>
Date: Mon, 15 Oct 2001 10:14:37 +0000 (+0000)
Subject: (x_draw_glyph_string): Restore clipping after
X-Git-Tag: emacs-21.1~57
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0a4795a87511c22141116f0b32bc95165aecb859;p=emacs.git

(x_draw_glyph_string): Restore clipping after
drawing box.
---

diff --git a/src/xterm.c b/src/xterm.c
index 7f67815feac..01499c31b06 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -4446,7 +4446,6 @@ x_draw_glyph_string (s)
 
   /* 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 @@ x_draw_glyph_string (s)
 	  || 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)
     {