diff --git a/src/ex_getln.c b/src/ex_getln.c
index fd47ef3df0..2f5793a65f 100644
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -6448,7 +6448,7 @@ merge_history(int type)
 	else
 	    clear_hist_entry(&new_hist[i]);
     }
-    hisidx[type] = len - 1;
+    hisidx[type] = (i < len ? i : len) - 1;
 
     /* Free what is not kept. */
     for (i = 0; i < viminfo_hisidx[type]; i++)
diff --git a/src/version.c b/src/version.c
index 9c821d492b..4f5b5a390f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -753,6 +753,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1926,
 /**/
     1925,
 /**/