diff --git a/src/nvim/version.c b/src/nvim/version.c
index 1ea7218421..40a8dadba8 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, 3895, 1631, 1683, 608 };
+static const int num_patches[] = { 2333, 3906, 1631, 1690, 615 };
 
 static const int *included_patchsets[] = {
   (const int[]) {  // 801
@@ -635,9 +635,7 @@ static const int *included_patchsets[] = {
     // 4350
     4349,
     // 4347-4348
-    4346, 4345,
-    // 4344
-    4343, 4342, 4341, 4340, 4339, 4338, 4337, 4336, 4335, 4334,
+    4346, 4345, 4344, 4343, 4342, 4341, 4340, 4339, 4338, 4337, 4336, 4335, 4334,
     // 4332-4333
     4331,
     // 4330
@@ -823,9 +821,7 @@ static const int *included_patchsets[] = {
     // 3892
     3891,
     // 3890
-    3889, 3888, 3887, 3886, 3885, 3884, 3883, 3882,
-    // 3881
-    3880, 3879, 3878,
+    3889, 3888, 3887, 3886, 3885, 3884, 3883, 3882, 3881, 3880, 3879, 3878,
     // 3877
     3876, 3875, 3874, 3873,
     // 3871-3872
@@ -849,8 +845,8 @@ static const int *included_patchsets[] = {
     // 3842
     3841,
     // 3840
-    3839, 3838,
-    // 3835-3837
+    3839, 3838, 3837,
+    // 3835-3836
     3834, 3833,
     // 3832
     3831,
@@ -893,7 +889,9 @@ static const int *included_patchsets[] = {
     3730, 3729,
     // 3727-3728
     3726, 3725, 3724,
-    // 3720-3723
+    // 3723
+    3722,
+    // 3720-3721
     3719, 3718, 3717, 3716, 3715, 3714, 3713, 3712, 3711, 3710, 3709, 3708, 3707,
     // 3706
     3705,
@@ -1834,8 +1832,8 @@ static const int *included_patchsets[] = {
     1217, 1216, 1215, 1214,
     // 1213
     1212, 1211, 1210, 1209, 1208, 1207, 1206,
-    // 1204-1205
-    1203, 1202, 1201, 1200, 1199, 1198, 1197, 1196, 1195, 1194, 1193,
+    // 1205
+    1204, 1203, 1202, 1201, 1200, 1199, 1198, 1197, 1196, 1195, 1194, 1193,
     // 1191-1192
     1190, 1189, 1188, 1187, 1186,
     // 1185
@@ -1890,21 +1888,15 @@ static const int *included_patchsets[] = {
     // 1042
     1041, 1040,
     // 1039
-    1038, 1037, 1036, 1035, 1034, 1033,
-    // 1032
-    1031, 1030, 1029,
-    // 1028
-    1027, 1026, 1025,
-    // 1023-1024
+    1038, 1037, 1036, 1035, 1034, 1033, 1032, 1031, 1030, 1029, 1028, 1027, 1026, 1025, 1024,
+    // 1023
     1022, 1021, 1020,
     // 1019
     1018, 1017, 1016,
     // 1015
     1014, 1013,
     // 1011-1012
-    1010, 1009, 1008, 1007, 1006, 1005, 1004,
-    // 1003
-    1002, 1001, 1000, 999, 998, 997, 996,
+    1010, 1009, 1008, 1007, 1006, 1005, 1004, 1003, 1002, 1001, 1000, 999, 998, 997, 996,
     // 995
     994, 993,
     // 992
@@ -1914,9 +1906,7 @@ static const int *included_patchsets[] = {
     // 988
     987, 986, 985, 984, 983, 982, 981, 980, 979, 978,
     // 977
-    976, 975, 974,
-    // 972-973
-    971,
+    976, 975, 974, 973, 972, 971,
     // 970
     969, 968, 967, 966, 965, 964, 963, 962,
     // 960-961
@@ -3006,8 +2996,8 @@ static const int *included_patchsets[] = {
     1903,
     // 1902
     1901,
-    // 1894-1900
-    1893, 1892, 1891, 1890, 1889, 1888,
+    // 1895-1900
+    1894, 1893, 1892, 1891, 1890, 1889, 1888,
     // 1887
     1886, 1885, 1884, 1883,
     // 1882
@@ -3032,9 +3022,7 @@ static const int *included_patchsets[] = {
     1827,
     // 1826
     1825, 1824, 1823, 1822, 1821, 1820, 1819, 1818, 1817, 1816, 1815, 1814, 1813, 1812, 1811, 1810,
-    1809, 1808, 1807, 1806, 1805, 1804,
-    // 1803
-    1802, 1801, 1800, 1799, 1798, 1797,
+    1809, 1808, 1807, 1806, 1805, 1804, 1803, 1802, 1801, 1800, 1799, 1798, 1797,
     // 1795-1796
     1794, 1793,
     // 1791-1792
@@ -3316,8 +3304,8 @@ static const int *included_patchsets[] = {
     987, 986,
     // 985
     984, 983, 982, 981,
-    // 979-980
-    978, 977, 976,
+    // 980
+    979, 978, 977, 976,
     // 975
     974,
     // 973
@@ -3409,8 +3397,8 @@ static const int *included_patchsets[] = {
     692, 691, 690, 689, 688, 687, 686,
     // 685
     684, 683, 682,
-    // 680-681
-    679, 678, 677, 676, 675, 674, 673, 672, 671,
+    // 681
+    680, 679, 678, 677, 676, 675, 674, 673, 672, 671,
     // 670
     669, 668, 667, 666,
     // 664-665
@@ -3499,9 +3487,8 @@ static const int *included_patchsets[] = {
     // 403
     402, 401, 400, 399,
     // 398
-    397, 396, 395, 394,
-    // 393
-    392, 391, 390, 389, 388, 387, 386, 385, 384, 383, 382, 381, 380,
+    397, 396, 395, 394, 393, 392, 391, 390, 389, 388, 387, 386, 385, 384, 383, 382,
+    381, 380,
     // 379
     378,
     // 376-377
@@ -3517,11 +3504,9 @@ static const int *included_patchsets[] = {
     // 352
     351, 350,
     // 349
-    348, 347, 346,
-    // 345
-    344, 343, 342, 341, 340, 339,
-    // 337-338
-    336, 335, 334, 333, 332, 331,
+    348, 347, 346, 345, 344, 343, 342, 341, 340, 339,
+    // 338
+    337, 336, 335, 334, 333, 332, 331,
     // 330
     329, 328, 327, 326, 325, 324, 323, 322, 321, 320, 319, 318, 317, 316, 315,
     // 314
@@ -3615,10 +3600,16 @@ static const int *included_patchsets[] = {
     // 0
   },
   (const int[]) {  // 902
-    906,
-    // 905
-    904,
-    // 896-903
+    914,
+    // 910-913
+    909,
+    // 907-908
+    906, 905, 904, 903,
+    // 901-902
+    900,
+    // 898-899
+    897,
+    // 896
     895, 894,
     // 893
     892,
@@ -3964,9 +3955,7 @@ static const int *included_patchsets[] = {
     // 39
     38, 37, 36,
     // 34-35
-    33, 32, 31, 30,
-    // 29
-    28, 27,
+    33, 32, 31, 30, 29, 28, 27,
     // 26
     25, 24, 23, 22, 21, 20, 19, 18,
     // 14-17