From: Glenn Morris <rgm@gnu.org>
Date: Thu, 1 Nov 2007 03:47:34 +0000 (+0000)
Subject: Johan Bockg�  <bojohan at gnu.org>
X-Git-Tag: emacs-pretest-22.1.90~450
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b4a638b358651b9694738e9a610a48dddd3ebca3;p=emacs.git

Johan Bockg�  <bojohan at gnu.org>

(x_draw_stretch_glyph_string): Don't set s->stippled_p here, since it
has already been set by x_set_glyph_string_gc from
x_draw_glyph_string.

http://lists.gnu.org/archive/html/emacs-devel/2007-10/msg01571.html
---

diff --git a/src/ChangeLog b/src/ChangeLog
index c69eb2db180..1d33322996e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2007-11-01  Johan Bockg,Ae(Brd  <bojohan@gnu.org>
+
+	* macterm.c, w32term.c, xterm.c (x_draw_stretch_glyph_string):
+        Don't set s->stippled_p here, since it has already been set by
+	x_set_glyph_string_gc from x_draw_glyph_string.
+
 2007-10-31  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
 	* macfns.c [USE_ATSUI] (Fmac_atsu_font_face_attributes):
diff --git a/src/macterm.c b/src/macterm.c
index 726a0f72b18..9bc96e492d3 100644
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -3704,7 +3704,6 @@ x_draw_stretch_glyph_string (s)
      struct glyph_string *s;
 {
   xassert (s->first_glyph->type == STRETCH_GLYPH);
-  s->stippled_p = s->face->stipple != 0;
 
   if (s->hl == DRAW_CURSOR
       && !x_stretch_cursor_p)
diff --git a/src/w32term.c b/src/w32term.c
index 510f2381a6d..a2d64ba581f 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -2364,7 +2364,6 @@ x_draw_stretch_glyph_string (s)
      struct glyph_string *s;
 {
   xassert (s->first_glyph->type == STRETCH_GLYPH);
-  s->stippled_p = s->face->stipple != 0;
 
   if (s->hl == DRAW_CURSOR
       && !x_stretch_cursor_p)
diff --git a/src/xterm.c b/src/xterm.c
index ee26f054b4e..5bfd95b8aaf 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -2539,7 +2539,6 @@ x_draw_stretch_glyph_string (s)
      struct glyph_string *s;
 {
   xassert (s->first_glyph->type == STRETCH_GLYPH);
-  s->stippled_p = s->face->stipple != 0;
 
   if (s->hl == DRAW_CURSOR
       && !x_stretch_cursor_p)