diff options
| author | Pip Cet | 2020-05-31 19:55:48 +0000 |
|---|---|---|
| committer | Pip Cet | 2020-06-03 07:36:38 +0000 |
| commit | 4cabf16e1dd2c908c4156fb34605ed52b3be0504 (patch) | |
| tree | 60f76c36f0764aee956d1cd3d94aac0f2971a96a /src | |
| parent | 188dc2e5a3cb2de69ec14715ba288ab1e30da6eb (diff) | |
| download | emacs-4cabf16e1dd2c908c4156fb34605ed52b3be0504.tar.gz emacs-4cabf16e1dd2c908c4156fb34605ed52b3be0504.zip | |
Handle mid-gstring face changes
* src/xdisp.c (fill_gstring_glyph_string): Don't extend the glyph
string past face changes. (Bug#41454)
Diffstat (limited to 'src')
| -rw-r--r-- | src/xdisp.c | 1 |
1 files changed, 1 insertions, 0 deletions
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, | |||
| 27706 | while (glyph < last | 27706 | while (glyph < last |
| 27707 | && glyph->u.cmp.automatic | 27707 | && glyph->u.cmp.automatic |
| 27708 | && glyph->u.cmp.id == s->cmp_id | 27708 | && glyph->u.cmp.id == s->cmp_id |
| 27709 | && glyph->face_id == face_id | ||
| 27709 | && s->cmp_to == glyph->slice.cmp.from) | 27710 | && s->cmp_to == glyph->slice.cmp.from) |
| 27710 | { | 27711 | { |
| 27711 | s->width += glyph->pixel_width; | 27712 | s->width += glyph->pixel_width; |