# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1544031906 -3600
# Node ID 6344377dc7dc17431a7aa49817d7368fc0c85b07
# Parent  3adb90c9a8dbd162e9567834fa2d4ccc1627c4cd
patch 8.1.0564: setting v:errors to wrong type still possible

commit https://github.com/vim/vim/commit/88b53fd0521d1e62df17a8a1f2181425e9d4854c
Author: Bram Moolenaar <Bram@vim.org>
Date:   Wed Dec 5 18:43:28 2018 +0100

    patch 8.1.0564: setting v:errors to wrong type still possible

    Problem:    Setting v:errors to wrong type still possible.
    Solution:   Return after giving an error message. (Christian Brabandt)

diff --git a/src/eval.c b/src/eval.c
--- a/src/eval.c
+++ b/src/eval.c
@@ -7568,7 +7568,10 @@ set_var(
 		return;
 	    }
 	    else if (v->di_tv.v_type != tv->v_type)
+	    {
 		EMSG2(_("E963: setting %s to value with wrong type"), name);
+		return;
+	    }
 	}
 
 	clear_tv(&v->di_tv);
diff --git a/src/testdir/test_eval_stuff.vim b/src/testdir/test_eval_stuff.vim
--- a/src/testdir/test_eval_stuff.vim
+++ b/src/testdir/test_eval_stuff.vim
@@ -53,3 +53,13 @@ func Test_line_continuation()
 	"\ and some more
   call assert_equal([5, 6], array)
 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
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -793,6 +793,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    564,
+/**/
     563,
 /**/
     562,