[Emacs-diffs] Changes to emacs/src/indent.c

[Kim F . Storm]

Index: emacs/src/indent.c
diff -c emacs/src/indent.c:1.168 emacs/src/indent.c:1.169
*** emacs/src/indent.c:1.168    Tue Nov 16 16:58:16 2004
--- emacs/src/indent.c  Thu Nov 18 11:00:14 2004
***************
*** 2078,2093 ****
         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);
  
        if (XINT (lines) != 0)
        move_it_by_lines (&it, XINT (lines), 0);
  
--- 2078,2093 ----
         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.  */
!       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);