From: Chong Yidong <cyd@stupidchicken.com>
Date: Sat, 15 Nov 2008 05:33:17 +0000 (+0000)
Subject: (x_draw_glyph_string): For stretch glyphs, don't call
X-Git-Tag: emacs-pretest-23.0.90~1827
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=85bdc6d29e19aa1b155de0361286ec7593b8693f;p=emacs.git

(x_draw_glyph_string): For stretch glyphs, don't call
x_draw_glyph_string_background.
---

diff --git a/src/w32term.c b/src/w32term.c
index 69ebaf554f0..c9960420597 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -2248,7 +2248,10 @@ x_draw_glyph_string (s)
           {
             x_set_glyph_string_gc (next);
             x_set_glyph_string_clipping (next);
-            x_draw_glyph_string_background (next, 1);
+	    if (next->first_glyph->type == STRETCH_GLYPH)
+	      x_draw_stretch_glyph_string (next);
+	    else
+	      x_draw_glyph_string_background (next, 1);
             next->num_clips = 0;
           }
     }
diff --git a/src/xterm.c b/src/xterm.c
index 7f0c0b5aba2..4d74910fec7 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -2660,7 +2660,10 @@ x_draw_glyph_string (s)
 	  {
 	    x_set_glyph_string_gc (next);
 	    x_set_glyph_string_clipping (next);
-	    x_draw_glyph_string_background (next, 1);
+	    if (next->first_glyph->type == STRETCH_GLYPH)
+	      x_draw_stretch_glyph_string (next);
+	    else
+	      x_draw_glyph_string_background (next, 1);
 	    next->num_clips = 0;
 	  }
     }