diff options
| author | Bram Moolenaar <Bram@vim.org> | 2009-11-03 15:23:14 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2009-11-03 15:23:14 +0000 |
| commit | fa316dd1f710f446c820aab3b11cfc99c6e56f30 (patch) | |
| tree | 1877e51ad67076c74d849757841728e0a4f8613a /src | |
| parent | 2ac5e603d8e64970fac5794e8bf03ea8e2b6d473 (diff) | |
| download | vim-fa316dd1f710f446c820aab3b11cfc99c6e56f30.zip | |
updated for version 7.2-277
Diffstat (limited to 'src')
| -rw-r--r-- | src/move.c | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/move.c b/src/move.c index abf055f3c..26ff3bf4d 100644 --- a/src/move.c +++ b/src/move.c @@ -183,9 +183,6 @@ update_topline() if (curwin->w_topline != 1) redraw_later(NOT_VALID); curwin->w_topline = 1; -#ifdef FEAT_DIFF - curwin->w_topfill = 0; -#endif curwin->w_botline = 2; curwin->w_valid |= VALID_BOTLINE|VALID_BOTLINE_AP; #ifdef FEAT_SCROLLBIND @@ -1257,7 +1254,8 @@ scrolldown(line_count, byfold) while (line_count-- > 0) { #ifdef FEAT_DIFF - if (curwin->w_topfill < diff_check(curwin, curwin->w_topline)) + if (curwin->w_topfill < diff_check(curwin, curwin->w_topline) + && curwin->w_topfill < curwin->w_height - 1) { ++curwin->w_topfill; ++done; diff --git a/src/version.c b/src/version.c index 5888b2d3b..ee69469ff 100644 --- a/src/version.c +++ b/src/version.c @@ -677,6 +677,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 277, +/**/ 276, /**/ 275, |