aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoroni-link <knil.ino@gmail.com>2014-05-22 16:19:47 +0200
committerJustin M. Keyes <justinkz@gmail.com>2014-06-20 02:31:21 -0400
commit02d935729f651840ee53e0cd55339c996b9789fa (patch)
treeed4aafa83196455b3fe2dbc82635de6dc3521947
parent937c78fe2e59e831d4acddaf7a13fafa78741179 (diff)
downloadrneovim-02d935729f651840ee53e0cd55339c996b9789fa.tar.gz
rneovim-02d935729f651840ee53e0cd55339c996b9789fa.tar.bz2
rneovim-02d935729f651840ee53e0cd55339c996b9789fa.zip
vim-patch:7.4.301 #816
Problem: Still a scrolling problem when loading a session file. Solution: Fix off-by-one mistake. (Nobuhiro Takasaki) https://code.google.com/p/vim/source/detail?r=8cb42aa3c4957a543e5dffe307475dbab969612f
-rw-r--r--src/nvim/version.c2
-rw-r--r--src/nvim/window.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/version.c b/src/nvim/version.c
index d9d58edab2..12dd5b5599 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -217,7 +217,7 @@ static int included_patches[] = {
//304,
//303,
//302,
- //301,
+ 301,
//300,
//299,
298,
diff --git a/src/nvim/window.c b/src/nvim/window.c
index 7b9eb72468..f6799be023 100644
--- a/src/nvim/window.c
+++ b/src/nvim/window.c
@@ -4560,7 +4560,7 @@ void win_new_height(win_T *wp, int height)
hasFoldingWin(wp, lnum, NULL, &lnum, TRUE, NULL);
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;
wp->w_wrow -= sline;