summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2014-10-31 15:45:52 +0100
committerBram Moolenaar <Bram@vim.org>2014-10-31 15:45:52 +0100
commitb851a96d5c201291d9e955afaf55979b3e410f9f (patch)
treecf34aaf349e9afa3e1cc24c5a31d9d241d3c004f
parent6a64365c952895ecc2219b303d9bf64dabf8f2e7 (diff)
downloadvim-git-b851a96d5c201291d9e955afaf55979b3e410f9f.tar.gz
updated for version 7.4.491v7.4.491
Problem: When winrestview() has a negative "topline" value there are display errors. Solution: Correct a negative value to 1. (Hirohito Higashi)
-rw-r--r--src/eval.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/eval.c b/src/eval.c
index 8f62cb2e8..f5aa7e919 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 3fc09c83c..71258da12 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 491,
+/**/
490,
/**/
489,