Mercurial > emacs
changeset 108659:ab4686221ccf
Handle lines truncated on right.
xdisp.c (find_row_edges): Handle the truncated_on_right_p rows.
| author | Eli Zaretskii <eliz@gnu.org> |
|---|---|
| date | Sat, 22 May 2010 17:13:04 +0300 |
| parents | 76010a03e524 |
| children | 3339da3cfeb3 |
| files | src/ChangeLog src/xdisp.c |
| diffstat | 2 files changed, 7 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Sat May 22 15:38:26 2010 +0300 +++ b/src/ChangeLog Sat May 22 17:13:04 2010 +0300 @@ -2,6 +2,7 @@ * xdisp.c (find_row_edges): Handle the case of characters delivered from display vector. Fix tests related to it->method. + Handle the truncated_on_right_p rows. 2010-05-19 Eli Zaretskii <eliz@gnu.org>
--- a/src/xdisp.c Sat May 22 15:38:26 2010 +0300 +++ b/src/xdisp.c Sat May 22 17:13:04 2010 +0300 @@ -17536,6 +17536,7 @@ Line ends in a newline from buffer eol_pos + 1 Line is continued from buffer max_pos + 1 + Line is truncated on right it->current.pos Line ends in a newline from string max_pos Line is continued from string max_pos Line is continued from display vector max_pos @@ -17570,6 +17571,11 @@ SET_TEXT_POS (row->maxpos, max_pos, max_bpos); } } + else if (row->truncated_on_right_p) + /* display_line already called reseat_at_next_visible_line_start, + which puts the iterator at the beginning of the next line, in + the logical order. */ + row->maxpos = it->current.pos; else if (max_pos == min_pos && it->method != GET_FROM_BUFFER) /* A line that is entirely from a string/image/stretch... */ row->maxpos = row->minpos;