summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <bram@vim.org>2014-05-22 15:17:29 +0200
committerBram Moolenaar <bram@vim.org>2014-05-22 15:17:29 +0200
commit0a35d24bd45db18223b77be90b9f7e03fb90dd8d (patch)
tree71afb00453bfe128010b6c720c29b4bad8c8309b
parentdb741104da115558635143a9602e83b03248a391 (diff)
downloadvim-0a35d24bd45db18223b77be90b9f7e03fb90dd8d.tar.gz
updated for version 7.4.301v7.4.301v7-4-301
Problem: Still a scrolling problem when loading a session file. Solution: Fix off-by-one mistake. (Nobuhiro Takasaki)
-rw-r--r--src/version.c2
-rw-r--r--src/window.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/version.c b/src/version.c
index 0930a7b4..7f58182f 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 */
/**/
+ 301,
+/**/
300,
/**/
299,
diff --git a/src/window.c b/src/window.c
index 485f7ef0..cea7c402 100644
--- a/src/window.c
+++ b/src/window.c
@@ -5748,7 +5748,7 @@ win_new_height(wp, height)
lnum++;
wp->w_wrow -= line_size + sline;
}
- else if (sline > 0)
+ else if (sline >= 0)
{
/* First line of file reached, use that as topline. */
lnum = 1;