summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2008-10-02 20:48:41 +0000
committerBram Moolenaar <Bram@vim.org>2008-10-02 20:48:41 +0000
commit991e10f3c7dd8a70ed6e8e975dab438ae85d73bc (patch)
tree7962381c41a23343c36a498a755edff1f59c10c8
parent85595c58151436d416aaedfa6a6a3be08439c736 (diff)
downloadvim-git-991e10f3c7dd8a70ed6e8e975dab438ae85d73bc.tar.gz
updated for version 7.2-024v7.2.024
-rw-r--r--src/option.c5
-rw-r--r--src/version.c2
2 files changed, 7 insertions, 0 deletions
diff --git a/src/option.c b/src/option.c
index 04581a8eb..20fef4107 100644
--- a/src/option.c
+++ b/src/option.c
@@ -7974,6 +7974,11 @@ set_num_option(opt_idx, varp, value, errbuf, errbuflen, opt_flags)
else /* curwin->w_p_scr > curwin->w_height */
curwin->w_p_scr = curwin->w_height;
}
+ if (p_hi < 0)
+ {
+ errmsg = e_positive;
+ p_hi = 0;
+ }
if (p_report < 0)
{
errmsg = e_positive;
diff --git a/src/version.c b/src/version.c
index 0ed7da104..c5dc0fde9 100644
--- a/src/version.c
+++ b/src/version.c
@@ -677,6 +677,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 24,
+/**/
23,
/**/
22,