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/lisp/ChangeLog b/lisp/ChangeLog
index 2e1222e6b6541c560c794325bfcd579389c866a1..7938ddebed94645cd558b52862e2256f262a9dc7 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2007-11-01  Glenn Morris  <rgm@gnu.org>
+
+       * mail/footnote.el (footnote-numeric-regexp)
+       (footnote-english-upper-regexp, footnote-english-lower-regexp)
+       (footnote-roman-lower-regexp, footnote-roman-upper-regexp):
+       Match multi-character footnotes.
+
 2007-11-01  Dan Nicolaescu  <dann@ics.uci.edu>
 
        * ediff-util.el (ediff-nuke-selective-display): Move definition to

diff --git a/src/ChangeLog b/src/ChangeLog
index 4e93e3937f68778b14015e60776a8496aa7c2e57..82d28ab24d1386d7ab37d954a966dd0ccd5350c8 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2007-11-01  Johan Bockg\e,Ae\e(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-11-01  Dan Nicolaescu  <dann@ics.uci.edu>
 
        * sunfns.c: Remove file

diff --git a/src/macterm.c b/src/macterm.c
index d015a00e1463611d0050563f5e790c19f39a679d..5ea8f0ba6077095a455ea394b7ede33520d77034 100644 (file)
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -3789,7 +3789,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 edde95f5f13aff2e78e6445387ff2c4f28a28a77..a0c595b3a34955cd57548e63e4485ac22364420d 100644 (file)
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -2410,7 +2410,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 f4bead6080c1e52914cd503dc4208713a971c56e..6991579a881db0267031bd418e0cef5423a9c6dc 100644 (file)
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -2597,7 +2597,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)