diff --git a/src/nvim/version.c b/src/nvim/version.c
index 5219f7a873..106d05f245 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[] = { 2406, 3967, 1635, 1697, 649 };
+static const int num_patches[] = { 2406, 4019, 1639, 1701, 655 };
 
 static const int *included_patchsets[] = {
   (const int[]) {  // 801
@@ -421,21 +421,13 @@ static const int *included_patchsets[] = {
     // 4682-4684
     4681, 4680, 4679, 4678, 4677, 4676, 4675, 4674,
     // 4673
-    4672, 4671, 4670,
-    // 4669
-    4668, 4667, 4666, 4665, 4664,
+    4672, 4671, 4670, 4669, 4668, 4667, 4666, 4665, 4664,
     // 4662-4663
     4661, 4660,
     // 4659
     4658,
     // 4656-4657
-    4655, 4654,
-    // 4653
-    4652, 4651,
-    // 4650
-    4649,
-    // 4648
-    4647, 4646, 4645, 4644, 4643,
+    4655, 4654, 4653, 4652, 4651, 4650, 4649, 4648, 4647, 4646, 4645, 4644, 4643,
     // 4642
     4641, 4640, 4639, 4638, 4637, 4636,
     // 4634-4635
@@ -449,9 +441,7 @@ static const int *included_patchsets[] = {
     // 4610
     4609, 4608, 4607, 4606,
     // 4604-4605
-    4603, 4602, 4601, 4600, 4599, 4598,
-    // 4597
-    4596, 4595, 4594, 4593, 4592, 4591, 4590,
+    4603, 4602, 4601, 4600, 4599, 4598, 4597, 4596, 4595, 4594, 4593, 4592, 4591, 4590,
     // 4588-4589
     4587,
     // 4586
@@ -781,9 +771,7 @@ static const int *included_patchsets[] = {
     // 3763-3764
     3762,
     // 3760-3761
-    3759, 3758, 3757, 3756, 3755, 3754,
-    // 3753
-    3752, 3751,
+    3759, 3758, 3757, 3756, 3755, 3754, 3753, 3752, 3751,
     // 3749-3750
     3748, 3747, 3746, 3745, 3744, 3743, 3742, 3741, 3740, 3739,
     // 3738
@@ -937,8 +925,8 @@ static const int *included_patchsets[] = {
     // 3287-3288
     3286, 3285, 3284, 3283, 3282, 3281, 3280,
     // 3279
-    3278, 3277,
-    // 3273-3276
+    3278, 3277, 3276,
+    // 3273-3275
     3272,
     // 3271
     3270,
@@ -1106,9 +1094,7 @@ static const int *included_patchsets[] = {
     // 2866-2867
     2865,
     // 2864
-    2863, 2862, 2861,
-    // 2860
-    2859, 2858, 2857, 2856,
+    2863, 2862, 2861, 2860, 2859, 2858, 2857, 2856,
     // 2855
     2854,
     // 2853
@@ -1498,8 +1484,8 @@ static const int *included_patchsets[] = {
     // 1824-1826
     1823, 1822, 1821, 1820,
     // 1819
-    1818, 1817, 1816, 1815,
-    // 1813-1814
+    1818, 1817, 1816, 1815, 1814,
+    // 1813
     1812,
     // 1811
     1810,
@@ -1559,17 +1545,9 @@ static const int *included_patchsets[] = {
     // 1636-1637
     1635, 1634, 1633, 1632, 1631, 1630, 1629,
     // 1627-1628
-    1626, 1625, 1624, 1623, 1622, 1621,
-    // 1619-1620
-    1618,
-    // 1614-1617
-    1613, 1612,
-    // 1610-1611
-    1609, 1608, 1607,
-    // 1606
-    1605,
-    // 1601-1604
-    1600, 1599, 1598, 1597, 1596, 1595, 1594,
+    1626, 1625, 1624, 1623, 1622, 1621, 1620, 1619, 1618, 1617, 1616, 1615, 1614, 1613, 1612, 1611,
+    1610, 1609, 1608, 1607, 1606, 1605, 1604, 1603, 1602, 1601, 1600, 1599, 1598, 1597, 1596, 1595,
+    1594,
     // 1593
     1592, 1591, 1590, 1589, 1588, 1587, 1586, 1585, 1584, 1583, 1582, 1581, 1580, 1579, 1578, 1577,
     1576, 1575, 1574, 1573, 1572, 1571, 1570,
@@ -1792,20 +1770,14 @@ static const int *included_patchsets[] = {
     770, 769, 768, 767, 766, 765, 764, 763, 762, 761, 760, 759, 758, 757, 756, 755,
     754, 753, 752,
     // 751
-    750, 749,
-    // 747-748
-    746, 745, 744, 743, 742, 741, 740, 739,
+    750, 749, 748, 747, 746, 745, 744, 743, 742, 741, 740, 739,
     // 737-738
     736, 735, 734, 733, 732, 731,
     // 729-730
-    728, 727, 726, 725, 724, 723, 722, 721, 720, 719,
-    // 718
-    717, 716, 715, 714, 713, 712, 711, 710, 709, 708, 707, 706, 705, 704, 703, 702,
-    701, 700,
+    728, 727, 726, 725, 724, 723, 722, 721, 720, 719, 718, 717, 716, 715, 714, 713,
+    712, 711, 710, 709, 708, 707, 706, 705, 704, 703, 702, 701, 700,
     // 699
-    698, 697, 696, 695,
-    // 694
-    693, 692, 691, 690, 689, 688, 687, 686, 685,
+    698, 697, 696, 695, 694, 693, 692, 691, 690, 689, 688, 687, 686, 685,
     // 683-684
     682, 681, 680,
     // 679
@@ -1815,52 +1787,31 @@ static const int *included_patchsets[] = {
     // 675
     674, 673, 672, 671, 670, 669, 668, 667, 666, 665, 664, 663,
     // 661-662
-    660, 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,
+    660, 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,
     // 626-627
-    625,
-    // 624
-    623, 622, 621, 620, 619, 618, 617, 616, 615, 614,
-    // 613
-    612,
-    // 611
-    610, 609, 608, 607, 606, 605, 604, 603, 602,
+    625, 624, 623, 622, 621, 620, 619, 618, 617, 616, 615, 614, 613, 612, 611, 610,
+    609, 608, 607, 606, 605, 604, 603, 602,
     // 601
-    600, 599, 598, 597,
-    // 595-596
-    594, 593, 592, 591, 590, 589,
-    // 588
-    587,
+    600, 599, 598, 597, 596,
+    // 595
+    594, 593, 592, 591, 590, 589, 588, 587,
     // 585-586
-    584, 583, 582, 581, 580, 579, 578, 577, 576, 575,
-    // 574
-    573, 572, 571,
+    584, 583, 582, 581, 580, 579, 578, 577, 576, 575, 574, 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,
+    561, 560, 559, 558, 557, 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, 530, 529,
-    // 528
-    527, 526, 525, 524,
+    535, 534, 533, 532, 531, 530, 529, 528, 527, 526, 525, 524,
     // 523
     522, 521, 520, 519, 518,
-    // 516-517
-    515,
-    // 514
-    513, 512, 511, 510, 509, 508, 507, 506, 505, 504, 503, 502, 501,
+    // 517
+    516, 515, 514, 513, 512, 511, 510, 509, 508, 507, 506, 505, 504, 503, 502, 501,
     // 500
     499, 498, 497, 496, 495, 494,
     // 493
@@ -1879,17 +1830,12 @@ static const int *included_patchsets[] = {
     424, 423, 422,
     // 421
     420, 419, 418, 417, 416, 415, 414, 413, 412, 411, 410, 409, 408, 407, 406, 405,
-    404, 403, 402, 401, 400,
-    // 399
-    398, 397, 396, 395, 394, 393, 392, 391, 390, 389, 388, 387,
+    404, 403, 402, 401, 400, 399, 398, 397, 396, 395, 394, 393, 392, 391, 390, 389,
+    388, 387,
     // 386
     385, 384, 383, 382, 381, 380, 379, 378, 377, 376, 375, 374, 373, 372, 371, 370,
-    369, 368,
-    // 367
-    366, 365,
-    // 364
-    363, 362, 361, 360, 359, 358, 357, 356, 355, 354, 353, 352, 351, 350, 349, 348,
-    347,
+    369, 368, 367, 366, 365, 364, 363, 362, 361, 360, 359, 358, 357, 356, 355, 354,
+    353, 352, 351, 350, 349, 348, 347,
     // 346
     345, 344, 343, 342,
     // 341
@@ -1899,14 +1845,12 @@ static const int *included_patchsets[] = {
     // 334
     333, 332,
     // 331
-    330, 329,
-    // 328
-    327, 326, 325,
+    330, 329, 328, 327, 326, 325,
     // 324
     323,
     // 322
-    321,
-    // 319-320
+    321, 320,
+    // 319
     318, 317, 316, 315, 314, 313, 312, 311, 310, 309, 308, 307, 306, 305, 304, 303,
     302, 301, 300,
     // 298-299
@@ -1927,30 +1871,19 @@ static const int *included_patchsets[] = {
     // 209
     208,
     // 207
-    206, 205,
-    // 204
-    203,
-    // 201-202
+    206, 205, 204, 203, 202,
+    // 201
     200,
     // 199
-    198, 197,
-    // 196
-    195,
-    // 194
-    193, 192,
-    // 191
-    190, 189, 188, 187, 186,
+    198, 197, 196, 195, 194, 193, 192, 191, 190, 189, 188, 187, 186,
     // 185
     184, 183,
     // 182
-    181, 180, 179, 178, 177, 176, 175, 174,
-    // 173
-    172, 171, 170, 169, 168, 167, 166, 165, 164, 163, 162, 161,
+    181, 180, 179, 178, 177, 176, 175, 174, 173, 172, 171, 170, 169, 168, 167, 166,
+    165, 164, 163, 162, 161,
     // 159-160
-    158, 157, 156, 155, 154, 153, 152, 151, 150,
-    // 149
-    148, 147, 146, 145, 144, 143, 142, 141, 140, 139, 138, 137, 136, 135, 134, 133,
-    132, 131,
+    158, 157, 156, 155, 154, 153, 152, 151, 150, 149, 148, 147, 146, 145, 144, 143,
+    142, 141, 140, 139, 138, 137, 136, 135, 134, 133, 132, 131,
     // 130
     129, 128,
     // 127
@@ -2054,9 +1987,7 @@ static const int *included_patchsets[] = {
     // 1957
     1956,
     // 1955
-    1954,
-    // 1953
-    1952,
+    1954, 1953, 1952,
     // 1951
     1950, 1949,
     // 1948
@@ -2109,8 +2040,8 @@ static const int *included_patchsets[] = {
     1828,
     // 1827
     1826, 1825, 1824, 1823,
-    // 1821-1822
-    1820, 1819,
+    // 1822
+    1821, 1820, 1819,
     // 1818
     1817, 1816, 1815,
     // 1814
@@ -2421,9 +2352,7 @@ static const int *included_patchsets[] = {
     // 894
     893, 892,
     // 890-891
-    889, 888, 887, 886,
-    // 885
-    884, 883, 882,
+    889, 888, 887, 886, 885, 884, 883, 882,
     // 880-881
     879, 878,
     // 877
@@ -2623,7 +2552,9 @@ static const int *included_patchsets[] = {
     382,
     // 381
     380, 379, 378,
-    // 373-377
+    // 376-377
+    375,
+    // 373-374
     372,
     // 371
     370, 369, 368, 367,
@@ -2794,9 +2725,8 @@ static const int *included_patchsets[] = {
     // 2049
     2048, 2047, 2046,
     // 2044-2045
-    2043, 2042, 2041, 2040, 2039, 2038, 2037, 2036, 2035, 2034,
-    // 2033
-    2032, 2031, 2030, 2029, 2028, 2027, 2026, 2025, 2024, 2023,
+    2043, 2042, 2041, 2040, 2039, 2038, 2037, 2036, 2035, 2034, 2033, 2032, 2031, 2030, 2029, 2028,
+    2027, 2026, 2025, 2024, 2023,
     // 2022
     2021, 2020, 2019, 2018, 2017, 2016,
     // 2012-2015
@@ -3262,9 +3192,7 @@ static const int *included_patchsets[] = {
     // 589-590
     588,
     // 587
-    586, 585,
-    // 584
-    583, 582, 581, 580, 579,
+    586, 585, 584, 583, 582, 581, 580, 579,
     // 578
     577,
     // 576
@@ -3339,9 +3267,7 @@ static const int *included_patchsets[] = {
     // 358
     357, 356, 355, 354, 353,
     // 352
-    351, 350,
-    // 349
-    348, 347, 346, 345, 344, 343, 342, 341, 340, 339,
+    351, 350, 349, 348, 347, 346, 345, 344, 343, 342, 341, 340, 339,
     // 338
     337, 336, 335, 334, 333, 332, 331,
     // 330
@@ -3375,8 +3301,8 @@ static const int *included_patchsets[] = {
     // 219
     218, 217, 216, 215, 214, 213, 212, 211, 210, 209, 208, 207,
     // 206
-    205, 204, 203,
-    // 200-202
+    205, 204, 203, 202,
+    // 200-201
     199, 198, 197, 196, 195, 194,
     // 193
     192, 191, 190, 189, 188, 187, 186,
@@ -3437,8 +3363,12 @@ static const int *included_patchsets[] = {
     // 0
   },
   (const int[]) {  // 902
-    967,
-    // 964-966
+    982,
+    // 970-981
+    969,
+    // 968
+    967, 966, 965,
+    // 964
     963,
     // 961-962
     960,
@@ -3563,9 +3493,7 @@ static const int *included_patchsets[] = {
     663, 662,
     // 661
     660, 659, 658, 657, 656, 655, 654, 653, 652, 651, 650, 649, 648, 647, 646, 645,
-    644,
-    // 643
-    642, 641, 640, 639,
+    644, 643, 642, 641, 640, 639,
     // 638
     637,
     // 636
@@ -3818,9 +3746,7 @@ static const int *included_patchsets[] = {
     // 39
     38, 37, 36,
     // 34-35
-    33, 32, 31, 30, 29, 28, 27,
-    // 26
-    25, 24, 23, 22, 21, 20, 19, 18,
+    33, 32, 31, 30, 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18,
     // 14-17
     13, 12, 11, 10, 9, 8, 7,
     // 5-6