diff --git a/src/nvim/version.c b/src/nvim/version.c
index eb3420a199..597dc673ca 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, 4033, 1644, 1703, 699 };
+static const int num_patches[] = { 2408, 4033, 1646, 1714, 707 };
 
 static const int *included_patchsets[] = {
   (const int[]) {  // 801
@@ -1944,9 +1944,7 @@ static const int *included_patchsets[] = {
     // 2005
     2004, 2003, 2002, 2001, 2000,
     // 1999
-    1998, 1997, 1996, 1995,
-    // 1994
-    1993, 1992,
+    1998, 1997, 1996, 1995, 1994, 1993, 1992,
     // 1991
     1990, 1989, 1988, 1987,
     // 1986
@@ -2080,8 +2078,8 @@ static const int *included_patchsets[] = {
     1568, 1567,
     // 1566
     1565, 1564, 1563, 1562, 1561,
-    // 1557-1560
-    1556, 1555, 1554, 1553, 1552, 1551,
+    // 1558-1560
+    1557, 1556, 1555, 1554, 1553, 1552, 1551,
     // 1550
     1549, 1548, 1547, 1546, 1545,
     // 1544
@@ -2856,9 +2854,7 @@ static const int *included_patchsets[] = {
     // 1545
     1544,
     // 1543
-    1542, 1541, 1540, 1539, 1538, 1537, 1536, 1535, 1534,
-    // 1533
-    1532,
+    1542, 1541, 1540, 1539, 1538, 1537, 1536, 1535, 1534, 1533, 1532,
     // 1531
     1530,
     // 1529
@@ -2893,8 +2889,8 @@ static const int *included_patchsets[] = {
     1437,
     // 1436
     1435, 1434, 1433, 1432, 1431,
-    // 1429-1430
-    1428,
+    // 1430
+    1429, 1428,
     // 1427
     1426,
     // 1425
@@ -2915,8 +2911,8 @@ static const int *included_patchsets[] = {
     1393,
     // 1390-1392
     1389, 1388, 1387, 1386, 1385, 1384, 1383, 1382, 1381, 1380, 1379, 1378, 1377, 1376, 1375, 1374,
-    1373,
-    // 1371-1372
+    1373, 1372,
+    // 1371
     1370, 1369,
     // 1368
     1367, 1366, 1365,
@@ -2956,9 +2952,7 @@ static const int *included_patchsets[] = {
     // 1232
     1231,
     // 1230
-    1229, 1228,
-    // 1227
-    1226, 1225, 1224,
+    1229, 1228, 1227, 1226, 1225, 1224,
     // 1223
     1222, 1221, 1220, 1219, 1218, 1217, 1216, 1215, 1214, 1213, 1212, 1211, 1210,
     // 1208-1209
@@ -3026,9 +3020,7 @@ static const int *included_patchsets[] = {
     // 1035
     1034, 1033, 1032,
     // 1031
-    1030,
-    // 1029
-    1028, 1027, 1026,
+    1030, 1029, 1028, 1027, 1026,
     // 1024-1025
     1023, 1022, 1021, 1020, 1019, 1018, 1017,
     // 1016
@@ -3077,9 +3069,7 @@ static const int *included_patchsets[] = {
     // 868
     867, 866, 865, 864,
     // 863
-    862, 861, 860,
-    // 859
-    858, 857,
+    862, 861, 860, 859, 858, 857,
     // 856
     855,
     // 854
@@ -3091,9 +3081,7 @@ static const int *included_patchsets[] = {
     // 843-844
     842, 841, 840, 839, 838, 837,
     // 836
-    835,
-    // 834
-    833, 832, 831, 830, 829,
+    835, 834, 833, 832, 831, 830, 829,
     // 828
     827, 826, 825, 824, 823, 822, 821, 820, 819,
     // 817-818
@@ -3115,14 +3103,12 @@ static const int *included_patchsets[] = {
     // 768
     767, 766, 765, 764, 763, 762, 761, 760, 759, 758,
     // 757
-    756, 755, 754, 753, 752, 751,
-    // 750
-    749, 748,
+    756, 755, 754, 753, 752, 751, 750, 749, 748,
     // 747
     746, 745, 744, 743, 742, 741, 740, 739, 738,
-    // 736-737
-    735, 734, 733, 732, 731, 730, 729, 728, 727, 726, 725, 724, 723, 722, 721, 720,
-    719,
+    // 737
+    736, 735, 734, 733, 732, 731, 730, 729, 728, 727, 726, 725, 724, 723, 722, 721,
+    720, 719,
     // 718
     717, 716,
     // 714-715
@@ -3133,9 +3119,7 @@ static const int *included_patchsets[] = {
     708, 707, 706, 705, 704, 703, 702, 701, 700, 699, 698, 697, 696, 695, 694, 693,
     692, 691, 690, 689, 688, 687, 686,
     // 685
-    684, 683, 682,
-    // 681
-    680, 679, 678, 677, 676, 675, 674, 673, 672, 671,
+    684, 683, 682, 681, 680, 679, 678, 677, 676, 675, 674, 673, 672, 671,
     // 670
     669, 668, 667, 666,
     // 664-665
@@ -3162,9 +3146,7 @@ static const int *included_patchsets[] = {
     // 589-590
     588,
     // 587
-    586, 585, 584, 583, 582, 581, 580, 579,
-    // 578
-    577,
+    586, 585, 584, 583, 582, 581, 580, 579, 578, 577,
     // 576
     575, 574, 573, 572,
     // 570-571
@@ -3332,12 +3314,22 @@ static const int *included_patchsets[] = {
     // 0
   },
   (const int[]) {  // 902
+    1054,
+    // 1047-1053
+    1046, 1045,
+    // 1042-1044
+    1041, 1040,
+    // 1039
+    1038,
+    // 1037
     1036, 1035, 1034,
     // 1033
     1032, 1031,
     // 1030
     1029,
-    // 1025-1028
+    // 1028
+    1027,
+    // 1025-1026
     1024, 1023, 1022, 1021,
     // 1020
     1019, 1018, 1017,
@@ -3634,8 +3626,8 @@ static const int *included_patchsets[] = {
     306,
     // 305
     304, 303, 302,
-    // 300-301
-    299, 298, 297, 296, 295, 294, 293, 292, 291, 290, 289, 288, 287, 286, 285,
+    // 301
+    300, 299, 298, 297, 296, 295, 294, 293, 292, 291, 290, 289, 288, 287, 286, 285,
     // 282-284
     281, 280, 279,
     // 278