Mercurial > vim
changeset 36451:5006b62d5072 draft v9.1.0832
patch 9.1.0832: :set doesn't work for 'cot' and 'bkc' after :setlocal
Commit: https://github.com/vim/vim/commit/46dcd84d242db6b053cb5b777c896cede9ad9b27
Author: zeertzjq <zeertzjq@outlook.com>
Date: Sun Nov 3 09:10:50 2024 +0100
patch 9.1.0832: :set doesn't work for 'cot' and 'bkc' after :setlocal
Problem: :set doesn't work for 'cot' and 'bkc' after :setlocal.
Solution: clear the local flags when using :set (zeertzjq).
closes: #15981
Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sun, 03 Nov 2024 09:15:09 +0100 |
| parents | 56e749acdce8 |
| children | a0d73d6d0f6f |
| files | src/optionstr.c src/testdir/test_ins_complete.vim src/version.c |
| diffstat | 3 files changed, 48 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/optionstr.c +++ b/src/optionstr.c @@ -1146,6 +1146,9 @@ did_set_backupcopy(optset_T *args) bkc = curbuf->b_p_bkc; flags = &curbuf->b_bkc_flags; } + else if (!(args->os_flags & OPT_GLOBAL)) + // When using :set, clear the local flags. + curbuf->b_bkc_flags = 0; if ((args->os_flags & OPT_LOCAL) && *bkc == NUL) // make the local value empty: use the global value @@ -1619,6 +1622,9 @@ did_set_completeopt(optset_T *args UNUSE cot = curbuf->b_p_cot; flags = &curbuf->b_cot_flags; } + else if (!(args->os_flags & OPT_GLOBAL)) + // When using :set, clear the local flags. + curbuf->b_cot_flags = 0; if (check_opt_strings(cot, p_cot_values, TRUE) != OK) return e_invalid_argument;
--- a/src/testdir/test_ins_complete.vim +++ b/src/testdir/test_ins_complete.vim @@ -875,6 +875,46 @@ func Test_completeopt_buffer_local() call assert_equal('menu', &completeopt) call assert_equal('menu', &g:completeopt) + new | only + call setline(1, ['foofoo', 'foobar', 'foobaz', '']) + set completeopt& + setlocal completeopt=menu,fuzzy,noinsert + setglobal completeopt=menu,longest + call assert_equal('menu,fuzzy,noinsert', &completeopt) + call assert_equal('menu,fuzzy,noinsert', &l:completeopt) + call assert_equal('menu,longest', &g:completeopt) + call feedkeys("Gccf\<C-X>\<C-N>bz\<C-Y>", 'tnix') + call assert_equal('foobaz', getline('.')) + setlocal bufhidden=wipe + new | only! + call setline(1, ['foofoo', 'foobar', 'foobaz', '']) + call assert_equal('menu,longest', &completeopt) + call assert_equal('menu,longest', &g:completeopt) + call assert_equal('', &l:completeopt) + call feedkeys("Gccf\<C-X>\<C-N>\<C-X>\<C-Z>", 'tnix') + call assert_equal('foo', getline('.')) + bwipe! + + new | only + call setline(1, ['foofoo', 'foobar', 'foobaz', '']) + set completeopt& + setlocal completeopt=menu,fuzzy,noinsert + set completeopt=menu,longest + call assert_equal('menu,longest', &completeopt) + call assert_equal('menu,longest', &g:completeopt) + call assert_equal('', &l:completeopt) + call feedkeys("Gccf\<C-X>\<C-N>\<C-X>\<C-Z>", 'tnix') + call assert_equal('foo', getline('.')) + setlocal bufhidden=wipe + new | only! + call setline(1, ['foofoo', 'foobar', 'foobaz', '']) + call assert_equal('menu,longest', &completeopt) + call assert_equal('menu,longest', &g:completeopt) + call assert_equal('', &l:completeopt) + call feedkeys("Gccf\<C-X>\<C-N>\<C-X>\<C-Z>", 'tnix') + call assert_equal('foo', getline('.')) + bwipe! + set completeopt& endfunc