# HG changeset patch # User Richard M. Stallman <rms@gnu.org> # Date 1120409462 0 # Node ID 443cb2507f88244c5be076bd505f1a08399dc25b # Parent 5ce023c9db0d316392a10897a4ebc57920a86fde (try_window): Fix previous change in how it handles a partially-visible line or one only partly past the margin. diff -r 5ce023c9db0d -r 443cb2507f88 src/xdisp.c --- a/src/xdisp.c Sun Jul 03 16:41:48 2005 +0000 +++ b/src/xdisp.c Sun Jul 03 16:51:02 2005 +0000 @@ -12740,11 +12740,11 @@ if ((w->cursor.y < this_scroll_margin && CHARPOS (pos) > BEGV) - /* Old redisplay didn't take scroll margin into account at the bottom, - but then global-hl-line-mode doesn't scroll. KFS 2004-06-14 */ - || (w->cursor.y + (make_cursor_line_fully_visible_p - ? cursor_height + this_scroll_margin - : 1)) > it.last_visible_y) + /* rms: considering make_cursor_line_fully_visible_p here + seems to give wrong results. We don't want to recenter + when the last line is partly visible, we want to allow + that case to be handled in the usual way. */ + || (w->cursor.y + 1) > it.last_visible_y) { w->cursor.vpos = -1; clear_glyph_matrix (w->desired_matrix);