procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(try_scrolling) <cursor in scroll margin at the bottom>:

Browse source 
Don't add in the last line's height when deciding if the new
position is below the scroll margin.
This commit is contained in:
Gerd Moellmann 2000-10-16 13:56:12 +00:00
parent 7a1e3cece9
commit b8a63ccb80
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/xdisp.c
View file

@ -8594,7 +8594,7 @@ try_scrolling (window, just_this_one_p, scroll_conservatively,
int this_scroll_margin;
int dy = 0;
int scroll_max;
int line_height, rc;
int rc;
int amount_to_scroll = 0;
Lisp_Object aggressive;
int height;
@ -8649,6 +8649,9 @@ try_scrolling (window, just_this_one_p, scroll_conservatively,
if (PT >= CHARPOS (scroll_margin_pos))
{
int y0;
#if 0
int line_height;
#endif
/* Point is in the scroll margin at the bottom of the window, or
below. Compute a new window start that makes point visible. */
@ -8659,10 +8662,14 @@ try_scrolling (window, just_this_one_p, scroll_conservatively,
y0 = it.current_y;
move_it_to (&it, PT, 0, it.last_visible_y, -1,
MOVE_TO_POS | MOVE_TO_X | MOVE_TO_Y);
#if 0 /* Taking the line's height into account here looks wrong. */
line_height = (it.max_ascent + it.max_descent
? it.max_ascent + it.max_descent
: last_height);
dy = it.current_y + line_height - y0;
#else
dy = it.current_y - y0;
#endif
if (dy > scroll_max)
return 0;