; * src/xdisp.c (extend_face_to_end_of_line): Fix last change.

diff --git a/src/xdisp.c b/src/xdisp.c
index c3a46651da8d2bf478e820adf976a2d8fad3a5e9..538c3e6b87e33b389ded8ac1be57540ff88c2bb7 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -20274,13 +20274,14 @@ extend_face_to_end_of_line (struct it *it)
          it->area = LEFT_MARGIN_AREA;
          it->face_id = default_face->id;
          while (it->glyph_row->used[LEFT_MARGIN_AREA]
-                < WINDOW_LEFT_MARGIN_WIDTH (it->w))
+                < WINDOW_LEFT_MARGIN_WIDTH (it->w)
+                && g < it->glyph_row->glyphs[TEXT_AREA])
            {
              PRODUCE_GLYPHS (it);
              /* term.c:produce_glyphs advances it->current_x only for
                 TEXT_AREA.  */
              it->current_x += it->pixel_width;
-             ++it->glyph_row->used[LEFT_MARGIN_AREA];
+             g++;
            }
 
          it->current_x = saved_x;
@@ -20314,11 +20315,12 @@ extend_face_to_end_of_line (struct it *it)
          it->area = RIGHT_MARGIN_AREA;
          it->face_id = default_face->id;
          while (it->glyph_row->used[RIGHT_MARGIN_AREA]
-                < WINDOW_RIGHT_MARGIN_WIDTH (it->w))
+                < WINDOW_RIGHT_MARGIN_WIDTH (it->w)
+                && g < it->glyph_row->glyphs[LAST_AREA])
            {
              PRODUCE_GLYPHS (it);
              it->current_x += it->pixel_width;
-             ++it->glyph_row->used[RIGHT_MARGIN_AREA];
+             g++;
            }
 
          it->area = TEXT_AREA;