aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorFlorian Walch <florian@fwalch.com>2014-12-23 14:15:31 +0100
committerFlorian Walch <florian@fwalch.com>2014-12-23 21:17:00 +0100
commit598f69b05e7a76597331a2d8174f27d10d673f18 (patch)
treebaa6d3bbd876fd875f50d6ae997510b71b7502ac /src
parent12245f9f1fc6b7853b1d65012b50f99015769b84 (diff)
downloadrneovim-598f69b05e7a76597331a2d8174f27d10d673f18.tar.gz
rneovim-598f69b05e7a76597331a2d8174f27d10d673f18.tar.bz2
rneovim-598f69b05e7a76597331a2d8174f27d10d673f18.zip
vim-patch:7.4.491
Problem: When winrestview() has a negative "topline" value there are display errors. Solution: Correct a negative value to 1. (Hirohito Higashi) https://code.google.com/p/vim/source/detail?r=v7-4-491
Diffstat (limited to 'src')
-rw-r--r--src/nvim/eval.c2
-rw-r--r--src/nvim/version.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index feb600104f..67a68f70d5 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -15278,7 +15278,7 @@ static void f_winrestview(typval_T *argvars, typval_T *rettv)
win_new_width(curwin, curwin->w_width);
changed_window_setting();
- if (curwin->w_topline == 0)
+ if (curwin->w_topline <= 0)
curwin->w_topline = 1;
if (curwin->w_topline > curbuf->b_ml.ml_line_count)
curwin->w_topline = curbuf->b_ml.ml_line_count;
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 9a5d3fefe8..81601e8d8f 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -247,7 +247,7 @@ static int included_patches[] = {
494,
493,
//492,
- //491,
+ 491,
//490,
//489,
//488,