diff --git a/src/nvim/version.c b/src/nvim/version.c index cd614a3d42..fbf8ff2ea3 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[] = { 2334, 3961, 1632, 1694, 631 }; +static const int num_patches[] = { 2349, 3967, 1635, 1697, 638 }; static const int *included_patchsets[] = { (const int[]) { // 801 @@ -84,16 +84,14 @@ static const int *included_patchsets[] = { 2323, 2322, 2321, 2320, 2319, 2318, 2317, 2316, 2315, 2314, 2313, 2312, 2311, 2310, 2309, 2308, 2307, 2306, 2305, 2304, 2303, 2302, 2301, 2300, 2299, 2298, 2297, 2296, 2295, // 2294 - 2293, - // 2292 - 2291, 2290, 2289, 2288, 2287, 2286, 2285, 2284, 2283, 2282, 2281, 2280, + 2293, 2292, 2291, 2290, 2289, 2288, 2287, 2286, 2285, 2284, 2283, 2282, 2281, 2280, // 2279 2278, 2277, 2276, 2275, 2274, // 2273 2272, 2271, 2270, 2269, 2268, 2267, 2266, 2265, 2264, 2263, 2262, 2261, 2260, 2259, 2258, 2257, 2256, 2255, 2254, 2253, 2252, - // 2250-2251 - 2249, 2248, 2247, 2246, 2245, 2244, 2243, 2242, + // 2251 + 2250, 2249, 2248, 2247, 2246, 2245, 2244, 2243, 2242, // 2241 2240, 2239, 2238, 2237, 2236, 2235, 2234, 2233, // 2232 @@ -105,8 +103,8 @@ static const int *included_patchsets[] = { // 2208 2207, 2206, 2205, 2204, 2203, 2202, 2201, 2200, 2199, 2198, 2197, 2196, // 2195 - 2194, - // 2192-2193 + 2194, 2193, + // 2192 2191, 2190, // 2189 2188, 2187, 2186, 2185, 2184, 2183, 2182, @@ -138,15 +136,13 @@ static const int *included_patchsets[] = { 2038, 2037, 2036, 2035, 2034, 2033, 2032, 2031, 2030, 2029, 2028, 2027, 2026, 2025, 2024, 2023, // 2022 2021, 2020, 2019, 2018, 2017, 2016, 2015, 2014, 2013, 2012, 2011, 2010, 2009, 2008, 2007, 2006, - 2005, 2004, 2003, 2002, 2001, 2000, - // 1999 - 1998, 1997, 1996, 1995, 1994, 1993, 1992, 1991, 1990, 1989, 1988, 1987, 1986, 1985, 1984, 1983, - 1982, 1981, 1980, 1979, 1978, 1977, 1976, 1975, 1974, 1973, 1972, 1971, 1970, + 2005, 2004, 2003, 2002, 2001, 2000, 1999, 1998, 1997, 1996, 1995, 1994, 1993, 1992, 1991, 1990, + 1989, 1988, 1987, 1986, 1985, 1984, 1983, 1982, 1981, 1980, 1979, 1978, 1977, 1976, 1975, 1974, + 1973, 1972, 1971, 1970, // 1969 1968, 1967, 1966, 1965, 1964, 1963, 1962, 1961, 1960, 1959, 1958, 1957, 1956, 1955, 1954, 1953, - 1952, 1951, 1950, 1949, 1948, 1947, 1946, 1945, - // 1944 - 1943, 1942, 1941, 1940, 1939, 1938, 1937, 1936, 1935, 1934, 1933, 1932, 1931, 1930, 1929, + 1952, 1951, 1950, 1949, 1948, 1947, 1946, 1945, 1944, 1943, 1942, 1941, 1940, 1939, 1938, 1937, + 1936, 1935, 1934, 1933, 1932, 1931, 1930, 1929, // 1928 1927, 1926, 1925, 1924, 1923, 1922, 1921, 1920, 1919, 1918, 1917, 1916, 1915, 1914, 1913, 1912, 1911, 1910, 1909, @@ -184,14 +180,11 @@ static const int *included_patchsets[] = { 1717, 1716, 1715, // 1713-1714 1712, 1711, 1710, 1709, 1708, 1707, 1706, 1705, 1704, 1703, 1702, 1701, 1700, 1699, 1698, 1697, - 1696, 1695, 1694, 1693, 1692, 1691, - // 1690 - 1689, 1688, 1687, 1686, 1685, 1684, 1683, 1682, 1681, 1680, 1679, 1678, 1677, 1676, 1675, 1674, - // 1673 - 1672, 1671, 1670, 1669, 1668, 1667, 1666, 1665, 1664, 1663, 1662, 1661, 1660, - // 1659 - 1658, 1657, 1656, 1655, 1654, 1653, 1652, 1651, 1650, 1649, 1648, 1647, 1646, 1645, 1644, 1643, - 1642, 1641, 1640, 1639, 1638, 1637, 1636, 1635, 1634, 1633, 1632, 1631, 1630, 1629, + 1696, 1695, 1694, 1693, 1692, 1691, 1690, 1689, 1688, 1687, 1686, 1685, 1684, 1683, 1682, 1681, + 1680, 1679, 1678, 1677, 1676, 1675, 1674, 1673, 1672, 1671, 1670, 1669, 1668, 1667, 1666, 1665, + 1664, 1663, 1662, 1661, 1660, 1659, 1658, 1657, 1656, 1655, 1654, 1653, 1652, 1651, 1650, 1649, + 1648, 1647, 1646, 1645, 1644, 1643, 1642, 1641, 1640, 1639, 1638, 1637, 1636, 1635, 1634, 1633, + 1632, 1631, 1630, 1629, // 1628 1627, // 1626 @@ -209,26 +202,17 @@ static const int *included_patchsets[] = { // 1580 1579, 1578, // 1577 - 1576, 1575, - // 1574 - 1573, 1572, 1571, 1570, 1569, 1568, 1567, 1566, 1565, 1564, 1563, 1562, + 1576, 1575, 1574, 1573, 1572, 1571, 1570, 1569, 1568, 1567, 1566, 1565, 1564, 1563, 1562, // 1561 - 1560, - // 1558-1559 - 1557, 1556, 1555, 1554, - // 1553 - 1552, 1551, 1550, 1549, - // 1548 - 1547, 1546, 1545, 1544, 1543, 1542, 1541, 1540, 1539, - // 1537-1538 - 1536, 1535, 1534, 1533, 1532, 1531, 1530, 1529, 1528, 1527, 1526, + 1560, 1559, + // 1558 + 1557, 1556, 1555, 1554, 1553, 1552, 1551, 1550, 1549, 1548, 1547, 1546, 1545, 1544, 1543, 1542, + 1541, 1540, 1539, 1538, 1537, 1536, 1535, 1534, 1533, 1532, 1531, 1530, 1529, 1528, 1527, 1526, // 1525 - 1524, - // 1523 - 1522, 1521, 1520, 1519, 1518, 1517, 1516, 1515, 1514, 1513, 1512, 1511, 1510, 1509, 1508, 1507, - 1506, 1505, 1504, 1503, 1502, 1501, 1500, 1499, 1498, 1497, 1496, 1495, 1494, 1493, 1492, 1491, - 1490, 1489, 1488, 1487, 1486, 1485, 1484, 1483, 1482, 1481, 1480, 1479, 1478, 1477, 1476, 1475, - 1474, + 1524, 1523, 1522, 1521, 1520, 1519, 1518, 1517, 1516, 1515, 1514, 1513, 1512, 1511, 1510, 1509, + 1508, 1507, 1506, 1505, 1504, 1503, 1502, 1501, 1500, 1499, 1498, 1497, 1496, 1495, 1494, 1493, + 1492, 1491, 1490, 1489, 1488, 1487, 1486, 1485, 1484, 1483, 1482, 1481, 1480, 1479, 1478, 1477, + 1476, 1475, 1474, // 1473 1472, 1471, 1470, 1469, 1468, 1467, 1466, 1465, 1464, 1463, 1462, 1461, 1460, 1459, 1458, 1457, 1456, 1455, 1454, 1453, 1452, 1451, 1450, 1449, 1448, 1447, 1446, 1445, 1444, 1443, 1442, 1441, @@ -1165,13 +1149,11 @@ static const int *included_patchsets[] = { // 2968 2967, 2966, // 2962-2965 - 2961, 2960, - // 2959 - 2958, 2957, + 2961, 2960, 2959, 2958, 2957, // 2955-2956 2954, 2953, 2952, - // 2950-2951 - 2949, 2948, 2947, 2946, 2945, + // 2951 + 2950, 2949, 2948, 2947, 2946, 2945, // 2944 2943, // 2942 @@ -1414,8 +1396,8 @@ static const int *included_patchsets[] = { 2304, 2303, // 2302 2301, 2300, 2299, - // 2296-2298 - 2295, 2294, 2293, 2292, 2291, + // 2297-2298 + 2296, 2295, 2294, 2293, 2292, 2291, // 2290 2289, 2288, 2287, 2286, 2285, 2284, 2283, // 2282 @@ -1485,9 +1467,8 @@ static const int *included_patchsets[] = { // 2122 2121, // 2120 - 2119, 2118, 2117, 2116, 2115, 2114, 2113, 2112, 2111, 2110, 2109, 2108, 2107, 2106, - // 2105 - 2104, 2103, 2102, + 2119, 2118, 2117, 2116, 2115, 2114, 2113, 2112, 2111, 2110, 2109, 2108, 2107, 2106, 2105, 2104, + 2103, 2102, // 2101 2100, 2099, 2098, // 2097 @@ -2005,9 +1986,8 @@ static const int *included_patchsets[] = { 318, 317, 316, 315, 314, 313, 312, 311, 310, 309, 308, 307, 306, 305, 304, 303, 302, 301, 300, // 298-299 - 297, 296, 295, 294, 293, 292, 291, 290, 289, 288, 287, - // 286 - 285, 284, 283, 282, 281, 280, + 297, 296, 295, 294, 293, 292, 291, 290, 289, 288, 287, 286, 285, 284, 283, 282, + 281, 280, // 279 278, 277, 276, 275, 274, 273, 272, 271, 270, 269, 268, 267, 266, 265, 264, 263, 262, 261, 260, 259, @@ -2016,9 +1996,8 @@ static const int *included_patchsets[] = { // 256 255, 254, 253, 252, // 251 - 250, 249, 248, 247, 246, 245, 244, 243, 242, 241, 240, 239, - // 238 - 237, 236, 235, 234, 233, 232, 231, 230, 229, 228, 227, 226, 225, 224, 223, + 250, 249, 248, 247, 246, 245, 244, 243, 242, 241, 240, 239, 238, 237, 236, 235, + 234, 233, 232, 231, 230, 229, 228, 227, 226, 225, 224, 223, // 222 221, 220, 219, 218, 217, 216, 215, 214, 213, 212, 211, 210, // 209 @@ -2107,9 +2086,7 @@ static const int *included_patchsets[] = { // 2099 2098, 2097, // 2096 - 2095, 2094, 2093, 2092, 2091, 2090, - // 2089 - 2088, 2087, + 2095, 2094, 2093, 2092, 2091, 2090, 2089, 2088, 2087, // 2086 2085, 2084, 2083, 2082, 2081, 2080, 2079, // 2078 @@ -2464,9 +2441,7 @@ static const int *included_patchsets[] = { // 1019 1018, 1017, 1016, 1015, 1014, 1013, 1012, 1011, 1010, 1009, 1008, 1007, 1006, 1005, 1004, 1003, // 1001-1002 - 1000, - // 999 - 998, 997, 996, + 1000, 999, 998, 997, 996, // 995 994, 993, 992, 991, 990, 989, // 988 @@ -2548,7 +2523,9 @@ static const int *included_patchsets[] = { 811, 810, // 809 808, 807, 806, 805, 804, 803, - // 799-802 + // 801-802 + 800, + // 799 798, // 796-797 795, @@ -2908,8 +2885,8 @@ static const int *included_patchsets[] = { 1998, 1997, 1996, // 1992-1995 1991, 1990, 1989, 1988, 1987, - // 1985-1986 - 1984, 1983, 1982, 1981, 1980, 1979, 1978, 1977, + // 1986 + 1985, 1984, 1983, 1982, 1981, 1980, 1979, 1978, 1977, // 1975-1976 1974, // 1972-1973 @@ -3253,9 +3230,7 @@ static const int *included_patchsets[] = { // 966 965, 964, 963, 962, 961, 960, 959, 958, 957, 956, 955, 954, 953, // 952 - 951, 950, - // 949 - 948, 947, 946, 945, 944, 943, 942, 941, 940, 939, 938, + 951, 950, 949, 948, 947, 946, 945, 944, 943, 942, 941, 940, 939, 938, // 937 936, 935, 934, 933, // 931-932 @@ -3457,8 +3432,8 @@ static const int *included_patchsets[] = { // 284 283, // 282 - 281, 280, 279, 278, 277, 276, 275, 274, 273, 272, - // 270-271 + 281, 280, 279, 278, 277, 276, 275, 274, 273, 272, 271, + // 270 269, 268, 267, 266, 265, // 263-264 262, @@ -3538,13 +3513,23 @@ static const int *included_patchsets[] = { // 0 }, (const int[]) { // 902 + 954, 953, + // 951-952 + 950, + // 946-949 + 945, + // 944 + 943, + // 941-942 + 940, + // 939 938, 937, // 936 935, // 934 933, 932, - // 928-931 - 927, 926, 925, 924, 923, 922, + // 929-931 + 928, 927, 926, 925, 924, 923, 922, // 921 920, 919, 918, // 916-917