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

[Gerd Moellmann]

Index: emacs/src/xdisp.c
diff -c emacs/src/xdisp.c:1.712 emacs/src/xdisp.c:1.713
*** emacs/src/xdisp.c:1.712     Fri Dec  7 08:35:11 2001
--- emacs/src/xdisp.c   Wed Dec 12 08:42:55 2001
***************
*** 5373,5379 ****
        int y0 = it3.current_y;
        int y1 = line_bottom_y (&it3);
        int line_height = y1 - y0;
!       
        /* If we did not reach target_y, try to move further backward if
         we can.  If we moved too far backward, try to move forward.  */
        if (target_y < it->current_y
--- 5373,5379 ----
        int y0 = it3.current_y;
        int y1 = line_bottom_y (&it3);
        int line_height = y1 - y0;
! 
        /* If we did not reach target_y, try to move further backward if
         we can.  If we moved too far backward, try to move forward.  */
        if (target_y < it->current_y
***************
*** 5384,5396 ****
          && it->current_y - target_y > line_height / 3 * 2
          && IT_CHARPOS (*it) > BEGV)
        {
          move_it_vertically (it, target_y - it->current_y);
          xassert (IT_CHARPOS (*it) >= BEGV);
        }
        else if (target_y >= it->current_y + line_height
               && IT_CHARPOS (*it) < ZV)
        {
!         move_it_vertically (it, target_y - (it->current_y + line_height));
          xassert (IT_CHARPOS (*it) >= BEGV);
        }
      }
--- 5384,5404 ----
          && it->current_y - target_y > line_height / 3 * 2
          && IT_CHARPOS (*it) > BEGV)
        {
+         TRACE_MOVE ((stderr, "  not far enough -> move_vert %d\n",
+                      target_y - it->current_y));
          move_it_vertically (it, target_y - it->current_y);
          xassert (IT_CHARPOS (*it) >= BEGV);
        }
        else if (target_y >= it->current_y + line_height
               && IT_CHARPOS (*it) < ZV)
        {
!         /* Should move forward by at least one line, maybe more.  */
!         do
!           {
!             move_it_by_lines (it, 1, 1);
!           }
!         while (target_y >= line_bottom_y (it) && IT_CHARPOS (*it) < ZV);
! 
          xassert (IT_CHARPOS (*it) >= BEGV);
        }
      }