From: Pip Cet <pipcet@gmail.com>
Date: Sun, 31 May 2020 19:55:48 +0000 (+0000)
Subject: Handle mid-gstring face changes
X-Git-Tag: emacs-28.0.90~7222
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4cabf16e1dd2c908c4156fb34605ed52b3be0504;p=emacs.git

Handle mid-gstring face changes

* src/xdisp.c (fill_gstring_glyph_string): Don't extend the glyph
string past face changes.  (Bug#41454)
---

diff --git a/src/xdisp.c b/src/xdisp.c
index f65c3ebcd2f..327e8a183b1 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -27706,6 +27706,7 @@ fill_gstring_glyph_string (struct glyph_string *s, int face_id,
   while (glyph < last
 	 && glyph->u.cmp.automatic
 	 && glyph->u.cmp.id == s->cmp_id
+	 && glyph->face_id == face_id
 	 && s->cmp_to == glyph->slice.cmp.from)
     {
       s->width += glyph->pixel_width;