diff options
-rw-r--r-- | src/nvim/option.c | 5 | ||||
-rw-r--r-- | test/old/testdir/test_options.vim | 6 |
2 files changed, 11 insertions, 0 deletions
diff --git a/src/nvim/option.c b/src/nvim/option.c index 62a93f1293..716fd3775a 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -5394,6 +5394,11 @@ void set_context_in_set_cmd(expand_T *xp, char *arg, int opt_flags) xp->xp_pattern = p + 1; + if (options[opt_idx].var == &p_syn) { + xp->xp_context = EXPAND_OWNSYNTAX; + return; + } + if (flags & P_EXPAND) { p = options[opt_idx].var; if (p == (char *)&p_bdir diff --git a/test/old/testdir/test_options.vim b/test/old/testdir/test_options.vim index 563709b9a3..c56efe8786 100644 --- a/test/old/testdir/test_options.vim +++ b/test/old/testdir/test_options.vim @@ -378,6 +378,12 @@ func Test_set_completion() call assert_equal('"set filetype=sshdconfig', @:) call feedkeys(":set filetype=a\<C-A>\<C-B>\"\<CR>", 'xt') call assert_equal('"set filetype=' .. getcompletion('a*', 'filetype')->join(), @:) + + " Expand values for 'syntax' + call feedkeys(":set syntax=sshdconfi\<Tab>\<C-B>\"\<CR>", 'xt') + call assert_equal('"set syntax=sshdconfig', @:) + call feedkeys(":set syntax=a\<C-A>\<C-B>\"\<CR>", 'xt') + call assert_equal('"set syntax=' .. getcompletion('a*', 'syntax')->join(), @:) endfunc func Test_set_option_errors() |