diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2024-07-18 07:47:20 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-17 23:47:20 +0000 |
| commit | 185b22720de9156393ddc22c2c59dc3eb46b8d97 (patch) | |
| tree | 94edee546e7f2c494f9cd7031b75e7830701b37b | |
| parent | ca6710c83e6641e00660084a90df79a3027d292a (diff) | |
| download | rneovim-185b22720de9156393ddc22c2c59dc3eb46b8d97.tar.gz rneovim-185b22720de9156393ddc22c2c59dc3eb46b8d97.tar.bz2 rneovim-185b22720de9156393ddc22c2c59dc3eb46b8d97.zip | |
vim-patch:9.0.0003: functions are global while they could be local (#29777)
Problem: Functions are global while they could be local.
Solution: Add "static". Add a few tests. (Yegappan Lakshmanan,
closes vim/vim#10612)
https://github.com/vim/vim/commit/ee47eaceaa148e07b566ff420f9a3c2edde2fa34
Omit script_name_after_autoload(), untrans_function_name(): Vim9 script
only.
Co-authored-by: Yegappan Lakshmanan <yegappan@yahoo.com>
| -rw-r--r-- | src/nvim/eval/vars.c | 2 | ||||
| -rw-r--r-- | src/nvim/highlight_group.c | 2 | ||||
| -rw-r--r-- | test/old/testdir/test_fold.vim | 2 | ||||
| -rw-r--r-- | test/old/testdir/test_quickfix.vim | 7 |
4 files changed, 9 insertions, 4 deletions
diff --git a/src/nvim/eval/vars.c b/src/nvim/eval/vars.c index 7b93a291c4..2dca942bb5 100644 --- a/src/nvim/eval/vars.c +++ b/src/nvim/eval/vars.c @@ -105,7 +105,7 @@ char *eval_one_expr_in_str(char *p, garray_T *gap, bool evaluate) /// string in allocated memory. "{{" is reduced to "{" and "}}" to "}". /// Used for a heredoc assignment. /// Returns NULL for an error. -char *eval_all_expr_in_str(char *str) +static char *eval_all_expr_in_str(char *str) { garray_T ga; ga_init(&ga, 1, 80); diff --git a/src/nvim/highlight_group.c b/src/nvim/highlight_group.c index 227df2fbdc..d4729474d8 100644 --- a/src/nvim/highlight_group.c +++ b/src/nvim/highlight_group.c @@ -853,7 +853,7 @@ static int color_numbers_8[28] = { 0, 4, 2, 6, // color_names[]. // "boldp" will be set to kTrue or kFalse for a foreground color when using 8 // colors, otherwise it will be unchanged. -int lookup_color(const int idx, const bool foreground, TriState *const boldp) +static int lookup_color(const int idx, const bool foreground, TriState *const boldp) { int color = color_numbers_16[idx]; diff --git a/test/old/testdir/test_fold.vim b/test/old/testdir/test_fold.vim index 829cfc674d..aca497f28d 100644 --- a/test/old/testdir/test_fold.vim +++ b/test/old/testdir/test_fold.vim @@ -1486,6 +1486,8 @@ func Test_fold_split() call assert_equal([0, 1, 1, 2, 2], range(1, 5)->map('foldlevel(v:val)')) call append(2, 'line 2.5') call assert_equal([0, 1, 0, 1, 2, 2], range(1, 6)->map('foldlevel(v:val)')) + 3d + call assert_equal([0, 1, 1, 2, 2], range(1, 5)->map('foldlevel(v:val)')) bw! endfunc diff --git a/test/old/testdir/test_quickfix.vim b/test/old/testdir/test_quickfix.vim index bba68bcdc7..7eb2945198 100644 --- a/test/old/testdir/test_quickfix.vim +++ b/test/old/testdir/test_quickfix.vim @@ -3208,8 +3208,11 @@ func Test_bufoverflow() cgetexpr ['Compiler: ' . repeat('a', 1015), 'File1:10:Hello World'] set efm=%DEntering\ directory\ %f,%f:%l:%m - cgetexpr ['Entering directory ' . repeat('a', 1006), - \ 'File1:10:Hello World'] + let lines =<< trim eval END + Entering directory $"{repeat('a', 1006)}" + File1:10:Hello World + END + cgetexpr lines set efm&vim endfunc |