diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2018-09-23 10:53:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-23 10:53:57 +0200 |
| commit | eee93f36d8cd7545c444e5e3aaad5d5bcd0ef365 (patch) | |
| tree | e34fad420042ad56953f8275531db92c32b9aafe | |
| parent | 197d907e092aa6db9bd0e75003438f11cd6812bf (diff) | |
| parent | bcc174e6df50c87808dae0430fa4b95659678058 (diff) | |
| download | rneovim-eee93f36d8cd7545c444e5e3aaad5d5bcd0ef365.tar.gz rneovim-eee93f36d8cd7545c444e5e3aaad5d5bcd0ef365.tar.bz2 rneovim-eee93f36d8cd7545c444e5e3aaad5d5bcd0ef365.zip | |
Merge #9031 from janlazo/vim-8.1.0414
| -rw-r--r-- | src/nvim/option.c | 13 | ||||
| -rw-r--r-- | src/nvim/testdir/test_options.vim | 31 |
2 files changed, 40 insertions, 4 deletions
diff --git a/src/nvim/option.c b/src/nvim/option.c index 8e2264c6a7..7cda42ef20 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -1434,7 +1434,7 @@ do_set ( || (long *)varp == &p_wcm) && (*arg == '<' || *arg == '^' - || ((!arg[1] || ascii_iswhite(arg[1])) + || (*arg != NUL && (!arg[1] || ascii_iswhite(arg[1])) && !ascii_isdigit(*arg)))) { value = string_to_key(arg); if (value == 0 && (long *)varp != &p_wcm) { @@ -4019,7 +4019,8 @@ static char *set_bool_option(const int opt_idx, char_u *const varp, options[opt_idx].flags |= P_WAS_SET; - if (!starting) { + // Don't do this while starting up or recursively. + if (!starting && *get_vim_var_str(VV_OPTION_TYPE) == NUL) { char buf_old[2]; char buf_new[2]; char buf_type[7]; @@ -4393,7 +4394,8 @@ static char *set_num_option(int opt_idx, char_u *varp, long value, options[opt_idx].flags |= P_WAS_SET; - if (!starting && errmsg == NULL) { + // Don't do this while starting up, failure or recursively. + if (!starting && errmsg == NULL && *get_vim_var_str(VV_OPTION_TYPE) == NUL) { char buf_old[NUMBUFLEN]; char buf_new[NUMBUFLEN]; char buf_type[7]; @@ -4426,7 +4428,10 @@ static char *set_num_option(int opt_idx, char_u *varp, long value, static void trigger_optionsset_string(int opt_idx, int opt_flags, char *oldval, char *newval) { - if (oldval != NULL && newval != NULL) { + // Don't do this recursively. + if (oldval != NULL + && newval != NULL + && *get_vim_var_str(VV_OPTION_TYPE) == NUL) { char buf_type[7]; vim_snprintf(buf_type, ARRAY_SIZE(buf_type), "%s", diff --git a/src/nvim/testdir/test_options.vim b/src/nvim/testdir/test_options.vim index 3e0703f845..66acb79206 100644 --- a/src/nvim/testdir/test_options.vim +++ b/src/nvim/testdir/test_options.vim @@ -29,6 +29,19 @@ function! Test_isfname() set isfname& endfunction +function Test_wildchar() + " Empty 'wildchar' used to access invalid memory. + call assert_fails('set wildchar=', 'E521:') + call assert_fails('set wildchar=abc', 'E521:') + set wildchar=<Esc> + let a=execute('set wildchar?') + call assert_equal("\n wildchar=<Esc>", a) + set wildchar=27 + let a=execute('set wildchar?') + call assert_equal("\n wildchar=<Esc>", a) + set wildchar& +endfunction + function! Test_options() let caught = 'ok' try @@ -356,6 +369,24 @@ func Test_shortmess_F() bwipe endfunc +func Test_set_all() + set tw=75 + set iskeyword=a-z,A-Z + set nosplitbelow + let out = execute('set all') + call assert_match('textwidth=75', out) + call assert_match('iskeyword=a-z,A-Z', out) + call assert_match('nosplitbelow', out) + set tw& iskeyword& splitbelow& +endfunc + +func Test_set_values() + " The file is only generated when running "make test" in the src directory. + if filereadable('opt_test.vim') + source opt_test.vim + endif +endfunc + func Test_shortmess_F2() e file1 e file2 |