procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Avoid assertion violation due to fill-column indicator face

Browse source 
* src/xdisp.c (extend_face_to_end_of_line): Use the original
iterator metrics for the stretch glyph, the one unaffected by the
'fill-column-indicator' face.  (Bug#60580)
This commit is contained in:
Eli Zaretskii 2023-01-05 22:33:51 +02:00
parent 62c2963ce6
commit ec172d748f
1 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/xdisp.c
View file

@ -23322,8 +23322,9 @@ extend_face_to_end_of_line (struct it *it)
it->avoid_cursor_p = true; it->avoid_cursor_p = true;
it->object = Qnil; it->object = Qnil;
const int stretch_ascent = (((it->ascent + it->descent) const int stretch_height = it->ascent + it->descent;
* FONT_BASE (font)) / FONT_HEIGHT (font)); const int stretch_ascent =
(stretch_height * FONT_BASE (font)) / FONT_HEIGHT (font);
if (indicator_column >= 0 if (indicator_column >= 0
&& indicator_column > it->current_x && indicator_column > it->current_x
@ -23343,8 +23344,7 @@ extend_face_to_end_of_line (struct it *it)
if (stretch_width > 0) if (stretch_width > 0)
{ {
append_stretch_glyph (it, Qnil, stretch_width, append_stretch_glyph (it, Qnil, stretch_width,
it->ascent + it->descent, stretch_height, stretch_ascent);
stretch_ascent);
} }
/* Generate the glyph indicator only if /* Generate the glyph indicator only if
@ -23352,6 +23352,8 @@ extend_face_to_end_of_line (struct it *it)
if (it->current_x < indicator_column) if (it->current_x < indicator_column)
{ {
const int save_face_id = it->face_id; const int save_face_id = it->face_id;
const int save_ascent = it->ascent;
const int save_descent = it->descent;
it->char_to_display it->char_to_display
= XFIXNAT (Vdisplay_fill_column_indicator_character); = XFIXNAT (Vdisplay_fill_column_indicator_character);
it->face_id it->face_id
@ -23359,6 +23361,8 @@ extend_face_to_end_of_line (struct it *it)
0, extend_face_id); 0, extend_face_id);
PRODUCE_GLYPHS (it); PRODUCE_GLYPHS (it);
it->face_id = save_face_id; it->face_id = save_face_id;
it->ascent = save_ascent;
it->descent = save_descent;
} }
} }
@ -23372,8 +23376,7 @@ extend_face_to_end_of_line (struct it *it)
{ {
clear_position (it); clear_position (it);
append_stretch_glyph (it, Qnil, stretch_width, append_stretch_glyph (it, Qnil, stretch_width,
it->ascent + it->descent, stretch_height, stretch_ascent);
stretch_ascent);
} }
} }