From 56dad874f3112244ffacf735703c8d763c1514c9 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Thu, 1 Nov 2007 03:49:22 +0000 Subject: [PATCH] =?utf8?q?Johan=20Bockg=EF=BF=BD=20=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit (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 --- lisp/ChangeLog | 7 +++++++ src/ChangeLog | 6 ++++++ src/macterm.c | 1 - src/w32term.c | 1 - src/xterm.c | 1 - 5 files changed, 13 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2e1222e6b65..7938ddebed9 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2007-11-01 Glenn Morris + + * 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 * ediff-util.el (ediff-nuke-selective-display): Move definition to diff --git a/src/ChangeLog b/src/ChangeLog index 4e93e3937f6..82d28ab24d1 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2007-11-01 Johan Bockg,Ae(Brd + + * 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 * 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) 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 edde95f5f13..a0c595b3a34 100644 --- 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 f4bead6080c..6991579a881 100644 --- 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) -- 2.39.2