diff options
| -rw-r--r-- | src/move.c | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/move.c b/src/move.c index 8c6fbd6b88..20c575c66a 100644 --- a/src/move.c +++ b/src/move.c @@ -3102,7 +3102,7 @@ static int get_scroll_overlap(int dir) loff.lnum = dir == FORWARD ? curwin->w_botline : curwin->w_topline - 1; #ifdef FEAT_DIFF - loff.fill = diff_check_fill(curwin, loff.lnum + dir == BACKWARD) + loff.fill = diff_check_fill(curwin, loff.lnum + (dir == BACKWARD)) - (dir == FORWARD ? curwin->w_filler_rows : curwin->w_topfill); loff.height = loff.fill > 0 ? 1 : plines_nofill(loff.lnum); #else diff --git a/src/version.c b/src/version.c index b9db49e15e..e30a1bc0d8 100644 --- a/src/version.c +++ b/src/version.c @@ -705,6 +705,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 310, +/**/ 309, /**/ 308, |