diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2019-07-01 23:59:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-01 23:59:24 +0200 |
| commit | 097f85ae6c73dc6d8ef460a03990f06bb39d772f (patch) | |
| tree | c7ecbab7e66c283cd2638babe757a39ab63228fa /src | |
| parent | ff95e62ff8958e17a292f98465757a9452933bdd (diff) | |
| download | rneovim-097f85ae6c73dc6d8ef460a03990f06bb39d772f.tar.gz rneovim-097f85ae6c73dc6d8ef460a03990f06bb39d772f.tar.bz2 rneovim-097f85ae6c73dc6d8ef460a03990f06bb39d772f.zip | |
defaults: wildoptions=pum,tagfile #10384
ref #6289
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/option.c | 7 | ||||
| -rw-r--r-- | src/nvim/options.lua | 4 | ||||
| -rw-r--r-- | src/nvim/testdir/setup.vim | 15 |
3 files changed, 13 insertions, 13 deletions
diff --git a/src/nvim/option.c b/src/nvim/option.c index 25b498e3e6..e8e246c277 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -2177,10 +2177,8 @@ static char_u *option_expand(int opt_idx, char_u *val) return NameBuff; } -/* - * After setting various option values: recompute variables that depend on - * option values. - */ +// After setting various option values: recompute variables that depend on +// option values. static void didset_options(void) { // initialize the table for 'iskeyword' et.al. @@ -2195,6 +2193,7 @@ static void didset_options(void) (void)opt_strings_flags(p_dy, p_dy_values, &dy_flags, true); (void)opt_strings_flags(p_tc, p_tc_values, &tc_flags, false); (void)opt_strings_flags(p_ve, p_ve_values, &ve_flags, true); + (void)opt_strings_flags(p_wop, p_wop_values, &wop_flags, true); (void)spell_check_msm(); (void)spell_check_sps(); (void)compile_cap_prog(curwin->w_s); diff --git a/src/nvim/options.lua b/src/nvim/options.lua index cfdac36990..c963ddd49c 100644 --- a/src/nvim/options.lua +++ b/src/nvim/options.lua @@ -2750,9 +2750,9 @@ return { full_name='wildoptions', abbreviation='wop', type='string', list='onecomma', scope={'global'}, deny_duplicates=true, - vi_def=true, + vim=true, varname='p_wop', - defaults={if_true={vi=""}} + defaults={if_true={vi='', vim='pum,tagfile'}} }, { full_name='winaltkeys', abbreviation='wak', diff --git a/src/nvim/testdir/setup.vim b/src/nvim/testdir/setup.vim index cbc4fac0f3..f79fb9e518 100644 --- a/src/nvim/testdir/setup.vim +++ b/src/nvim/testdir/setup.vim @@ -7,17 +7,18 @@ endif let s:did_load = 1 " Align Nvim defaults to Vim. -set sidescroll=0 -set directory^=. -set undodir^=. set backspace= -set nrformats+=octal -set nohidden smarttab noautoindent noautoread complete-=i noruler noshowcmd -set listchars=eol:$ +set directory^=. set fillchars=vert:\|,fold:- -set shortmess-=F set laststatus=1 +set listchars=eol:$ +set nohidden smarttab noautoindent noautoread complete-=i noruler noshowcmd +set nrformats+=octal +set shortmess-=F +set sidescroll=0 set tags=./tags,tags +set undodir^=. +set wildoptions= " Prevent Nvim log from writing to stderr. let $NVIM_LOG_FILE = exists($NVIM_LOG_FILE) ? $NVIM_LOG_FILE : 'Xnvim.log' |