IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge #9031 from janlazo/vim-8.1.0414

Browse Source
This commit is contained in:
Justin M. Keyes 2018-09-23 10:53:57 +02:00 committed by GitHub
commit eee93f36d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 40 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/nvim/option.c
View File

@ -1434,7 +1434,7 @@ do_set (
|| (long *)varp == &p_wcm) || (long *)varp == &p_wcm)
&& (*arg == '<' && (*arg == '<'
|| *arg == '^' || *arg == '^'
|| ((!arg[1] || ascii_iswhite(arg[1])) || (*arg != NUL && (!arg[1] || ascii_iswhite(arg[1]))
&& !ascii_isdigit(*arg)))) { && !ascii_isdigit(*arg)))) {
value = string_to_key(arg); value = string_to_key(arg);
if (value == 0 && (long *)varp != &p_wcm) { 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; 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_old[2];
char buf_new[2]; char buf_new[2];
char buf_type[7]; 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; 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_old[NUMBUFLEN];
char buf_new[NUMBUFLEN]; char buf_new[NUMBUFLEN];
char buf_type[7]; 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, static void trigger_optionsset_string(int opt_idx, int opt_flags,
char *oldval, char *newval) 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]; char buf_type[7];
vim_snprintf(buf_type, ARRAY_SIZE(buf_type), "%s", vim_snprintf(buf_type, ARRAY_SIZE(buf_type), "%s",

31
src/nvim/testdir/test_options.vim
View File

@ -29,6 +29,19 @@ function! Test_isfname()
set isfname& set isfname&
endfunction 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() function! Test_options()
let caught = 'ok' let caught = 'ok'
try try
@ -356,6 +369,24 @@ func Test_shortmess_F()
bwipe bwipe
endfunc 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() func Test_shortmess_F2()
e file1 e file1
e file2 e file2