diff --git a/src/cmdhist.c b/src/cmdhist.c
index c46a3a63eb..ea955478ef 100644
--- a/src/cmdhist.c
+++ b/src/cmdhist.c
@@ -137,7 +137,7 @@ init_history(void)
     // history length changed
     for (type = 0; type < HIST_COUNT; ++type)   // adjust the tables
     {
-	if (newlen)
+	if (newlen > 0)
 	{
 	    temp = ALLOC_MULT(histentry_T, newlen);
 	    if (temp == NULL)   // out of memory!
@@ -157,9 +157,6 @@ init_history(void)
 	else
 	    temp = NULL;
 
-	if (newlen != 0 && temp == NULL)
-	    continue;
-
 	if (hisidx[type] < 0)		// there are no entries yet
 	{
 	    for (i = 0; i < newlen; ++i)
diff --git a/src/version.c b/src/version.c
index a764712188..f294ed58b1 100644
--- a/src/version.c
+++ b/src/version.c
@@ -695,6 +695,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    878,
 /**/
     877,
 /**/