diff --git a/src/nvim/version.c b/src/nvim/version.c index 071940ed4b..e125b256ee 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[] = { 2331, 3829, 1600, 1647, 386 }; +static const int num_patches[] = { 2332, 3842, 1602, 1647, 393 }; static const int *included_patchsets[] = { (const int[]) { // 801 @@ -130,8 +130,7 @@ static const int *included_patchsets[] = { 2120, 2119, 2118, 2117, 2116, 2115, 2114, 2113, 2112, 2111, 2110, 2109, 2108, 2107, 2106, 2105, 2104, 2103, 2102, 2101, 2100, 2099, 2098, 2097, 2096, 2095, 2094, // 2092-2093 - 2091, 2090, 2089, 2088, 2087, 2086, 2085, 2084, 2083, 2082, 2081, 2080, 2079, 2078, 2077, - // 2076 + 2091, 2090, 2089, 2088, 2087, 2086, 2085, 2084, 2083, 2082, 2081, 2080, 2079, 2078, 2077, 2076, 2075, 2074, 2073, 2072, 2071, 2070, 2069, 2068, 2067, 2066, 2065, 2064, 2063, 2062, 2061, 2060, 2059, 2058, 2057, 2056, 2055, 2054, 2053, 2052, 2051, 2050, 2049, 2048, 2047, 2046, 2045, 2044, 2043, 2042, 2041, @@ -476,8 +475,8 @@ static const int *included_patchsets[] = { // 4847 4846, 4845, 4844, 4843, 4842, 4841, 4840, 4839, 4838, 4837, 4836, 4835, 4834, 4833, // 4832 - 4831, 4830, 4829, 4828, 4827, 4826, 4825, 4824, 4823, - // 4821-4822 + 4831, 4830, 4829, 4828, 4827, 4826, 4825, 4824, 4823, 4822, + // 4821 4820, 4819, 4818, 4817, 4816, 4815, // 4814 4813, 4812, 4811, 4810, 4809, 4808, 4807, 4806, 4805, @@ -577,8 +576,8 @@ static const int *included_patchsets[] = { 4566, 4565, 4564, 4563, 4562, 4561, 4560, 4559, 4558, 4557, 4556, 4555, 4554, 4553, 4552, // 4551 4550, 4549, 4548, 4547, 4546, 4545, 4544, 4543, 4542, 4541, - // 4539-4540 - 4538, 4537, + // 4540 + 4539, 4538, 4537, // 4535-4536 4534, 4533, 4532, 4531, // 4530 @@ -678,8 +677,8 @@ static const int *included_patchsets[] = { 4278, // 4276-4277 4275, 4274, 4273, 4272, 4271, - // 4269-4270 - 4268, 4267, + // 4270 + 4269, 4268, 4267, // 4263-4266 4262, 4261, // 4259-4260 @@ -783,9 +782,7 @@ static const int *included_patchsets[] = { // 4008-4012 4007, // 4003-4006 - 4002, 4001, - // 4000 - 3999, 3998, + 4002, 4001, 4000, 3999, 3998, // 3996-3997 3995, // 3994 @@ -1019,9 +1016,8 @@ static const int *included_patchsets[] = { // 3404-3405 3403, 3402, // 3401 - 3400, 3399, 3398, 3397, - // 3396 - 3395, 3394, 3393, 3392, 3391, 3390, 3389, 3388, 3387, 3386, 3385, 3384, 3383, 3382, 3381, + 3400, 3399, 3398, 3397, 3396, 3395, 3394, 3393, 3392, 3391, 3390, 3389, 3388, 3387, 3386, 3385, + 3384, 3383, 3382, 3381, // 3380 3379, 3378, 3377, // 3376 @@ -1031,16 +1027,16 @@ static const int *included_patchsets[] = { // 3367 3366, // 3365 - 3364, 3363, 3362, 3361, 3360, - // 3359 - 3358, 3357, + 3364, 3363, 3362, 3361, 3360, 3359, 3358, 3357, // 3356 3355, 3354, 3353, // 3351-3352 3350, 3349, 3348, // 3346-3347 3345, - // 3339-3344 + // 3341-3344 + 3340, + // 3339 3338, 3337, 3336, // 3335 3334, 3333, 3332, 3331, 3330, 3329, 3328, 3327, 3326, 3325, @@ -1447,9 +1443,7 @@ static const int *included_patchsets[] = { // 2302 2301, 2300, 2299, // 2296-2298 - 2295, 2294, 2293, - // 2292 - 2291, + 2295, 2294, 2293, 2292, 2291, // 2290 2289, 2288, 2287, 2286, 2285, 2284, 2283, // 2282 @@ -1595,8 +1589,8 @@ static const int *included_patchsets[] = { // 1934 1933, 1932, // 1930-1931 - 1929, 1928, 1927, 1926, 1925, - // 1923-1924 + 1929, 1928, 1927, 1926, 1925, 1924, + // 1923 1922, 1921, 1920, 1919, // 1917-1918 1916, 1915, @@ -1608,9 +1602,7 @@ static const int *included_patchsets[] = { // 1891 1890, // 1888-1889 - 1887, 1886, 1885, - // 1884 - 1883, 1882, 1881, 1880, + 1887, 1886, 1885, 1884, 1883, 1882, 1881, 1880, // 1879 1878, 1877, // 1876 @@ -1621,7 +1613,9 @@ static const int *included_patchsets[] = { 1860, 1859, // 1858 1857, 1856, - // 1853-1855 + // 1855 + 1854, + // 1853 1852, // 1851 1850, @@ -1660,9 +1654,7 @@ static const int *included_patchsets[] = { // 1771 1770, // 1769 - 1768, 1767, 1766, 1765, 1764, 1763, 1762, 1761, 1760, 1759, 1758, 1757, 1756, - // 1755 - 1754, + 1768, 1767, 1766, 1765, 1764, 1763, 1762, 1761, 1760, 1759, 1758, 1757, 1756, 1755, 1754, // 1752-1753 1751, 1750, 1749, 1748, 1747, 1746, 1745, // 1744 @@ -1925,8 +1917,8 @@ static const int *included_patchsets[] = { 1104, 1103, 1102, 1101, 1100, 1099, 1098, // 1096-1097 1095, 1094, 1093, 1092, - // 1090-1091 - 1089, 1088, 1087, 1086, 1085, 1084, 1083, 1082, + // 1091 + 1090, 1089, 1088, 1087, 1086, 1085, 1084, 1083, 1082, // 1081 1080, 1079, 1078, // 1077 @@ -2488,10 +2480,8 @@ static const int *included_patchsets[] = { // 1379 1378, // 1377 - 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, + 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, // 1343-1344 1342, 1341, 1340, 1339, // 1338 @@ -2589,9 +2579,8 @@ static const int *included_patchsets[] = { // 1111-1112 1110, 1109, // 1108 - 1107, 1106, 1105, 1104, 1103, 1102, 1101, 1100, 1099, 1098, 1097, 1096, - // 1095 - 1094, 1093, 1092, 1091, 1090, 1089, 1088, + 1107, 1106, 1105, 1104, 1103, 1102, 1101, 1100, 1099, 1098, 1097, 1096, 1095, 1094, 1093, 1092, + 1091, 1090, 1089, 1088, // 1086-1087 1085, 1084, 1083, 1082, // 1080-1081 @@ -3735,11 +3724,19 @@ static const int *included_patchsets[] = { // 0 }, (const int[]) { // 902 + 645, + // 643-644 + 642, + // 641 640, 639, // 636-638 - 635, - // 624-634 - 623, + 635, 634, + // 631-633 + 630, 629, + // 627-628 + 626, + // 625 + 624, 623, // 622 621, 620, 619, 618, 617, 616, // 614-615