From 598f69b05e7a76597331a2d8174f27d10d673f18 Mon Sep 17 00:00:00 2001
From: Florian Walch <florian@fwalch.com>
Date: Tue, 23 Dec 2014 14:15:31 +0100
Subject: 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
---
 src/nvim/eval.c    | 2 +-
 src/nvim/version.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

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,
-- 
cgit