From: Richard M. Stallman Date: Mon, 23 Dec 2002 18:04:45 +0000 (+0000) Subject: (window_scroll_pixel_based): Fix check for reaching BEGV. X-Git-Tag: ttn-vms-21-2-B4~11925 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=07ce8b53eae95f8bc5ca40e99cf781966e9a71aa;p=emacs.git (window_scroll_pixel_based): Fix check for reaching BEGV. Don't try to make last line fully visible if it is past end of window. --- diff --git a/src/window.c b/src/window.c index fb81e45cbc4..3f115260adf 100644 --- a/src/window.c +++ b/src/window.c @@ -4149,12 +4149,13 @@ window_scroll_pixel_based (window, n, whole, noerror) /* End if we end up at ZV or BEGV. */ if ((n > 0 && IT_CHARPOS (it) == ZV) - || (n < 0 && IT_CHARPOS (it) == CHARPOS (start))) + || (n < 0 && IT_CHARPOS (it) == BEGV)) { if (IT_CHARPOS (it) == ZV) { - if (it.current_y + it.max_ascent + it.max_descent - > it.last_visible_y) + if (it.current_y < it.last_visible_y + && (it.current_y + it.max_ascent + it.max_descent + >= it.last_visible_y)) { /* The last line was only partially visible, make it fully visible. */