diff --git a/src/option.c b/src/option.c
index 04581a8..20fef41 100644
--- a/src/option.c
+++ b/src/option.c
@@ -7974,6 +7974,11 @@
 	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 0ed7da1..c5dc0fd 100644
--- a/src/version.c
+++ b/src/version.c
@@ -677,6 +677,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    24,
+/**/
     23,
 /**/
     22,