master 4cabf16: Handle mid-gstring face changes

[Pip Cet]

branch: master
commit 4cabf16e1dd2c908c4156fb34605ed52b3be0504
Author: Pip Cet <pipcet@gmail.com>
Commit: Pip Cet <pipcet@gmail.com>

    Handle mid-gstring face changes
    
    * src/xdisp.c (fill_gstring_glyph_string): Don't extend the glyph
    string past face changes.  (Bug#41454)
---
 src/xdisp.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/xdisp.c b/src/xdisp.c
index f65c3eb..327e8a1 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;