diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2018-12-08 01:20:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-08 01:20:21 +0100 |
| commit | bd97577954d79b8cfba6022a94eb5b55e5a6a689 (patch) | |
| tree | 39de11597ec05cd15da52b2fe227130610e8f842 | |
| parent | bc132ae123d4dec1fa10e17981ff738e7b53cb20 (diff) | |
| parent | f17700544707160fb9588f37d1f3daef4f7bc483 (diff) | |
| download | rneovim-bd97577954d79b8cfba6022a94eb5b55e5a6a689.tar.gz rneovim-bd97577954d79b8cfba6022a94eb5b55e5a6a689.tar.bz2 rneovim-bd97577954d79b8cfba6022a94eb5b55e5a6a689.zip | |
Merge #9322 from janlazo/vim-8.1.0563
vim-patch:8.1.{563,564}
| -rw-r--r-- | src/nvim/eval.c | 3 | ||||
| -rw-r--r-- | src/nvim/testdir/test_eval_stuff.vim | 10 |
2 files changed, 12 insertions, 1 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index fac56e9206..cd29e4ef19 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -19253,7 +19253,8 @@ static void set_var(const char *name, const size_t name_len, typval_T *const tv, } return; } 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; } } diff --git a/src/nvim/testdir/test_eval_stuff.vim b/src/nvim/testdir/test_eval_stuff.vim index 92e1ec5335..111c85bb95 100644 --- a/src/nvim/testdir/test_eval_stuff.vim +++ b/src/nvim/testdir/test_eval_stuff.vim @@ -11,3 +11,13 @@ endfunction func Test_catch_return_with_error() call assert_equal(1, s:foo()) 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 |