mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-02-06 20:49:33 +00:00
Code Issues Releases Activity

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

Browse Source 
src/xdisp.c (redisplay_window): Instead of moving point out of
 scroll margin, reject the force_start method, and try scrolling.
This commit is contained in:
Eli Zaretskii 2013-07-24 20:36:42 +03:00
parent 889acc5ce7
commit 999c74e390
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ChangeLog
View File

@ -1,3 +1,9 @@
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>
* alloc.c (make_save_ptr): Define if HAVE_NTGUI is defined

15
src/xdisp.c
View File

@ -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
MATRIX_ROW_BOTTOM_Y. */
if (w->cursor.vpos < margin + header_line)
new_vpos
= pixel_margin + (header_line
? CURRENT_HEADER_LINE_HEIGHT (w)
: 0) + frame_line_height;
{
w->cursor.vpos = -1;
clear_glyph_matrix (w->desired_matrix);
goto try_to_scroll;
}
else
{
int window_height = window_box_height (w);
@ -15619,7 +15620,11 @@ redisplay_window (Lisp_Object window, int just_this_one_p)
if (header_line)
window_height += CURRENT_HEADER_LINE_HEIGHT (w);
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;
}
}
}