Mercurial > emacs
changeset 61991:9aeb4fcfe44d
(move_it_in_display_line_to): Stop if we move beyond TO_CHARPOS.
This may happen if last glyphs was an image or stretch glyph.
| author | Kim F. Storm <storm@cua.dk> |
|---|---|
| date | Sun, 01 May 2005 21:42:34 +0000 |
| parents | 82672fec921f |
| children | 8995e1cb5d7c |
| files | src/xdisp.c |
| diffstat | 1 files changed, 9 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/xdisp.c Sun May 01 20:04:11 2005 +0000 +++ b/src/xdisp.c Sun May 01 21:42:34 2005 +0000 @@ -5877,6 +5877,15 @@ { int x, i, ascent = 0, descent = 0; + /* Stop if we move beyond TO_CHARPOS (after an image or stretch glyph). */ + if ((op & MOVE_TO_POS) != 0 + && BUFFERP (it->object) + && IT_CHARPOS (*it) > to_charpos) + { + result = MOVE_POS_MATCH_OR_ZV; + break; + } + /* Stop when ZV reached. We used to stop here when TO_CHARPOS reached as well, but that is too soon if this glyph does not fit on this line. So we handle it