diff options
| author | Eli Zaretskii | 2010-05-22 17:13:04 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2010-05-22 17:13:04 +0300 |
| commit | a9f86045d9966fd1090951731050bd51e4cc6a8e (patch) | |
| tree | 480c5fb013192a29463ea485b07156bd0b911b65 /src | |
| parent | 53b77dc4fbc1007ac38f4cdd7831d5fe643340dd (diff) | |
| download | emacs-a9f86045d9966fd1090951731050bd51e4cc6a8e.tar.gz emacs-a9f86045d9966fd1090951731050bd51e4cc6a8e.zip | |
Handle lines truncated on right.
xdisp.c (find_row_edges): Handle the truncated_on_right_p rows.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 1 | ||||
| -rw-r--r-- | src/xdisp.c | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index d4c072b1fab..6cea39deb53 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -2,6 +2,7 @@ | |||
| 2 | 2 | ||
| 3 | * xdisp.c (find_row_edges): Handle the case of characters | 3 | * xdisp.c (find_row_edges): Handle the case of characters |
| 4 | delivered from display vector. Fix tests related to it->method. | 4 | delivered from display vector. Fix tests related to it->method. |
| 5 | Handle the truncated_on_right_p rows. | ||
| 5 | 6 | ||
| 6 | 2010-05-19 Eli Zaretskii <eliz@gnu.org> | 7 | 2010-05-19 Eli Zaretskii <eliz@gnu.org> |
| 7 | 8 | ||
diff --git a/src/xdisp.c b/src/xdisp.c index 47c4945c9dc..17558af6606 100644 --- a/src/xdisp.c +++ b/src/xdisp.c | |||
| @@ -17536,6 +17536,7 @@ find_row_edges (it, row, min_pos, min_bpos, max_pos, max_bpos) | |||
| 17536 | 17536 | ||
| 17537 | Line ends in a newline from buffer eol_pos + 1 | 17537 | Line ends in a newline from buffer eol_pos + 1 |
| 17538 | Line is continued from buffer max_pos + 1 | 17538 | Line is continued from buffer max_pos + 1 |
| 17539 | Line is truncated on right it->current.pos | ||
| 17539 | Line ends in a newline from string max_pos | 17540 | Line ends in a newline from string max_pos |
| 17540 | Line is continued from string max_pos | 17541 | Line is continued from string max_pos |
| 17541 | Line is continued from display vector max_pos | 17542 | Line is continued from display vector max_pos |
| @@ -17570,6 +17571,11 @@ find_row_edges (it, row, min_pos, min_bpos, max_pos, max_bpos) | |||
| 17570 | SET_TEXT_POS (row->maxpos, max_pos, max_bpos); | 17571 | SET_TEXT_POS (row->maxpos, max_pos, max_bpos); |
| 17571 | } | 17572 | } |
| 17572 | } | 17573 | } |
| 17574 | else if (row->truncated_on_right_p) | ||
| 17575 | /* display_line already called reseat_at_next_visible_line_start, | ||
| 17576 | which puts the iterator at the beginning of the next line, in | ||
| 17577 | the logical order. */ | ||
| 17578 | row->maxpos = it->current.pos; | ||
| 17573 | else if (max_pos == min_pos && it->method != GET_FROM_BUFFER) | 17579 | else if (max_pos == min_pos && it->method != GET_FROM_BUFFER) |
| 17574 | /* A line that is entirely from a string/image/stretch... */ | 17580 | /* A line that is entirely from a string/image/stretch... */ |
| 17575 | row->maxpos = row->minpos; | 17581 | row->maxpos = row->minpos; |