diff options
| author | Gerd Moellmann <gerd@gnu.org> | 2001-03-14 12:40:08 +0000 |
|---|---|---|
| committer | Gerd Moellmann <gerd@gnu.org> | 2001-03-14 12:40:08 +0000 |
| commit | 57ac7c8180a3b22289543c33cd9aab9ceb42d892 (patch) | |
| tree | 7f436ed4b9ecb69037f1797e053f32a0b36e3a8a | |
| parent | 56cd396575ac9f853a4c4a214e82b90993ad9d8e (diff) | |
| download | emacs-57ac7c8180a3b22289543c33cd9aab9ceb42d892.tar.gz | |
(x_draw_glyph_string_box): Don't draw a full-width
box just because the glyph row's full_width_p flag is set.
| -rw-r--r-- | src/ChangeLog | 7 | ||||
| -rw-r--r-- | src/xterm.c | 8 |
2 files changed, 10 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 9ebda3d10e3..1a111f026a1 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2001-03-14 Gerd Moellmann <gerd@gnu.org> + + * xterm.c (x_draw_glyph_string_box): Don't draw a full-width + box just because the glyph row's full_width_p flag is set. + 2001-03-13 Gerd Moellmann <gerd@gnu.org> * xmenu.c (popup_activate_callback, popup_deactivate_callback): @@ -8,7 +13,7 @@ workaround code for LessTif; it doesn't work anymore. * xterm.c [USE_TOOLKIT_SCROLL_BARS && USE_MOTIF]: Don't include - SscrollBarP.h. + Xm/ScrollBarP.h. * xterm.c (x_set_toolkit_scroll_bar_thumb) [USE_MOTIF]: Don't access private scroll bar data; it's no longer necessary with diff --git a/src/xterm.c b/src/xterm.c index 4c90b835412..158db55612b 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -2487,7 +2487,7 @@ struct glyph_string }; -#if 0 +#if 1 static void x_dump_glyph_string (s) @@ -3835,9 +3835,9 @@ x_draw_glyph_string_box (s) width = abs (s->face->box_line_width); raised_p = s->face->box == FACE_RAISED_BOX; left_x = s->x; - right_x = ((s->row->full_width_p - ? last_x - 1 - : min (last_x, s->x + s->background_width) - 1)); + right_x = (s->row->full_width_p && s->extends_to_end_of_line_p + ? last_x - 1 + : min (last_x, s->x + s->background_width) - 1); top_y = s->y; bottom_y = top_y + s->height - 1; |