diff --git a/src/nvim/version.c b/src/nvim/version.c
index b767dfa528..a84c34a131 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -59,7 +59,7 @@ char *version_cflags = "Compilation: " NVIM_VERSION_CFLAGS;
 
 static const int vim_versions[] = { 801, 802, 900, 901, 902 };
 
-static const int num_patches[] = { 2332, 3843, 1603, 1648, 396 };
+static const int num_patches[] = { 2332, 3843, 1604, 1655, 413 };
 
 static const int *included_patchsets[] = {
   (const int[]) {  // 801
@@ -2330,9 +2330,7 @@ static const int *included_patchsets[] = {
     // 1869
     1868,
     // 1867
-    1866,
-    // 1865
-    1864, 1863,
+    1866, 1865, 1864, 1863,
     // 1862
     1861, 1860, 1859, 1858, 1857, 1856,
     // 1855
@@ -3020,8 +3018,8 @@ static const int *included_patchsets[] = {
     2123, 2122,
     // 2120-2121
     2119, 2118, 2117, 2116,
-    // 2113-2115
-    2112, 2111, 2110, 2109, 2108, 2107,
+    // 2114-2115
+    2113, 2112, 2111, 2110, 2109, 2108, 2107,
     // 2106
     2105,
     // 2104
@@ -3160,9 +3158,7 @@ static const int *included_patchsets[] = {
     // 1703-1704
     1702, 1701, 1700,
     // 1699
-    1698, 1697,
-    // 1696
-    1695, 1694, 1693, 1692, 1691, 1690, 1689, 1688, 1687, 1686, 1685,
+    1698, 1697, 1696, 1695, 1694, 1693, 1692, 1691, 1690, 1689, 1688, 1687, 1686, 1685,
     // 1684
     1683,
     // 1682
@@ -3295,7 +3291,8 @@ static const int *included_patchsets[] = {
     1354, 1353,
     // 1352
     1351, 1350, 1349, 1348, 1347, 1346, 1345, 1344, 1343, 1342, 1341, 1340, 1339, 1338, 1337, 1336,
-    // 1333-1335
+    1335,
+    // 1333-1334
     1332, 1331,
     // 1330
     1329, 1328, 1327, 1326, 1325,
@@ -3328,9 +3325,7 @@ static const int *included_patchsets[] = {
     // 1230
     1229, 1228,
     // 1227
-    1226,
-    // 1225
-    1224,
+    1226, 1225, 1224,
     // 1223
     1222, 1221, 1220, 1219, 1218, 1217, 1216, 1215, 1214, 1213, 1212, 1211, 1210,
     // 1208-1209
@@ -3511,8 +3506,8 @@ static const int *included_patchsets[] = {
     708, 707, 706, 705, 704, 703, 702, 701, 700, 699, 698, 697, 696, 695, 694, 693,
     692, 691, 690, 689, 688, 687, 686,
     // 685
-    684, 683,
-    // 680-682
+    684, 683, 682,
+    // 680-681
     679, 678, 677, 676, 675, 674, 673, 672, 671,
     // 670
     669, 668, 667, 666,
@@ -3522,8 +3517,8 @@ static const int *included_patchsets[] = {
     659, 658, 657, 656, 655, 654, 653, 652, 651, 650, 649, 648, 647,
     // 646
     645, 644, 643, 642, 641, 640, 639, 638, 637, 636, 635, 634, 633, 632, 631, 630,
-    629, 628, 627, 626,
-    // 624-625
+    629, 628, 627, 626, 625,
+    // 624
     623, 622, 621, 620, 619, 618, 617, 616, 615, 614,
     // 613
     612,
@@ -3571,8 +3566,8 @@ static const int *included_patchsets[] = {
     499, 498,
     // 497
     496, 495, 494, 493, 492, 491, 490, 489, 488, 487, 486, 485, 484, 483,
-    // 481-482
-    480, 479, 478, 477, 476, 475, 474, 473, 472,
+    // 482
+    481, 480, 479, 478, 477, 476, 475, 474, 473, 472,
     // 471
     470, 469, 468, 467, 466, 465, 464, 463,
     // 461-462
@@ -3722,17 +3717,17 @@ static const int *included_patchsets[] = {
     // 0
   },
   (const int[]) {  // 902
-    653,
-    // 650-652
-    649,
-    // 648
-    647,
-    // 646
-    645,
-    // 643-644
-    642,
-    // 641
-    640, 639,
+    677, 676, 675,
+    // 674
+    673,
+    // 664-672
+    663, 662,
+    // 657-661
+    656,
+    // 654-655
+    653, 652, 651, 650, 649, 648, 647, 646, 645, 644,
+    // 643
+    642, 641, 640, 639,
     // 636-638
     635, 634,
     // 631-633
@@ -3756,9 +3751,7 @@ static const int *included_patchsets[] = {
     // 600
     599, 598, 597, 596, 595,
     // 592-594
-    591, 590, 589, 588, 587,
-    // 586
-    585, 584, 583,
+    591, 590, 589, 588, 587, 586, 585, 584, 583,
     // 582
     581, 580,
     // 579
@@ -3766,9 +3759,7 @@ static const int *included_patchsets[] = {
     // 576
     575, 574,
     // 572-573
-    571, 570, 569, 568,
-    // 567
-    566,
+    571, 570, 569, 568, 567, 566,
     // 565
     564, 563, 562, 561, 560, 559, 558, 557, 556, 555, 554, 553, 552, 551, 550, 549,
     548, 547, 546,
@@ -3803,9 +3794,7 @@ static const int *included_patchsets[] = {
     // 487-488
     486,
     // 483-485
-    482, 481, 480,
-    // 479
-    478, 477, 476, 475, 474, 473, 472, 471, 470,
+    482, 481, 480, 479, 478, 477, 476, 475, 474, 473, 472, 471, 470,
     // 465-469
     464,
     // 462-463