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 #9322 from janlazo/vim-8.1.0563

Browse Source 
vim-patch:8.1.{563,564}
This commit is contained in:
Justin M. Keyes 2018-12-08 01:20:21 +01:00 committed by GitHub
commit bd97577954
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/nvim/eval.c
View File

@ -19253,7 +19253,8 @@ static void set_var(const char *name, const size_t name_len, typval_T *const tv,
} }
return; return;
} else if (v->di_tv.v_type != tv->v_type) { } else if (v->di_tv.v_type != tv->v_type) {
internal_error("set_var()"); EMSG2(_("E963: setting %s to value with wrong type"), name);
return;
} }
} }

10
src/nvim/testdir/test_eval_stuff.vim
View File

@ -11,3 +11,13 @@ endfunction
func Test_catch_return_with_error() func Test_catch_return_with_error()
call assert_equal(1, s:foo()) call assert_equal(1, s:foo())
endfunc endfunc
func Test_E963()
" These commands used to cause an internal error prior to vim 8.1.0563
let v_e = v:errors
let v_o = v:oldfiles
call assert_fails("let v:errors=''", 'E963:')
call assert_equal(v_e, v:errors)
call assert_fails("let v:oldfiles=''", 'E963:')
call assert_equal(v_o, v:oldfiles)
endfunc