Merge from origin/emacs-26

34fcfc5 (origin/emacs-26, emacs-26) * lisp/emacs-lisp/inline.el (defi...
f7a62c2 Fix doc string of 'footnote-style-alist'
c3b6742 Improve documentation of selecting windows
861d110 Improve documentation of records
22b3075 * etc/NEWS: Mention the removal of pinentry.el.  (Bug#27445)
689526b Fix interactive spec of 'semantic-ia-show-variants'
90ca37f Fix documentation of 'mouse-drag-and-drop-region' and friends
d60faf3 Improve detection of speller version in ispell.el
a0e3b06 Document 'mouse-drag-and-drop-region' options and mention the...
164e84c Fix uses of 'nil' and 'non-nil' in manuals and a few more min...
798f07f Document that mode commands should be idempotent.
ad2a47c ; * src/xdisp.c (extend_face_to_end_of_line): Fix last change.
88ddf53 Fontify a CPP construct correctly when a comment follows with...
de7de9c Prevent infloop in redisplay on TTY frames
293720e Fix loss of documentation face in certain CC Mode doc comment...

# Conflicts:
#	etc/NEWS
#	lisp/mail/footnote.el

1 files changed, 6 insertions, 2 deletions

diff --git a/src/xdisp.c b/src/xdisp.c
index efc47b39e60..7d13338e25a 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -20274,12 +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;
+              g++;
             }
 
           it->current_x = saved_x;
@@ -20313,10 +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;
+              g++;
             }
 
           it->area = TEXT_AREA;