summaryrefslogtreecommitdiff
path: root/src/indent.c
diff options
context:
space:
mode:
authorKim F. Storm <storm@cua.dk>2004-11-21 12:56:53 +0000
committerKim F. Storm <storm@cua.dk>2004-11-21 12:56:53 +0000
commita9e034e356c83e5ee65b61dbf5352327837740b4 (patch)
tree5b454c46df53ec154487fdaf0cef317c90c963e8 /src/indent.c
parent8e1be18a22c5d92a1e7917acfe7ebb86a3dec9c6 (diff)
downloademacs-a9e034e356c83e5ee65b61dbf5352327837740b4.tar.gz
(Fvertical_motion): Fix last change. Use another
method to detect if iterator moved too far ahead after reseat.
Diffstat (limited to 'src/indent.c')
-rw-r--r--src/indent.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/indent.c b/src/indent.c
index f4a383b6d07..ce274f65a1f 100644
--- a/src/indent.c
+++ b/src/indent.c
@@ -2069,6 +2069,8 @@ whether or not it is currently displayed in some window. */)
}
else
{
+ int it_start;
+
SET_TEXT_POS (pt, PT, PT_BYTE);
start_display (&it, w, pt);
@@ -2078,13 +2080,14 @@ whether or not it is currently displayed in some window. */)
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;