commit a3c56d1002ced628a69e098ca401fc93d8afe291
parent acc3554439e5a08be0707b1dea0c923c43a2091b
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 2 Jan 2026 00:27:35 -0500
docs: update version.c #37169
vim-patch:9.0.0993: display errors when adding or removing text property type
vim-patch:7a6d9454c README.md: remove the warp ad again
vim-patch:9.1.2032: Vim9: error when using class member in Lambda
vim-patch:9.1.2036: if_ruby: build error with ruby 4.0
Diffstat:
| M | src/nvim/version.c | | | 81 | ++++++++++++++++++++++++++++++++----------------------------------------------- |
1 file changed, 33 insertions(+), 48 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, 3775, 1541, 1476 };
+static const int num_patches[] = { 2331, 3783, 1547, 1486 };
static const int *included_patchsets[] = {
(const int[]) { // 801
@@ -415,8 +415,8 @@ static const int *included_patchsets[] = {
// 4994
4993,
// 4992
- 4991,
- // 4988-4990
+ 4991, 4990, 4989,
+ // 4988
4987, 4986, 4985, 4984,
// 4981-4983
4980, 4979, 4978, 4977, 4976, 4975, 4974, 4973, 4972,
@@ -431,9 +431,7 @@ static const int *included_patchsets[] = {
// 4955
4954, 4953,
// 4952
- 4951, 4950, 4949, 4948,
- // 4947
- 4946,
+ 4951, 4950, 4949, 4948, 4947, 4946,
// 4945
4944, 4943,
// 4942
@@ -1132,9 +1130,7 @@ static const int *included_patchsets[] = {
// 3169-3171
3168, 3167, 3166, 3165, 3164, 3163,
// 3161-3162
- 3160,
- // 3159
- 3158, 3157, 3156, 3155,
+ 3160, 3159, 3158, 3157, 3156, 3155,
// 3154
3153,
// 3152
@@ -1506,9 +1502,7 @@ static const int *included_patchsets[] = {
// 2208-2209
2207, 2206,
// 2204-2205
- 2203, 2202, 2201, 2200, 2199,
- // 2198
- 2197, 2196,
+ 2203, 2202, 2201, 2200, 2199, 2198, 2197, 2196,
// 2193-2195
2192, 2191, 2190, 2189,
// 2187-2188
@@ -1685,9 +1679,7 @@ static const int *included_patchsets[] = {
// 1755
1754,
// 1752-1753
- 1751,
- // 1750
- 1749, 1748, 1747, 1746, 1745,
+ 1751, 1750, 1749, 1748, 1747, 1746, 1745,
// 1744
1743, 1742, 1741, 1740, 1739, 1738, 1737, 1736, 1735, 1734, 1733,
// 1732
@@ -1726,8 +1718,8 @@ static const int *included_patchsets[] = {
1656, 1655, 1654, 1653, 1652, 1651,
// 1650
1649, 1648, 1647, 1646, 1645,
- // 1643-1644
- 1642,
+ // 1644
+ 1643, 1642,
// 1641
1640, 1639, 1638,
// 1636-1637
@@ -2020,9 +2012,7 @@ static const int *included_patchsets[] = {
// 847-848
846, 845, 844, 843, 842, 841, 840, 839, 838, 837, 836, 835,
// 834
- 833, 832, 831, 830, 829, 828,
- // 827
- 826, 825, 824, 823, 822, 821,
+ 833, 832, 831, 830, 829, 828, 827, 826, 825, 824, 823, 822, 821,
// 820
819, 818, 817, 816, 815, 814, 813, 812, 811, 810, 809, 808, 807, 806, 805, 804,
803, 802, 801, 800, 799, 798, 797, 796, 795, 794, 793, 792, 791, 790, 789, 788,
@@ -2937,10 +2927,8 @@ static const int *included_patchsets[] = {
// 472-474
471, 470, 469,
// 468
- 467,
- // 466
- 465,
- // 463-464
+ 467, 466, 465, 464,
+ // 463
462, 461,
// 459-460
458, 457, 456, 455, 454,
@@ -3028,13 +3016,9 @@ static const int *included_patchsets[] = {
// 253
252, 251, 250, 249, 248,
// 247
- 246, 245, 244,
- // 243
- 242, 241, 240, 239, 238, 237, 236,
+ 246, 245, 244, 243, 242, 241, 240, 239, 238, 237, 236,
// 235
- 234,
- // 233
- 232, 231, 230,
+ 234, 233, 232, 231, 230,
// 229
228, 227, 226,
// 225
@@ -3052,9 +3036,7 @@ static const int *included_patchsets[] = {
// 184-186
183, 182, 181, 180, 179, 178, 177, 176, 175, 174, 173, 172,
// 170-171
- 169,
- // 168
- 167, 166,
+ 169, 168, 167, 166,
// 162-165
161,
// 160
@@ -3065,7 +3047,9 @@ static const int *included_patchsets[] = {
152,
// 150-151
149,
- // 146-148
+ // 148
+ 147,
+ // 146
145,
// 144
143,
@@ -3116,15 +3100,17 @@ static const int *included_patchsets[] = {
// 0
},
(const int[]) { // 901
- 2030,
+ 2037,
+ // 2036
+ 2035, 2034,
+ // 2032-2033
+ 2031, 2030,
// 2029
2028, 2027, 2026,
// 2025
2024,
// 2022-2023
- 2021, 2020, 2019,
- // 2018
- 2017, 2016,
+ 2021, 2020, 2019, 2018, 2017, 2016,
// 2012-2015
2011, 2010, 2009, 2008, 2007,
// 2003-2006
@@ -3155,8 +3141,8 @@ static const int *included_patchsets[] = {
1939, 1938, 1937, 1936, 1935, 1934, 1933,
// 1932
1931, 1930, 1929, 1928,
- // 1925-1927
- 1924, 1923, 1922,
+ // 1926-1927
+ 1925, 1924, 1923, 1922,
// 1921
1920, 1919, 1918, 1917, 1916, 1915, 1914, 1913,
// 1911-1912
@@ -3255,7 +3241,9 @@ static const int *included_patchsets[] = {
1667,
// 1666
1665, 1664, 1663, 1662, 1661, 1660, 1659, 1658, 1657,
- // 1651-1656
+ // 1655-1656
+ 1654,
+ // 1651-1653
1650, 1649,
// 1648
1647,
@@ -3533,8 +3521,7 @@ static const int *included_patchsets[] = {
// 916
915, 914, 913, 912, 911, 910,
// 909
- 908, 907, 906, 905, 904, 903, 902, 901, 900, 899, 898, 897, 896, 895, 894,
- // 893
+ 908, 907, 906, 905, 904, 903, 902, 901, 900, 899, 898, 897, 896, 895, 894, 893,
892, 891, 890, 889, 888,
// 887
886,
@@ -3790,9 +3777,7 @@ static const int *included_patchsets[] = {
// 200-202
199, 198, 197, 196, 195, 194,
// 193
- 192, 191, 190,
- // 189
- 188, 187, 186,
+ 192, 191, 190, 189, 188, 187, 186,
// 185
184, 183, 182, 181, 180,
// 179
@@ -3850,8 +3835,8 @@ static const int *included_patchsets[] = {
// 26-30
25,
// 24
- 23, 22, 21,
- // 19-20
+ 23, 22, 21, 20,
+ // 19
18,
// 17
16, 15, 14, 13, 12, 11, 10, 9, 8, 7,
