Commit 999c74e3 authored by Eli Zaretskii's avatar Eli Zaretskii

Fix bug #14780 with unreachable lines near end of buffer.

 src/xdisp.c (redisplay_window): Instead of moving point out of
 scroll margin, reject the force_start method, and try scrolling.
parent 889acc5c
2013-07-24 Eli Zaretskii <eliz@gnu.org>
* xdisp.c (redisplay_window): Instead of moving point out of
scroll margin, reject the force_start method, and try scrolling
instead. (Bug#14780)
2013-07-24 Ken Brown <kbrown@cornell.edu> 2013-07-24 Ken Brown <kbrown@cornell.edu>
* alloc.c (make_save_ptr): Define if HAVE_NTGUI is defined * alloc.c (make_save_ptr): Define if HAVE_NTGUI is defined
......
...@@ -15608,10 +15608,11 @@ redisplay_window (Lisp_Object window, int just_this_one_p) ...@@ -15608,10 +15608,11 @@ redisplay_window (Lisp_Object window, int just_this_one_p)
the Y coordinate of the _next_ row, see the definition of the Y coordinate of the _next_ row, see the definition of
MATRIX_ROW_BOTTOM_Y. */ MATRIX_ROW_BOTTOM_Y. */
if (w->cursor.vpos < margin + header_line) if (w->cursor.vpos < margin + header_line)
new_vpos {
= pixel_margin + (header_line w->cursor.vpos = -1;
? CURRENT_HEADER_LINE_HEIGHT (w) clear_glyph_matrix (w->desired_matrix);
: 0) + frame_line_height; goto try_to_scroll;
}
else else
{ {
int window_height = window_box_height (w); int window_height = window_box_height (w);
...@@ -15619,7 +15620,11 @@ redisplay_window (Lisp_Object window, int just_this_one_p) ...@@ -15619,7 +15620,11 @@ redisplay_window (Lisp_Object window, int just_this_one_p)
if (header_line) if (header_line)
window_height += CURRENT_HEADER_LINE_HEIGHT (w); window_height += CURRENT_HEADER_LINE_HEIGHT (w);
if (w->cursor.y >= window_height - pixel_margin) if (w->cursor.y >= window_height - pixel_margin)
new_vpos = window_height - pixel_margin; {
w->cursor.vpos = -1;
clear_glyph_matrix (w->desired_matrix);
goto try_to_scroll;
}
} }
} }
......
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