(Fvertical_motion): Undo 2004-11-16 change.

Instead, move back again if reseating moves too far ahead.

1 files changed, 9 insertions, 9 deletions

diff --git a/src/indent.c b/src/indent.c
index 0ece40790a7..0b73751a5f7 100644
--- a/src/indent.c
+++ b/src/indent.c
@@ -2078,16 +2078,16 @@ 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.  */
-      if (XINT (lines) < 0)
-        {
-          reseat_at_previous_visible_line_start (&it);
-          it.current_x = it.hpos = 0;
-          move_it_to (&it, PT, -1, -1, -1, MOVE_TO_POS);
-          it.vpos = 0;
-        }
-      else
-        move_it_by_lines (&it, 0, 0);
+      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 && XINT (lines) > 0)
+        move_it_by_lines (&it, -1, 0);
 
+      it.vpos = 0;
       if (XINT (lines) != 0)
         move_it_by_lines (&it, XINT (lines), 0);