diff --git a/src/nvim/version.c b/src/nvim/version.c
index 5f32783a5e..1ea7218421 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[] = { 2333, 3874, 1629, 1681, 604 };
+static const int num_patches[] = { 2333, 3895, 1631, 1683, 608 };
 
 static const int *included_patchsets[] = {
   (const int[]) {  // 801
@@ -970,11 +970,7 @@ static const int *included_patchsets[] = {
     // 3502-3503
     3501, 3500, 3499, 3498, 3497, 3496, 3495, 3494, 3493, 3492, 3491, 3490, 3489, 3488, 3487, 3486,
     // 3485
-    3484, 3483, 3482,
-    // 3481
-    3480,
-    // 3479
-    3478, 3477, 3476, 3475,
+    3484, 3483, 3482, 3481, 3480, 3479, 3478, 3477, 3476, 3475,
     // 3474
     3473, 3472, 3471, 3470, 3469, 3468, 3467, 3466, 3465, 3464, 3463, 3462, 3461, 3460, 3459, 3458,
     3457, 3456, 3455, 3454, 3453, 3452, 3451, 3450, 3449, 3448,
@@ -1125,8 +1121,8 @@ static const int *included_patchsets[] = {
     3110, 3109, 3108,
     // 3107
     3106,
-    // 3104-3105
-    3103, 3102, 3101,
+    // 3105
+    3104, 3103, 3102, 3101,
     // 3099-3100
     3098, 3097, 3096, 3095, 3094, 3093, 3092,
     // 3090-3091
@@ -1584,9 +1580,7 @@ static const int *included_patchsets[] = {
     // 1861
     1860, 1859,
     // 1858
-    1857, 1856,
-    // 1855
-    1854,
+    1857, 1856, 1855, 1854,
     // 1853
     1852,
     // 1851
@@ -1641,8 +1635,8 @@ static const int *included_patchsets[] = {
     // 1699
     1698, 1697, 1696, 1695,
     // 1694
-    1693,
-    // 1690-1692
+    1693, 1692,
+    // 1690-1691
     1689,
     // 1688
     1687, 1686,
@@ -1663,9 +1657,7 @@ static const int *included_patchsets[] = {
     // 1650
     1649, 1648, 1647, 1646, 1645,
     // 1644
-    1643, 1642,
-    // 1641
-    1640, 1639, 1638,
+    1643, 1642, 1641, 1640, 1639, 1638,
     // 1636-1637
     1635, 1634, 1633, 1632, 1631, 1630, 1629,
     // 1627-1628
@@ -1989,8 +1981,8 @@ static const int *included_patchsets[] = {
     660, 659, 658, 657,
     // 656
     655, 654,
-    // 652-653
-    651,
+    // 653
+    652, 651,
     // 650
     649, 648, 647, 646, 645, 644, 643, 642,
     // 641
@@ -2002,9 +1994,7 @@ static const int *included_patchsets[] = {
     // 613
     612,
     // 611
-    610, 609, 608, 607, 606, 605,
-    // 604
-    603, 602,
+    610, 609, 608, 607, 606, 605, 604, 603, 602,
     // 601
     600, 599, 598, 597,
     // 595-596
@@ -2012,38 +2002,33 @@ static const int *included_patchsets[] = {
     // 588
     587,
     // 585-586
-    584, 583,
-    // 582
-    581, 580, 579, 578, 577, 576, 575,
+    584, 583, 582, 581, 580, 579, 578, 577, 576, 575,
     // 574
-    573, 572,
-    // 570-571
+    573, 572, 571,
+    // 570
     569, 568,
     // 567
     566, 565, 564,
     // 562-563
     561, 560, 559, 558,
     // 557
-    556, 555, 554, 553, 552, 551, 550, 549, 548, 547, 546, 545, 544,
-    // 543
-    542, 541, 540, 539, 538,
+    556, 555, 554, 553, 552, 551, 550, 549, 548, 547, 546, 545, 544, 543, 542, 541,
+    540, 539, 538,
     // 536-537
-    535, 534, 533, 532, 531,
-    // 528-530
+    535, 534, 533, 532, 531, 530, 529,
+    // 528
     527, 526, 525, 524,
     // 523
-    522, 521, 520, 519,
-    // 516-518
+    522, 521, 520, 519, 518,
+    // 516-517
     515,
     // 514
     513, 512, 511, 510, 509, 508, 507, 506, 505, 504, 503, 502, 501,
     // 500
     499, 498, 497, 496, 495, 494,
     // 493
-    492, 491, 490, 489, 488, 487,
-    // 486
-    485, 484, 483, 482, 481, 480, 479, 478, 477, 476, 475, 474, 473, 472, 471, 470,
-    469, 468,
+    492, 491, 490, 489, 488, 487, 486, 485, 484, 483, 482, 481, 480, 479, 478, 477,
+    476, 475, 474, 473, 472, 471, 470, 469, 468,
     // 467
     466, 465, 464, 463, 462, 461, 460,
     // 459
@@ -2084,12 +2069,9 @@ static const int *included_patchsets[] = {
     323,
     // 322
     321,
-    // 318-320
-    317, 316, 315, 314, 313, 312,
-    // 311
-    310, 309, 308, 307,
-    // 306
-    305, 304, 303, 302, 301, 300,
+    // 319-320
+    318, 317, 316, 315, 314, 313, 312, 311, 310, 309, 308, 307, 306, 305, 304, 303,
+    302, 301, 300,
     // 298-299
     297, 296, 295, 294, 293, 292, 291,
     // 290
@@ -2102,9 +2084,7 @@ static const int *included_patchsets[] = {
     // 258
     257,
     // 256
-    255, 254,
-    // 253
-    252,
+    255, 254, 253, 252,
     // 251
     250, 249, 248, 247, 246, 245, 244, 243, 242, 241, 240, 239,
     // 238
@@ -2142,13 +2122,10 @@ static const int *included_patchsets[] = {
     129, 128,
     // 127
     126, 125, 124, 123, 122, 121, 120, 119, 118, 117, 116, 115, 114, 113, 112, 111,
-    // 110
-    109, 108, 107, 106, 105, 104, 103, 102, 101, 100, 99, 98, 97, 96, 95, 94,
-    93, 92, 91, 90, 89, 88, 87, 86, 85, 84, 83, 82, 81, 80, 79, 78,
-    77, 76, 75, 74,
-    // 73
-    72, 71, 70, 69, 68, 67, 66, 65, 64, 63, 62, 61, 60, 59, 58, 57,
-    56, 55, 54, 53, 52, 51, 50, 49,
+    110, 109, 108, 107, 106, 105, 104, 103, 102, 101, 100, 99, 98, 97, 96, 95,
+    94, 93, 92, 91, 90, 89, 88, 87, 86, 85, 84, 83, 82, 81, 80, 79,
+    78, 77, 76, 75, 74, 73, 72, 71, 70, 69, 68, 67, 66, 65, 64, 63,
+    62, 61, 60, 59, 58, 57, 56, 55, 54, 53, 52, 51, 50, 49,
     // 48
     47, 46, 45, 44,
     // 43
@@ -2203,8 +2180,8 @@ static const int *included_patchsets[] = {
     2095, 2094, 2093, 2092, 2091, 2090,
     // 2089
     2088, 2087,
-    // 2084-2086
-    2083, 2082, 2081, 2080, 2079,
+    // 2085-2086
+    2084, 2083, 2082, 2081, 2080, 2079,
     // 2078
     2077,
     // 2076
@@ -2422,10 +2399,9 @@ static const int *included_patchsets[] = {
     // 1381
     1380,
     // 1379
-    1378,
-    // 1377
-    1376, 1375, 1374, 1373, 1372, 1371, 1370, 1369, 1368, 1367, 1366, 1365, 1364, 1363, 1362, 1361,
-    1360, 1359, 1358, 1357, 1356, 1355, 1354, 1353, 1352, 1351, 1350, 1349, 1348, 1347, 1346, 1345,
+    1378, 1377, 1376, 1375, 1374, 1373, 1372, 1371, 1370, 1369, 1368, 1367, 1366, 1365, 1364, 1363,
+    1362, 1361, 1360, 1359, 1358, 1357, 1356, 1355, 1354, 1353, 1352, 1351, 1350, 1349, 1348, 1347,
+    1346, 1345,
     // 1343-1344
     1342, 1341, 1340, 1339,
     // 1338
@@ -3293,9 +3269,7 @@ static const int *included_patchsets[] = {
     // 1099-1100
     1098,
     // 1097
-    1096, 1095,
-    // 1094
-    1093, 1092, 1091, 1090,
+    1096, 1095, 1094, 1093, 1092, 1091, 1090,
     // 1088-1089
     1087, 1086, 1085,
     // 1084
@@ -3416,8 +3390,8 @@ static const int *included_patchsets[] = {
     // 768
     767, 766, 765, 764, 763, 762, 761, 760, 759, 758,
     // 757
-    756, 755, 754, 753, 752,
-    // 750-751
+    756, 755, 754, 753, 752, 751,
+    // 750
     749, 748,
     // 747
     746, 745, 744, 743, 742, 741, 740, 739, 738,
@@ -3641,10 +3615,16 @@ static const int *included_patchsets[] = {
     // 0
   },
   (const int[]) {  // 902
-    894,
+    906,
+    // 905
+    904,
+    // 896-903
+    895, 894,
     // 893
     892,
-    // 886-891
+    // 890-891
+    889,
+    // 886-888
     885, 884, 883, 882, 881, 880, 879, 878, 877, 876,
     // 875
     874,