From: Gerd Moellmann Date: Wed, 12 Dec 2001 13:46:54 +0000 (+0000) Subject: (Frecenter): Simplify computation in the case of window X-Git-Tag: emacs-21.2~239 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d298a88a6558823c2b958362bb692cb8f1afc9be;p=emacs.git (Frecenter): Simplify computation in the case of window system frames and ARG < 0; use window_box_height. --- diff --git a/src/ChangeLog b/src/ChangeLog index 475d3af5cae..61570dd3d3f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,11 @@ +2001-12-12 Gerd Moellmann + + * xdisp.c (move_it_vertically_backward): Change heuristic + for the case that we didn't move far enough initially. + + * window.c (Frecenter): Simplify computation in the case of window + system frames and ARG < 0; use window_box_height. + 2001-12-09 Eli Zaretskii * s/hpux10.h (random): Undefine. diff --git a/src/window.c b/src/window.c index 2f80632279e..f774c5ffc1f 100644 --- a/src/window.c +++ b/src/window.c @@ -4612,18 +4612,17 @@ and redisplay normally--don't erase and redraw the frame.") nlines = - XINT (arg) - 1; move_it_by_lines (&it, nlines, 1); - y1 = it.current_y - y0; - h = line_bottom_y (&it) - y1; + y1 = line_bottom_y (&it); /* If we can't move down NLINES lines because we hit the end of the buffer, count in some empty lines. */ if (it.vpos < nlines) y1 += (nlines - it.vpos) * CANON_Y_UNIT (it.f); - y0 = it.last_visible_y - y1 - h; - + h = window_box_height (w) - (y1 - y0); + start_display (&it, w, pt); - move_it_vertically (&it, - y0); + move_it_vertically (&it, - h); charpos = IT_CHARPOS (it); bytepos = IT_BYTEPOS (it); }