(x_draw_glyph_string_box): Don't draw a full-width

box just because the glyph row's full_width_p flag is set.

diff --git a/src/ChangeLog b/src/ChangeLog
index 9ebda3d10e37620edf363fe7d9c5701cfed7aa11..1a111f026a1aaff01e2bdc17b6cc10b70bb4835a 100644 (file)
--- 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 4c90b8354129108616aa940afa76ca53440c364b..158db55612beade35b5430602f6bfa6c76214de6 100644 (file)
--- 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;