Mercurial > emacs
changeset 58396:60b3e92b3dd4
(Fvertical_motion): Fix last change. Use another
method to detect if iterator moved too far ahead after reseat.
| author | Kim F. Storm <storm@cua.dk> |
|---|---|
| date | Sun, 21 Nov 2004 12:56:53 +0000 |
| parents | c2e1b8d54550 |
| children | b40efffdf96e |
| files | src/indent.c |
| diffstat | 1 files changed, 4 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/indent.c Sun Nov 21 12:56:25 2004 +0000 +++ b/src/indent.c Sun Nov 21 12:56:53 2004 +0000 @@ -2069,6 +2069,8 @@ } else { + int it_start; + SET_TEXT_POS (pt, PT, PT_BYTE); start_display (&it, w, pt); @@ -2078,13 +2080,14 @@ we end up with the iterator placed at where it thinks X is 0, while the end position is really at some X > 0, the same X that PT had. */ + it_start = IT_CHARPOS (it); reseat_at_previous_visible_line_start (&it); it.current_x = it.hpos = 0; move_it_to (&it, PT, -1, -1, -1, MOVE_TO_POS); /* Move back if we got too far. This may happen if truncate-lines is on and PT is beyond right margin. */ - if (IT_CHARPOS (it) > PT && it.vpos > 0 && XINT (lines) > 0) + if (IT_CHARPOS (it) > it_start && XINT (lines) > 0) move_it_by_lines (&it, -1, 0); it.vpos = 0;