diff --git a/src/nvim/version.c b/src/nvim/version.c
index b9fa26fec0..44bd0b9e2f 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -58,7 +58,7 @@ char *version_cflags = "Compilation: " NVIM_VERSION_CFLAGS;
 // clang-format off
 static const int vim_versions[] = { 801, 802, 900, 901 };
 
-static const int num_patches[] = { 2331, 3766, 1536, 1458 };
+static const int num_patches[] = { 2331, 3775, 1541, 1476 };
 
 static const int *included_patchsets[] = {
   (const int[]) {  // 801
@@ -426,8 +426,8 @@ static const int *included_patchsets[] = {
     4963,
     // 4962
     4961, 4960, 4959,
-    // 4957-4958
-    4956,
+    // 4958
+    4957, 4956,
     // 4955
     4954, 4953,
     // 4952
@@ -644,9 +644,7 @@ static const int *included_patchsets[] = {
     // 4367
     4366,
     // 4365
-    4364, 4363, 4362, 4361,
-    // 4360
-    4359, 4358,
+    4364, 4363, 4362, 4361, 4360, 4359, 4358,
     // 4357
     4356, 4355,
     // 4354
@@ -660,9 +658,7 @@ static const int *included_patchsets[] = {
     // 4332-4333
     4331,
     // 4330
-    4329, 4328, 4327, 4326, 4325,
-    // 4324
-    4323,
+    4329, 4328, 4327, 4326, 4325, 4324, 4323,
     // 4321-4322
     4320, 4319, 4318,
     // 4317
@@ -678,9 +674,7 @@ static const int *included_patchsets[] = {
     // 4293
     4292,
     // 4291
-    4290, 4289,
-    // 4288
-    4287,
+    4290, 4289, 4288, 4287,
     // 4286
     4285, 4284, 4283,
     // 4282
@@ -903,8 +897,8 @@ static const int *included_patchsets[] = {
     3800,
     // 3798-3799
     3797, 3796, 3795,
-    // 3793-3794
-    3792, 3791, 3790,
+    // 3794
+    3793, 3792, 3791, 3790,
     // 3789
     3788, 3787, 3786, 3785, 3784, 3783, 3782, 3781, 3780, 3779, 3778, 3777, 3776, 3775, 3774, 3773,
     3772,
@@ -1086,8 +1080,8 @@ static const int *included_patchsets[] = {
     // 3271
     3270,
     // 3268-3269
-    3267, 3266, 3265, 3264, 3263,
-    // 3261-3262
+    3267, 3266, 3265, 3264, 3263, 3262,
+    // 3261
     3260, 3259,
     // 3258
     3257, 3256, 3255, 3254, 3253, 3252,
@@ -1585,8 +1579,8 @@ static const int *included_patchsets[] = {
     2051, 2050, 2049, 2048, 2047, 2046, 2045, 2044, 2043, 2042, 2041,
     // 2039-2040
     2038, 2037, 2036,
-    // 2033-2035
-    2032, 2031, 2030, 2029, 2028, 2027, 2026, 2025, 2024, 2023,
+    // 2034-2035
+    2033, 2032, 2031, 2030, 2029, 2028, 2027, 2026, 2025, 2024, 2023,
     // 2021-2022
     2020, 2019, 2018,
     // 2017
@@ -2164,8 +2158,8 @@ static const int *included_patchsets[] = {
     // 341
     340,
     // 339
-    338, 337, 336,
-    // 334-335
+    338, 337, 336, 335,
+    // 334
     333, 332,
     // 331
     330, 329,
@@ -2237,10 +2231,9 @@ static const int *included_patchsets[] = {
     // 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,
+    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,
@@ -2521,9 +2514,7 @@ static const int *included_patchsets[] = {
     // 1496
     1495, 1494, 1493, 1492, 1491, 1490, 1489, 1488,
     // 1487
-    1486, 1485,
-    // 1484
-    1483,
+    1486, 1485, 1484, 1483,
     // 1480-1482
     1479, 1478, 1477, 1476, 1475, 1474, 1473, 1472,
     // 1471
@@ -2568,9 +2559,7 @@ static const int *included_patchsets[] = {
     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,
+    1358, 1357, 1356, 1355, 1354, 1353, 1352, 1351, 1350, 1349, 1348, 1347, 1346, 1345,
     // 1343-1344
     1342, 1341, 1340, 1339,
     // 1338
@@ -3049,9 +3038,7 @@ static const int *included_patchsets[] = {
     // 229
     228, 227, 226,
     // 225
-    224, 223, 222, 221, 220,
-    // 219
-    218, 217, 216,
+    224, 223, 222, 221, 220, 219, 218, 217, 216,
     // 214-215
     213, 212, 211, 210, 209,
     // 208
@@ -3067,8 +3054,8 @@ static const int *included_patchsets[] = {
     // 170-171
     169,
     // 168
-    167,
-    // 162-166
+    167, 166,
+    // 162-165
     161,
     // 160
     159,
@@ -3078,7 +3065,9 @@ static const int *included_patchsets[] = {
     152,
     // 150-151
     149,
-    // 144-148
+    // 146-148
+    145,
+    // 144
     143,
     // 142
     141,
@@ -3127,11 +3116,19 @@ static const int *included_patchsets[] = {
     // 0
   },
   (const int[]) {  // 901
+    2030,
+    // 2029
+    2028, 2027, 2026,
+    // 2025
+    2024,
+    // 2022-2023
+    2021, 2020, 2019,
+    // 2018
     2017, 2016,
-    // 2010-2015
-    2009, 2008, 2007,
-    // 2002-2006
-    2001,
+    // 2012-2015
+    2011, 2010, 2009, 2008, 2007,
+    // 2003-2006
+    2002, 2001,
     // 1999-2000
     1998, 1997,
     // 1992-1996
@@ -3325,8 +3322,8 @@ static const int *included_patchsets[] = {
     1491, 1490,
     // 1489
     1488,
-    // 1483-1487
-    1482, 1481,
+    // 1484-1487
+    1483, 1482, 1481,
     // 1480
     1479, 1478, 1477, 1476, 1475, 1474, 1473, 1472, 1471, 1470,
     // 1469
@@ -3344,9 +3341,7 @@ static const int *included_patchsets[] = {
     // 1438
     1437,
     // 1436
-    1435,
-    // 1434
-    1433, 1432, 1431,
+    1435, 1434, 1433, 1432, 1431,
     // 1429-1430
     1428,
     // 1427
@@ -3387,9 +3382,7 @@ static const int *included_patchsets[] = {
     // 1352
     1351, 1350, 1349,
     // 1348
-    1347, 1346, 1345, 1344, 1343, 1342, 1341, 1340,
-    // 1339
-    1338, 1337,
+    1347, 1346, 1345, 1344, 1343, 1342, 1341, 1340, 1339, 1338, 1337,
     // 1333-1336
     1332, 1331,
     // 1330
@@ -3774,9 +3767,7 @@ static const int *included_patchsets[] = {
     // 284
     283,
     // 282
-    281, 280, 279, 278, 277, 276, 275,
-    // 274
-    273, 272,
+    281, 280, 279, 278, 277, 276, 275, 274, 273, 272,
     // 270-271
     269, 268, 267, 266, 265,
     // 263-264
@@ -3809,15 +3800,9 @@ static const int *included_patchsets[] = {
     // 173
     172, 171, 170, 169, 168, 167, 166,
     // 165
-    164,
-    // 163
-    162, 161,
+    164, 163, 162, 161,
     // 160
-    159, 158, 157, 156, 155, 154,
-    // 153
-    152,
-    // 151
-    150, 149,
+    159, 158, 157, 156, 155, 154, 153, 152, 151, 150, 149,
     // 148
     147, 146, 145, 144, 143, 142, 141, 140,
     // 139