commit 69167006a4d3e5cfe77b9bc6e58be5dc4030fa39
parent 81e2d2ea53479da1b7b147ab17a72d25babf6b8e
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 20 Dec 2025 21:22:30 -0500
docs: update version.c #36917
vim-patch:3a113e04d nsis: add Chinese translation to nsis installer
vim-patch:e1ea10a0a CI: Bump actions/cache from 4 to 5
vim-patch:9.0.1144: reading beyond text
vim-patch:9.0.1669: Crash syncing swapfile in new buffer when using sodium crypt
vim-patch:9.1.1977: MS-Windows: missing dependency on optiondefs.h in Make_cyg_ming.mak
vim-patch:9.1.1990: tests: Test_term_gettty() fails when using conpty on Windows
vim-patch:9.1.1997: Missing out-of-memory check in vim9class.c
vim-patch:9.1.1273: Coverity warns about using uninitialized value
vim-patch:8.2.0419: various memory leaks in Vim9 script code
vim-patch:8.2.0881: compiler warning for argument type
vim-patch:8.2.1532: compiler warning for conversion of size_t to long
vim-patch:8.2.1839: Vim9: memory leaks reported in assign test
vim-patch:8.2.2299: Vim9: invalid memory access making error message flaky
vim-patch:8.2.2673: Vim9: script-local funcref can have lower case name
vim-patch:8.2.3132: compiler warns for size_t to colnr_T conversion
vim-patch:8.2.3224: cannot call script-local function after :vim9cmd
Diffstat:
| M | src/nvim/version.c | | | 103 | ++++++++++++++++++++++++++++++++++++------------------------------------------- |
1 file changed, 47 insertions(+), 56 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, 3720, 1529, 1432 };
+static const int num_patches[] = { 2331, 3742, 1532, 1446 };
static const int *included_patchsets[] = {
(const int[]) { // 801
@@ -342,8 +342,8 @@ static const int *included_patchsets[] = {
(const int[]) { // 802
5171, 5170,
// 5169
- 5168, 5167, 5166, 5165, 5164, 5163, 5162,
- // 5160-5161
+ 5168, 5167, 5166, 5165, 5164, 5163, 5162, 5161,
+ // 5160
5159, 5158, 5157,
// 5156
5155, 5154, 5153, 5152, 5151, 5150, 5149, 5148,
@@ -369,8 +369,8 @@ static const int *included_patchsets[] = {
5110, 5109, 5108, 5107, 5106, 5105, 5104, 5103, 5102, 5101,
// 5100
5099, 5098, 5097, 5096, 5095,
- // 5092-5094
- 5091, 5090,
+ // 5093-5094
+ 5092, 5091, 5090,
// 5089
5088, 5087, 5086, 5085,
// 5084
@@ -501,9 +501,7 @@ static const int *included_patchsets[] = {
// 4777
4776,
// 4774-4775
- 4773, 4772, 4771, 4770, 4769, 4768, 4767, 4766, 4765, 4764,
- // 4763
- 4762,
+ 4773, 4772, 4771, 4770, 4769, 4768, 4767, 4766, 4765, 4764, 4763, 4762,
// 4761
4760, 4759,
// 4757-4758
@@ -551,9 +549,9 @@ static const int *included_patchsets[] = {
// 4648
4647, 4646, 4645, 4644, 4643,
// 4642
- 4641, 4640, 4639, 4638,
- // 4633-4637
- 4632, 4631, 4630, 4629, 4628, 4627, 4626, 4625, 4624, 4623,
+ 4641, 4640, 4639, 4638, 4637, 4636,
+ // 4634-4635
+ 4633, 4632, 4631, 4630, 4629, 4628, 4627, 4626, 4625, 4624, 4623,
// 4622
4621, 4620,
// 4619
@@ -590,8 +588,8 @@ static const int *included_patchsets[] = {
4538, 4537,
// 4534-4536
4533, 4532, 4531,
- // 4528-4530
- 4527,
+ // 4530
+ 4529, 4528, 4527,
// 4525-4526
4524, 4523,
// 4522
@@ -615,9 +613,7 @@ static const int *included_patchsets[] = {
// 4487
4486, 4485, 4484, 4483, 4482, 4481,
// 4480
- 4479, 4478, 4477, 4476, 4475,
- // 4474
- 4473,
+ 4479, 4478, 4477, 4476, 4475, 4474, 4473,
// 4472
4471, 4470, 4469, 4468, 4467, 4466, 4465, 4464, 4463, 4462, 4461,
// 4457-4460
@@ -671,8 +667,8 @@ static const int *included_patchsets[] = {
4323,
// 4321-4322
4320, 4319, 4318,
- // 4316-4317
- 4315, 4314, 4313, 4312, 4311, 4310, 4309,
+ // 4317
+ 4316, 4315, 4314, 4313, 4312, 4311, 4310, 4309,
// 4308
4307, 4306, 4305,
// 4304
@@ -915,9 +911,7 @@ static const int *included_patchsets[] = {
3788, 3787, 3786, 3785, 3784, 3783, 3782, 3781, 3780, 3779, 3778, 3777, 3776, 3775, 3774, 3773,
3772,
// 3771
- 3770, 3769, 3768,
- // 3766-3767
- 3765,
+ 3770, 3769, 3768, 3767, 3766, 3765,
// 3763-3764
3762,
// 3760-3761
@@ -953,9 +947,7 @@ static const int *included_patchsets[] = {
// 3668
3667,
// 3666
- 3665, 3664, 3663,
- // 3662
- 3661, 3660, 3659, 3658,
+ 3665, 3664, 3663, 3662, 3661, 3660, 3659, 3658,
// 3656-3657
3655, 3654, 3653, 3652,
// 3649-3651
@@ -1281,9 +1273,8 @@ static const int *included_patchsets[] = {
// 2844
2843,
// 2842
- 2841, 2840, 2839, 2838, 2837, 2836, 2835,
- // 2834
- 2833, 2832, 2831, 2830, 2829, 2828, 2827, 2826, 2825,
+ 2841, 2840, 2839, 2838, 2837, 2836, 2835, 2834, 2833, 2832, 2831, 2830, 2829, 2828, 2827, 2826,
+ 2825,
// 2824
2823,
// 2821-2822
@@ -1385,9 +1376,7 @@ static const int *included_patchsets[] = {
// 2576
2575, 2574,
// 2573
- 2572,
- // 2571
- 2570,
+ 2572, 2571, 2570,
// 2565-2569
2564,
// 2562-2563
@@ -1442,13 +1431,9 @@ static const int *included_patchsets[] = {
// 2428
2427, 2426, 2425, 2424, 2423, 2422, 2421, 2420, 2419, 2418,
// 2415-2417
- 2414, 2413, 2412,
- // 2411
- 2410,
- // 2409
- 2408, 2407, 2406,
- // 2403-2405
- 2402, 2401,
+ 2414, 2413, 2412, 2411, 2410, 2409, 2408, 2407, 2406,
+ // 2405
+ 2404, 2403, 2402, 2401,
// 2400
2399,
// 2393-2398
@@ -1637,11 +1622,7 @@ static const int *included_patchsets[] = {
// 1948
1947, 1946, 1945, 1944,
// 1943
- 1942,
- // 1941
- 1940,
- // 1939
- 1938,
+ 1942, 1941, 1940, 1939, 1938,
// 1937
1936, 1935,
// 1934
@@ -1773,7 +1754,9 @@ static const int *included_patchsets[] = {
1626, 1625, 1624,
// 1623
1622, 1621,
- // 1614-1620
+ // 1619-1620
+ 1618,
+ // 1614-1617
1613, 1612,
// 1610-1611
1609, 1608, 1607,
@@ -2480,9 +2463,7 @@ static const int *included_patchsets[] = {
// 1769-1770
1768, 1767, 1766, 1765, 1764, 1763, 1762, 1761,
// 1760
- 1759,
- // 1758
- 1757,
+ 1759, 1758, 1757,
// 1756
1755, 1754, 1753, 1752, 1751, 1750,
// 1749
@@ -3150,9 +3131,7 @@ static const int *included_patchsets[] = {
// 72
71, 70,
// 69
- 68, 67, 66, 65, 64,
- // 63
- 62, 61, 60, 59,
+ 68, 67, 66, 65, 64, 63, 62, 61, 60, 59,
// 58
57,
// 56
@@ -3162,9 +3141,7 @@ static const int *included_patchsets[] = {
// 32
31, 30, 29,
// 27-28
- 26,
- // 25
- 24, 23, 22, 21, 20, 19, 18, 17, 16, 15,
+ 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15,
// 13-14
12, 11, 10, 9, 8,
// 7
@@ -3172,6 +3149,20 @@ static const int *included_patchsets[] = {
// 0
},
(const int[]) { // 901
+ 1998,
+ // 1992-1997
+ 1991,
+ // 1988-1990
+ 1987,
+ // 1984-1986
+ 1983,
+ // 1982
+ 1981, 1980, 1979, 1978,
+ // 1975-1977
+ 1974,
+ // 1972-1973
+ 1971, 1970, 1969,
+ // 1966-1968
1965, 1964, 1963, 1962, 1961, 1960,
// 1959
1958, 1957,
@@ -3211,8 +3202,8 @@ static const int *included_patchsets[] = {
1855, 1854, 1853, 1852, 1851, 1850, 1849,
// 1847-1848
1846, 1845, 1844, 1843, 1842,
- // 1840-1841
- 1839, 1838,
+ // 1841
+ 1840, 1839, 1838,
// 1837
1836,
// 1835
@@ -3522,8 +3513,8 @@ static const int *included_patchsets[] = {
1038,
// 1037
1036,
- // 1034-1035
- 1033, 1032,
+ // 1035
+ 1034, 1033, 1032,
// 1031
1030,
// 1029
