diff options
| author | Bram Moolenaar <Bram@vim.org> | 2014-05-28 11:35:37 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2014-05-28 11:35:37 +0200 |
| commit | 846a2ff5f3a006fb612d1ece1962cb75ca06d0fe (patch) | |
| tree | 64acc0eee444d20847081ae2e7ef93673b53aa7e /src | |
| parent | cbc17d66be624d911354ef7a6f18a9c903e80731 (diff) | |
| download | vim-846a2ff5f3a006fb612d1ece1962cb75ca06d0fe.zip | |
updated for version 7.4.308
Problem: When using ":diffsplit" on an empty file the cursor is displayed
on the command line.
Solution: Limit the value of w_topfill.
Diffstat (limited to 'src')
| -rw-r--r-- | src/diff.c | 1 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/diff.c b/src/diff.c index 49ca58af7..98b791a72 100644 --- a/src/diff.c +++ b/src/diff.c @@ -622,6 +622,7 @@ diff_redraw(dofold) wp->w_topfill = (n < 0 ? 0 : n); else if (n > 0 && n > wp->w_topfill) wp->w_topfill = n; + check_topfill(wp, FALSE); } } } diff --git a/src/version.c b/src/version.c index 41f1b46f2..f72ae97f2 100644 --- a/src/version.c +++ b/src/version.c @@ -735,6 +735,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 308, +/**/ 307, /**/ 306, |