diff --git a/src/nvim/version.c b/src/nvim/version.c
index cce5cf1a4d..eb3420a199 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[] = { 2408, 4024, 1642, 1703, 684 };
+static const int num_patches[] = { 2408, 4033, 1644, 1703, 699 };
 
 static const int *included_patchsets[] = {
   (const int[]) {  // 801
@@ -390,8 +390,7 @@ static const int *included_patchsets[] = {
     // 4777
     4776,
     // 4774-4775
-    4773, 4772, 4771, 4770, 4769, 4768, 4767, 4766, 4765, 4764, 4763, 4762, 4761, 4760, 4759,
-    // 4758
+    4773, 4772, 4771, 4770, 4769, 4768, 4767, 4766, 4765, 4764, 4763, 4762, 4761, 4760, 4759, 4758,
     4757, 4756,
     // 4755
     4754, 4753, 4752,
@@ -457,8 +456,8 @@ static const int *included_patchsets[] = {
     4550, 4549, 4548, 4547, 4546, 4545, 4544, 4543, 4542, 4541,
     // 4540
     4539, 4538, 4537,
-    // 4535-4536
-    4534, 4533, 4532, 4531,
+    // 4536
+    4535, 4534, 4533, 4532, 4531,
     // 4530
     4529, 4528, 4527,
     // 4525-4526
@@ -589,9 +588,7 @@ static const int *included_patchsets[] = {
     // 4164
     4163,
     // 4162
-    4161, 4160, 4159, 4158,
-    // 4157
-    4156, 4155, 4154, 4153, 4152, 4151, 4150,
+    4161, 4160, 4159, 4158, 4157, 4156, 4155, 4154, 4153, 4152, 4151, 4150,
     // 4147-4149
     4146,
     // 4145
@@ -659,9 +656,7 @@ static const int *included_patchsets[] = {
     // 3985-3987
     3984,
     // 3983
-    3982, 3981, 3980,
-    // 3979
-    3978,
+    3982, 3981, 3980, 3979, 3978,
     // 3975-3977
     3974, 3973,
     // 3970-3972
@@ -760,8 +755,8 @@ static const int *included_patchsets[] = {
     // 3771
     3770, 3769, 3768, 3767, 3766, 3765,
     // 3763-3764
-    3762,
-    // 3760-3761
+    3762, 3761,
+    // 3760
     3759, 3758, 3757, 3756, 3755, 3754, 3753, 3752, 3751,
     // 3749-3750
     3748, 3747, 3746, 3745, 3744, 3743, 3742, 3741, 3740, 3739,
@@ -816,13 +811,11 @@ static const int *included_patchsets[] = {
     // 3608
     3607, 3606,
     // 3605
-    3604, 3603, 3602, 3601, 3600, 3599, 3598,
-    // 3597
-    3596, 3595, 3594, 3593,
+    3604, 3603, 3602, 3601, 3600, 3599, 3598, 3597, 3596, 3595, 3594, 3593,
     // 3592
     3591,
-    // 3589-3590
-    3588, 3587, 3586, 3585, 3584, 3583, 3582, 3581, 3580, 3579,
+    // 3590
+    3589, 3588, 3587, 3586, 3585, 3584, 3583, 3582, 3581, 3580, 3579,
     // 3578
     3577, 3576, 3575, 3574, 3573, 3572, 3571, 3570,
     // 3569
@@ -1079,9 +1072,7 @@ static const int *included_patchsets[] = {
     // 2881-2882
     2880, 2879, 2878, 2877, 2876, 2875,
     // 2874
-    2873,
-    // 2872
-    2871, 2870, 2869, 2868,
+    2873, 2872, 2871, 2870, 2869, 2868,
     // 2866-2867
     2865,
     // 2864
@@ -1710,9 +1701,7 @@ static const int *included_patchsets[] = {
     // 1011-1012
     1010, 1009, 1008, 1007, 1006, 1005, 1004, 1003, 1002, 1001, 1000, 999, 998, 997, 996,
     // 995
-    994, 993,
-    // 992
-    991,
+    994, 993, 992, 991,
     // 990
     989,
     // 988
@@ -2074,9 +2063,7 @@ static const int *included_patchsets[] = {
     // 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,
+    1610, 1609, 1608, 1607, 1606, 1605, 1604, 1603, 1602, 1601, 1600, 1599, 1598, 1597, 1596, 1595,
     // 1592-1594
     1591, 1590,
     // 1589
@@ -2650,9 +2637,7 @@ static const int *included_patchsets[] = {
     // 72
     71, 70,
     // 69
-    68, 67, 66, 65, 64, 63, 62, 61, 60, 59,
-    // 58
-    57,
+    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
@@ -3347,9 +3332,17 @@ static const int *included_patchsets[] = {
     // 0
   },
   (const int[]) {  // 902
+    1036, 1035, 1034,
+    // 1033
+    1032, 1031,
+    // 1030
+    1029,
+    // 1025-1028
+    1024, 1023, 1022, 1021,
+    // 1020
     1019, 1018, 1017,
-    // 1013-1016
-    1012, 1011,
+    // 1014-1016
+    1013, 1012, 1011,
     // 1010
     1009,
     // 1008
@@ -3533,10 +3526,8 @@ static const int *included_patchsets[] = {
     // 576
     575, 574,
     // 572-573
-    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,
+    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,
     // 545
     544, 543, 542, 541, 540, 539, 538, 537, 536, 535,
     // 534
@@ -3567,7 +3558,9 @@ static const int *included_patchsets[] = {
     486,
     // 483-485
     482, 481, 480, 479, 478, 477, 476, 475, 474, 473, 472, 471, 470,
-    // 465-469
+    // 469
+    468,
+    // 465-467
     464,
     // 462-463
     461, 460,
@@ -3586,12 +3579,12 @@ static const int *included_patchsets[] = {
     // 427-428
     426, 425,
     // 423-424
-    422, 421,
-    // 419-420
+    422, 421, 420,
+    // 419
     418, 417, 416, 415,
     // 414
-    413,
-    // 410-412
+    413, 412,
+    // 410-411
     409, 408,
     // 407
     406,