diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/xdisp.c | 7 |
2 files changed, 10 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index c8ea8b586ed..6f678d481a6 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,9 @@ 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 of the window whose current glyph matrix was resized, which disables the mode-line row as side effect. diff --git a/src/xdisp.c b/src/xdisp.c index 2ebf06d5c34..6a1e3ee2dc2 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -7488,7 +7488,12 @@ set_iterator_to_next (struct it *it, int reseat_p) /* Maybe recheck faces after display vector. */ if (recheck_faces) - it->stop_charpos = IT_CHARPOS (*it); + { + if (it->method == GET_FROM_STRING) + it->stop_charpos = IT_STRING_CHARPOS (*it); + else + it->stop_charpos = IT_CHARPOS (*it); + } } break; |