commit 5a1a92cc7a3d3a338fe5f610190910e220f074f6
parent 29494f042c28b1de1933b21255837b765782cf04
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 25 Dec 2025 03:38:50 -0500
docs: update version.c (#37059)
vim-patch:8.2.3793: using "g:Func" as a funcref does not work in script context
vim-patch:6ec7d40b7 runtime(getscript): GLVS plugin fails with wget.exe with PowerShell
vim-patch:2387c49f6 translation(zh_CN): Add license disclaimer
vim-patch:9.1.2002: Vim9: heap-use-after-free when when accessing protect class member
vim-patch:9.1.2010: Missing out-of-memory checks in vim9class.c
vim-patch:9.1.2011: crash when unreferencing gtk icon theme
Applicable patches became N/A due to previous ports (a4ea6027) and vim9:
vim-patch:8.2.0335: no completion for :disassemble
vim-patch:8.2.2033: Vim9: :def without argument gives compilation error
vim-patch:8.2.4288: preprocessor indents are inconsistent
vim-patch:8.2.4324: Vim9: script-local function name can start with "_"
vim-patch:8.2.4360: Vim9: allowing use of "s:" leads to inconsistencies
vim-patch:8.2.4957: text properties in a wrong position after a block change
vim-patch:9.0.0166: when using text properties line text length computed twice
vim-patch:9.0.0219: cannot make a funcref with "s:func" in a def function
vim-patch:9.0.1357: using null_object results in an internal error
vim-patch:9.0.1484: Coverity warns for using invalid array index
vim-patch:9.1.0274: MS-Windows: a few compiler warnings
vim-patch:9.1.1339: missing out-of-memory checks for enc_to_utf16()/utf16_to_enc()
vim-patch:9.1.1434: MS-Windows: missing out-of-memory checks in os_win32.c
Diffstat:
| M | src/nvim/version.c | | | 144 | ++++++++++++++++++++++++++++++++++++------------------------------------------- |
1 file changed, 65 insertions(+), 79 deletions(-)
diff --git a/src/nvim/version.c b/src/nvim/version.c
@@ -58,7 +58,7 @@ char *version_cflags = "Compilation: " NVIM_VERSION_CFLAGS;
// clang-format off
static const int vim_versions[] = { 801, 802, 900, 901 };
-static const int num_patches[] = { 2331, 3742, 1532, 1446 };
+static const int num_patches[] = { 2331, 3766, 1536, 1458 };
static const int *included_patchsets[] = {
(const int[]) { // 801
@@ -491,8 +491,8 @@ static const int *included_patchsets[] = {
// 4798
4797, 4796, 4795, 4794, 4793, 4792, 4791, 4790,
// 4788-4789
- 4787, 4786,
- // 4784-4785
+ 4787, 4786, 4785,
+ // 4784
4783,
// 4782
4781,
@@ -581,9 +581,7 @@ static const int *included_patchsets[] = {
// 4567
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,
+ 4550, 4549, 4548, 4547, 4546, 4545, 4544, 4543, 4542, 4541,
// 4539-4540
4538, 4537,
// 4534-4536
@@ -947,8 +945,8 @@ static const int *included_patchsets[] = {
// 3668
3667,
// 3666
- 3665, 3664, 3663, 3662, 3661, 3660, 3659, 3658,
- // 3656-3657
+ 3665, 3664, 3663, 3662, 3661, 3660, 3659, 3658, 3657,
+ // 3656
3655, 3654, 3653, 3652,
// 3649-3651
3648, 3647,
@@ -1024,9 +1022,7 @@ static const int *included_patchsets[] = {
// 3444-3445
3443, 3442, 3441, 3440, 3439, 3438, 3437,
// 3436
- 3435, 3434, 3433, 3432,
- // 3431
- 3430,
+ 3435, 3434, 3433, 3432, 3431, 3430,
// 3429
3428,
// 3427
@@ -1044,12 +1040,10 @@ static const int *included_patchsets[] = {
// 3401
3400, 3399, 3398, 3397,
// 3396
- 3395, 3394, 3393, 3392, 3391, 3390, 3389, 3388, 3387, 3386, 3385, 3384,
- // 3383
- 3382, 3381,
+ 3395, 3394, 3393, 3392, 3391, 3390, 3389, 3388, 3387, 3386, 3385, 3384, 3383, 3382, 3381,
// 3380
- 3379, 3378,
- // 3376-3377
+ 3379, 3378, 3377,
+ // 3376
3375, 3374, 3373, 3372,
// 3370-3371
3369, 3368,
@@ -1110,8 +1104,8 @@ static const int *included_patchsets[] = {
// 3232
3231, 3230,
// 3228-3229
- 3227, 3226, 3225,
- // 3223-3224
+ 3227, 3226, 3225, 3224,
+ // 3223
3222, 3221, 3220, 3219, 3218,
// 3217
3216,
@@ -1161,8 +1155,8 @@ static const int *included_patchsets[] = {
3141, 3140, 3139, 3138,
// 3137
3136, 3135, 3134,
- // 3132-3133
- 3131, 3130,
+ // 3133
+ 3132, 3131, 3130,
// 3126-3129
3125,
// 3123-3124
@@ -1210,8 +1204,8 @@ static const int *included_patchsets[] = {
// 3004-3005
3003, 3002, 3001, 3000, 2999,
// 2998
- 2997, 2996, 2995, 2994, 2993,
- // 2991-2992
+ 2997, 2996, 2995, 2994, 2993, 2992,
+ // 2991
2990, 2989,
// 2988
2987, 2986, 2985, 2984,
@@ -1328,8 +1322,8 @@ static const int *included_patchsets[] = {
// 2679-2681
2678,
// 2675-2677
- 2674,
- // 2672-2673
+ 2674, 2673,
+ // 2672
2671, 2670,
// 2668-2669
2667,
@@ -1476,8 +1470,8 @@ static const int *included_patchsets[] = {
// 2305-2306
2304, 2303,
// 2302
- 2301, 2300,
- // 2296-2299
+ 2301, 2300, 2299,
+ // 2296-2298
2295, 2294, 2293,
// 2290-2292
2289, 2288, 2287, 2286, 2285, 2284, 2283,
@@ -1643,9 +1637,7 @@ static const int *included_patchsets[] = {
// 1888-1889
1887, 1886, 1885,
// 1884
- 1883,
- // 1882
- 1881, 1880,
+ 1883, 1882, 1881, 1880,
// 1879
1878, 1877,
// 1876
@@ -1664,7 +1656,9 @@ static const int *included_patchsets[] = {
1848, 1847,
// 1845-1846
1844, 1843, 1842, 1841,
- // 1838-1840
+ // 1840
+ 1839,
+ // 1838
1837,
// 1836
1835, 1834, 1833,
@@ -1686,17 +1680,15 @@ static const int *included_patchsets[] = {
1806, 1805, 1804, 1803, 1802, 1801, 1800, 1799, 1798, 1797,
// 1795-1796
1794, 1793, 1792, 1791, 1790,
- // 1788-1789
- 1787, 1786, 1785, 1784, 1783,
+ // 1789
+ 1788, 1787, 1786, 1785, 1784, 1783,
// 1782
1781, 1780, 1779, 1778, 1777, 1776, 1775, 1774, 1773, 1772,
// 1771
1770,
// 1769
- 1768, 1767,
- // 1766
- 1765, 1764, 1763, 1762, 1761, 1760, 1759, 1758, 1757,
- // 1755-1756
+ 1768, 1767, 1766, 1765, 1764, 1763, 1762, 1761, 1760, 1759, 1758, 1757, 1756,
+ // 1755
1754,
// 1752-1753
1751,
@@ -1727,15 +1719,11 @@ static const int *included_patchsets[] = {
// 1685
1684,
// 1682-1683
- 1681, 1680,
- // 1679
- 1678, 1677, 1676, 1675, 1674, 1673, 1672,
+ 1681, 1680, 1679, 1678, 1677, 1676, 1675, 1674, 1673, 1672,
// 1671
1670,
// 1669
- 1668,
- // 1667
- 1666, 1665,
+ 1668, 1667, 1666, 1665,
// 1664
1663,
// 1662
@@ -1751,9 +1739,7 @@ static const int *included_patchsets[] = {
// 1636-1637
1635, 1634, 1633, 1632, 1631, 1630, 1629,
// 1627-1628
- 1626, 1625, 1624,
- // 1623
- 1622, 1621,
+ 1626, 1625, 1624, 1623, 1622, 1621,
// 1619-1620
1618,
// 1614-1617
@@ -1788,8 +1774,8 @@ static const int *included_patchsets[] = {
1540,
// 1538-1539
1537, 1536, 1535,
- // 1532-1534
- 1531, 1530, 1529, 1528,
+ // 1533-1534
+ 1532, 1531, 1530, 1529, 1528,
// 1527
1526,
// 1525
@@ -1851,9 +1837,7 @@ static const int *included_patchsets[] = {
// 1403
1402, 1401, 1400,
// 1399
- 1398,
- // 1397
- 1396, 1395, 1394, 1393,
+ 1398, 1397, 1396, 1395, 1394, 1393,
// 1392
1391, 1390, 1389, 1388,
// 1387
@@ -2028,9 +2012,7 @@ static const int *included_patchsets[] = {
// 897-898
896, 895, 894, 893, 892, 891, 890, 889,
// 888
- 887, 886, 885, 884, 883, 882,
- // 881
- 880, 879,
+ 887, 886, 885, 884, 883, 882, 881, 880, 879,
// 878
877, 876,
// 875
@@ -2161,10 +2143,8 @@ static const int *included_patchsets[] = {
// 425
424, 423, 422,
// 421
- 420,
- // 419
- 418, 417, 416, 415, 414, 413, 412, 411, 410, 409, 408, 407, 406, 405, 404, 403,
- 402, 401, 400,
+ 420, 419, 418, 417, 416, 415, 414, 413, 412, 411, 410, 409, 408, 407, 406, 405,
+ 404, 403, 402, 401, 400,
// 399
398, 397, 396, 395, 394, 393, 392, 391, 390, 389, 388, 387,
// 386
@@ -2221,8 +2201,8 @@ static const int *included_patchsets[] = {
// 238
237, 236, 235, 234, 233,
// 232
- 231, 230, 229, 228, 227, 226, 225, 224,
- // 222-223
+ 231, 230, 229, 228, 227, 226, 225, 224, 223,
+ // 222
221, 220, 219, 218, 217, 216, 215, 214, 213, 212, 211, 210,
// 209
208,
@@ -2405,8 +2385,8 @@ static const int *included_patchsets[] = {
// 1906
1905, 1904, 1903, 1902,
// 1901
- 1900,
- // 1898-1899
+ 1900, 1899,
+ // 1898
1897, 1896, 1895, 1894, 1893, 1892, 1891,
// 1890
1889, 1888, 1887,
@@ -2485,9 +2465,7 @@ static const int *included_patchsets[] = {
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,
+ 1673, 1672, 1671, 1670, 1669, 1668, 1667, 1666, 1665, 1664, 1663, 1662, 1661,
// 1660
1659, 1658, 1657, 1656, 1655, 1654, 1653, 1652, 1651,
// 1650
@@ -2674,9 +2652,7 @@ static const int *included_patchsets[] = {
// 1148-1152
1147,
// 1146
- 1145,
- // 1144
- 1143, 1142, 1141,
+ 1145, 1144, 1143, 1142, 1141,
// 1140
1139, 1138, 1137, 1136, 1135,
// 1133-1134
@@ -3096,7 +3072,9 @@ static const int *included_patchsets[] = {
161,
// 160
159,
- // 153-158
+ // 155-158
+ 154,
+ // 153
152,
// 150-151
149,
@@ -3149,16 +3127,22 @@ static const int *included_patchsets[] = {
// 0
},
(const int[]) { // 901
- 1998,
- // 1992-1997
- 1991,
- // 1988-1990
+ 2017, 2016,
+ // 2010-2015
+ 2009, 2008, 2007,
+ // 2002-2006
+ 2001,
+ // 1999-2000
+ 1998, 1997,
+ // 1992-1996
+ 1991, 1990,
+ // 1988-1989
1987,
// 1984-1986
1983,
// 1982
- 1981, 1980, 1979, 1978,
- // 1975-1977
+ 1981, 1980, 1979, 1978, 1977,
+ // 1975-1976
1974,
// 1972-1973
1971, 1970, 1969,
@@ -3337,8 +3321,8 @@ static const int *included_patchsets[] = {
1498, 1497,
// 1494-1496
1493,
- // 1491-1492
- 1490,
+ // 1492
+ 1491, 1490,
// 1489
1488,
// 1483-1487
@@ -3419,8 +3403,8 @@ static const int *included_patchsets[] = {
1284, 1283,
// 1280-1282
1279, 1278, 1277, 1276, 1275,
- // 1273-1274
- 1272, 1271, 1270, 1269, 1268,
+ // 1274
+ 1273, 1272, 1271, 1270, 1269, 1268,
// 1267
1266, 1265, 1264, 1263, 1262, 1261, 1260,
// 1259
@@ -3535,7 +3519,9 @@ static const int *included_patchsets[] = {
984, 983, 982, 981,
// 979-980
978, 977, 976,
- // 973-975
+ // 975
+ 974,
+ // 973
972, 971, 970,
// 969
968, 967,
