mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-06 03:18:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.1.0832: :set doesn't work for 'cot' and 'bkc' after :setlocal

Browse Source 
Problem:  :set doesn't work for 'cot' and 'bkc' after :setlocal.
Solution: clear the local flags when using :set (zeertzjq).

closes: vim/vim#15981

46dcd84d24
This commit is contained in:
zeertzjq
2024-11-03 16:52:20 +08:00
parent 99acc9de55
commit 981fa11c91
2 changed files with 46 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/nvim/optionstr.c
View File

@@ -655,6 +655,9 @@ const char *did_set_backupcopy(optset_T *args)
if (opt_flags & OPT_LOCAL) { if (opt_flags & OPT_LOCAL) {
bkc = buf->b_p_bkc; bkc = buf->b_p_bkc;
flags = &buf->b_bkc_flags; flags = &buf->b_bkc_flags;
} else if (!(opt_flags & OPT_GLOBAL)) {
// When using :set, clear the local flags.
buf->b_bkc_flags = 0;
} }
if ((opt_flags & OPT_LOCAL) && *bkc == NUL) { if ((opt_flags & OPT_LOCAL) && *bkc == NUL) {
@@ -1070,6 +1073,9 @@ const char *did_set_completeopt(optset_T *args FUNC_ATTR_UNUSED)
if (args->os_flags & OPT_LOCAL) { if (args->os_flags & OPT_LOCAL) {
cot = buf->b_p_cot; cot = buf->b_p_cot;
flags = &buf->b_cot_flags; flags = &buf->b_cot_flags;
} else if (!(args->os_flags & OPT_GLOBAL)) {
// When using :set, clear the local flags.
buf->b_cot_flags = 0;
} }
if (check_opt_strings(cot, p_cot_values, true) != OK) { if (check_opt_strings(cot, p_cot_values, true) != OK) {

40
test/old/testdir/test_ins_complete.vim
View File

@@ -950,6 +950,46 @@ func Test_completeopt_buffer_local()
call assert_equal('menu', &completeopt) call assert_equal('menu', &completeopt)
call assert_equal('menu', &g: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& set completeopt&
endfunc endfunc