Commit 9b869380 authored by Richard M. Stallman's avatar Richard M. Stallman
Browse files

(try_window): Fix previous change in how it handles

a partially-visible line or one only partly past the margin.
parent 7ad53239
......@@ -12740,11 +12740,11 @@ try_window (window, pos, check_margins)
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);
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment