summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2018-12-04 22:37:49 +0100
committerBram Moolenaar <Bram@vim.org>2018-12-04 22:37:49 +0100
commit74ea88c170f65afa50b2b97e37806d13b4e24cd7 (patch)
tree31235a36c1a60adc2a6577dd2ac229978b5c317e
parentb6fc72851c45a36a370f9516c68508e47b41c4c1 (diff)
patch 8.1.0563: setting v:errors to a string give confusing errorv8.1.0563
Problem: Setting v:errors to a string give confusing error. (Christian Brabandt) Solution: Change internal error into normal error message.
-rw-r--r--src/eval.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/eval.c b/src/eval.c
index 7dfb981254..1dae2bfba9 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -7568,7 +7568,7 @@ set_var(
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);
}
clear_tv(&v->di_tv);
diff --git a/src/version.c b/src/version.c
index f86f7c959b..474c96b96a 100644
--- 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 */
/**/
+ 563,
+/**/
562,
/**/
561,