From: Bram Moolenaar <Bram@vim.org>
Date: Fri, 31 Oct 2014 14:45:52 +0000 (+0100)
Subject: updated for version 7.4.491
X-Git-Tag: v7.4.491
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b851a96d5c201291d9e955afaf55979b3e410f9f;p=thirdparty%2Fvim.git

updated for version 7.4.491
Problem:    When winrestview() has a negative "topline" value there are
            display errors.
Solution:   Correct a negative value to 1. (Hirohito Higashi)
---

diff --git a/src/eval.c b/src/eval.c
index 8f62cb2e83..f5aa7e919e 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -19576,7 +19576,7 @@ f_winrestview(argvars, rettv)
 # endif
 	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/version.c b/src/version.c
index 3fc09c83c5..71258da12d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    491,
 /**/
     490,
 /**/