Box cursor incorrectly drawn on stippled stretch glyphs

[Johan Bockgård]

BUG:

$ emacs -Q

    (insert (propertize "x\tx" 'font-lock-face '(:stipple (2 2 "\0\1"))))

The box cursor is not draw correctly when placed on the tab.


FIX:

When drawing the cursor, s->stippled_p should be 0. It has already been
given the correct value by the call to x_set_glyph_string_gc in
x_draw_glyph_string, so don't set it in x_draw_stretch_glyph_string.



2007-10-22  Johan Bockgård  <address@hidden>

        * xterm.c, w32term.c, macterm.c (x_draw_stretch_glyph_string):
        Don't set s->stippled_p here.


Index: xterm.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/xterm.c,v
retrieving revision 1.963
diff -u -r1.963 xterm.c
--- xterm.c     13 Oct 2007 12:46:21 -0000      1.963
+++ xterm.c     24 Oct 2007 14:44:07 -0000
@@ -2597,7 +2597,6 @@
      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)
Index: macterm.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/macterm.c,v
retrieving revision 1.236
diff -u -r1.236 macterm.c
--- macterm.c   16 Oct 2007 16:28:38 -0000      1.236
+++ macterm.c   24 Oct 2007 14:44:24 -0000
@@ -3789,7 +3789,6 @@
      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)
Index: w32term.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/w32term.c,v
retrieving revision 1.273
diff -u -r1.273 w32term.c
--- w32term.c   15 Oct 2007 02:07:50 -0000      1.273
+++ w32term.c   24 Oct 2007 14:44:33 -0000
@@ -2410,7 +2410,6 @@
      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)

-- 
Johan Bockgård