diff --git a/src/nvim/version.c b/src/nvim/version.c
index 75c03f674a..c9628dd673 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, 3845, 1605, 1655, 438 };
+static const int num_patches[] = { 2332, 3856, 1607, 1655, 448 };
 
 static const int *included_patchsets[] = {
   (const int[]) {  // 801
@@ -447,9 +447,7 @@ static const int *included_patchsets[] = {
     // 4913
     4912, 4911, 4910,
     // 4909
-    4908, 4907,
-    // 4906
-    4905, 4904, 4903,
+    4908, 4907, 4906, 4905, 4904, 4903,
     // 4902
     4901, 4900, 4899, 4898,
     // 4896-4897
@@ -464,8 +462,8 @@ static const int *included_patchsets[] = {
     4878,
     // 4875-4877
     4874,
-    // 4872-4873
-    4871,
+    // 4873
+    4872, 4871,
     // 4869-4870
     4868, 4867, 4866, 4865, 4864, 4863, 4862, 4861, 4860, 4859, 4858, 4857, 4856, 4855,
     // 4854
@@ -694,9 +692,7 @@ static const int *included_patchsets[] = {
     // 4240
     4239, 4238, 4237, 4236, 4235, 4234, 4233,
     // 4231-4232
-    4230,
-    // 4229
-    4228, 4227,
+    4230, 4229, 4228, 4227,
     // 4223-4226
     4222, 4221, 4220, 4219, 4218, 4217, 4216, 4215, 4214, 4213, 4212, 4211, 4210,
     // 4209
@@ -992,9 +988,7 @@ static const int *included_patchsets[] = {
     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,
+    3457, 3456, 3455, 3454, 3453, 3452, 3451, 3450, 3449, 3448,
     // 3447
     3446,
     // 3444-3445
@@ -1293,8 +1287,8 @@ static const int *included_patchsets[] = {
     // 2685
     2684, 2683, 2682,
     // 2679-2681
-    2678,
-    // 2675-2677
+    2678, 2677,
+    // 2675-2676
     2674, 2673,
     // 2672
     2671, 2670,
@@ -1505,13 +1499,7 @@ static const int *included_patchsets[] = {
     // 2148
     2147,
     // 2146
-    2145, 2144, 2143, 2142, 2141, 2140, 2139, 2138,
-    // 2137
-    2136,
-    // 2135
-    2134,
-    // 2133
-    2132,
+    2145, 2144, 2143, 2142, 2141, 2140, 2139, 2138, 2137, 2136, 2135, 2134, 2133, 2132,
     // 2131
     2130,
     // 2129
@@ -2061,9 +2049,7 @@ static const int *included_patchsets[] = {
     // 536-537
     535, 534, 533, 532, 531,
     // 528-530
-    527,
-    // 526
-    525, 524,
+    527, 526, 525, 524,
     // 523
     522, 521, 520, 519,
     // 516-518
@@ -2080,10 +2066,8 @@ static const int *included_patchsets[] = {
     // 467
     466, 465, 464, 463, 462, 461, 460,
     // 459
-    458, 457, 456, 455, 454,
-    // 453
-    452, 451, 450, 449, 448, 447, 446, 445, 444, 443, 442, 441, 440, 439, 438, 437,
-    436, 435, 434, 433,
+    458, 457, 456, 455, 454, 453, 452, 451, 450, 449, 448, 447, 446, 445, 444, 443,
+    442, 441, 440, 439, 438, 437, 436, 435, 434, 433,
     // 432
     431, 430, 429, 428,
     // 427
@@ -2126,8 +2110,8 @@ static const int *included_patchsets[] = {
     // 306
     305, 304, 303, 302, 301, 300,
     // 298-299
-    297, 296, 295, 294, 293, 292,
-    // 290-291
+    297, 296, 295, 294, 293, 292, 291,
+    // 290
     289, 288, 287,
     // 286
     285, 284, 283, 282, 281, 280,
@@ -2251,9 +2235,7 @@ static const int *included_patchsets[] = {
     2068, 2067, 2066, 2065, 2064, 2063, 2062, 2061, 2060, 2059, 2058, 2057, 2056,
     // 2054-2055
     2053, 2052, 2051, 2050, 2049, 2048, 2047, 2046, 2045, 2044, 2043, 2042, 2041, 2040, 2039, 2038,
-    2037, 2036, 2035,
-    // 2034
-    2033, 2032, 2031, 2030,
+    2037, 2036, 2035, 2034, 2033, 2032, 2031, 2030,
     // 2029
     2028,
     // 2026-2027
@@ -2591,8 +2573,8 @@ static const int *included_patchsets[] = {
     1059,
     // 1058
     1057, 1056, 1055,
-    // 1053-1054
-    1052, 1051, 1050, 1049,
+    // 1054
+    1053, 1052, 1051, 1050, 1049,
     // 1048
     1047, 1046,
     // 1044-1045
@@ -3715,17 +3697,20 @@ static const int *included_patchsets[] = {
     // 0
   },
   (const int[]) {  // 902
-    699, 698,
-    // 690-697
+    705,
+    // 703-704
+    702,
+    // 700-701
+    699, 698, 697, 696,
+    // 694-695
+    693,
+    // 692
+    691,
+    // 690
     689,
-    // 687-688
-    686,
-    // 685
-    684, 683, 682,
-    // 681
-    680,
-    // 679
-    678, 677, 676, 675, 674, 673, 672, 671,
+    // 688
+    687, 686, 685, 684, 683, 682, 681, 680, 679, 678, 677, 676, 675, 674, 673, 672,
+    671,
     // 669-670
     668, 667,
     // 666