diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2016-10-08 10:52:52 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2016-10-08 10:52:52 +0300 |
| commit | 3566644a332f42c2fb68e93f04f2cec92917fcc9 (patch) | |
| tree | 75e41ae9eaee772fd9f1e0fedf14983266183eb5 /src | |
| parent | a6e0a6770129e612398c8db98cd214586dc250f4 (diff) | |
| download | emacs-3566644a332f42c2fb68e93f04f2cec92917fcc9.tar.gz | |
Fix infloop in redisplay due to truncated lines and invisible text
* src/xdisp.c (forward_to_next_line_start): Don't call
'get_next_display_element' after finding the end of line. This
avoids setting the row's end position to the wrong value when the
next screen line begins with invisible text; that wrong value
caused set_cursor_from_row position the cursor in the wrong screen
line, and eventually triggered bug#24109.
Diffstat (limited to 'src')
| -rw-r--r-- | src/xdisp.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/xdisp.c b/src/xdisp.c index 42c6fb75efa..a13830c811e 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -6298,9 +6298,10 @@ forward_to_next_line_start (struct it *it, bool *skipped_p, } else { - while (get_next_display_element (it) - && !newline_found_p) + while (!newline_found_p) { + if (!get_next_display_element (it)) + break; newline_found_p = ITERATOR_AT_END_OF_LINE_P (it); if (newline_found_p && it->bidi_p && bidi_it_prev) *bidi_it_prev = it->bidi_it; |