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

Fix display of overlay strings with faces after ellipsis (Bug#19307)

Browse source 
src/xdisp.c (set_iterator_to_next): Set value of stop_charpos
 according to the object we are about to resume iterating.
This commit is contained in:
Eli Zaretskii 2015-02-02 18:23:32 +02:00
parent e9a7e10b18
commit 27e11c0185
2 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/ChangeLog
View file

@ -1,5 +1,9 @@
2015-02-02 Eli Zaretskii <eliz@gnu.org> 2015-02-02 Eli Zaretskii <eliz@gnu.org>
* xdisp.c (set_iterator_to_next): Set value of stop_charpos
according to the object we are about to resume iterating.
(Bug#19307)
* dispnew.c (adjust_glyph_matrix): Set the update_mode_line flag * dispnew.c (adjust_glyph_matrix): Set the update_mode_line flag
of the window whose current glyph matrix was resized, which of the window whose current glyph matrix was resized, which
disables the mode-line row as side effect. disables the mode-line row as side effect.

5
src/xdisp.c
View file

@ -7488,8 +7488,13 @@ set_iterator_to_next (struct it *it, int reseat_p)
/* Maybe recheck faces after display vector. */ /* Maybe recheck faces after display vector. */
if (recheck_faces) if (recheck_faces)
{
if (it->method == GET_FROM_STRING)
it->stop_charpos = IT_STRING_CHARPOS (*it);
else
it->stop_charpos = IT_CHARPOS (*it); it->stop_charpos = IT_CHARPOS (*it);
} }
}
break; break;
case GET_FROM_STRING: case GET_FROM_STRING: