summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvimboss <devnull@localhost>2008-10-02 20:48:41 +0000
committervimboss <devnull@localhost>2008-10-02 20:48:41 +0000
commitfa56486ce3128463fa29e6750dffcf52bfdb86ed (patch)
tree7962381c41a23343c36a498a755edff1f59c10c8
parent3ff2c96cf95f9b5cdd98bd70de6d354e977d2d69 (diff)
downloadvim-fa56486ce3128463fa29e6750dffcf52bfdb86ed.tar.gz
updated for version 7.2-024v7.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 04581a8e..20fef410 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 0ed7da10..c5dc0fde 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,