aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGlenn Morris2007-11-01 03:49:22 +0000
committerGlenn Morris2007-11-01 03:49:22 +0000
commit56dad874f3112244ffacf735703c8d763c1514c9 (patch)
treeeb717fd0c233dd524002481432d93103157ffb8c /src
parent2c28c5196e15ca50ee18e5a617b1895f3e6139c3 (diff)
downloademacs-56dad874f3112244ffacf735703c8d763c1514c9.tar.gz
emacs-56dad874f3112244ffacf735703c8d763c1514c9.zip
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
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog6
-rw-r--r--src/macterm.c1
-rw-r--r--src/w32term.c1
-rw-r--r--src/xterm.c1
4 files changed, 6 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 4e93e3937f6..82d28ab24d1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
12007-11-01 Johan Bockg,Ae(Brd <bojohan@gnu.org>
2
3 * macterm.c, w32term.c, xterm.c (x_draw_stretch_glyph_string):
4 Don't set s->stippled_p here, since it has already been set by
5 x_set_glyph_string_gc from x_draw_glyph_string.
6
12007-11-01 Dan Nicolaescu <dann@ics.uci.edu> 72007-11-01 Dan Nicolaescu <dann@ics.uci.edu>
2 8
3 * sunfns.c: Remove file 9 * sunfns.c: Remove file
diff --git a/src/macterm.c b/src/macterm.c
index d015a00e146..5ea8f0ba607 100644
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -3789,7 +3789,6 @@ x_draw_stretch_glyph_string (s)
3789 struct glyph_string *s; 3789 struct glyph_string *s;
3790{ 3790{
3791 xassert (s->first_glyph->type == STRETCH_GLYPH); 3791 xassert (s->first_glyph->type == STRETCH_GLYPH);
3792 s->stippled_p = s->face->stipple != 0;
3793 3792
3794 if (s->hl == DRAW_CURSOR 3793 if (s->hl == DRAW_CURSOR
3795 && !x_stretch_cursor_p) 3794 && !x_stretch_cursor_p)
diff --git a/src/w32term.c b/src/w32term.c
index edde95f5f13..a0c595b3a34 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -2410,7 +2410,6 @@ x_draw_stretch_glyph_string (s)
2410 struct glyph_string *s; 2410 struct glyph_string *s;
2411{ 2411{
2412 xassert (s->first_glyph->type == STRETCH_GLYPH); 2412 xassert (s->first_glyph->type == STRETCH_GLYPH);
2413 s->stippled_p = s->face->stipple != 0;
2414 2413
2415 if (s->hl == DRAW_CURSOR 2414 if (s->hl == DRAW_CURSOR
2416 && !x_stretch_cursor_p) 2415 && !x_stretch_cursor_p)
diff --git a/src/xterm.c b/src/xterm.c
index f4bead6080c..6991579a881 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -2597,7 +2597,6 @@ x_draw_stretch_glyph_string (s)
2597 struct glyph_string *s; 2597 struct glyph_string *s;
2598{ 2598{
2599 xassert (s->first_glyph->type == STRETCH_GLYPH); 2599 xassert (s->first_glyph->type == STRETCH_GLYPH);
2600 s->stippled_p = s->face->stipple != 0;
2601 2600
2602 if (s->hl == DRAW_CURSOR 2601 if (s->hl == DRAW_CURSOR
2603 && !x_stretch_cursor_p) 2602 && !x_stretch_cursor_p)