summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-01-13 16:46:22 +0100
committerBram Moolenaar <Bram@vim.org>2019-01-13 16:46:22 +0100
commit8309b0559da6e9a581a7816572594c90c2d7f942 (patch)
tree608687dcfc15642b077c406589dec052147023ff
parent81b1ba4be57b4bfd7e53a6709b4f98758612ef5f (diff)
patch 8.1.0740: Tcl test failsv8.1.0740
Problem: Tcl test fails. Solution: When the argument is empty don't give an error, instead rely on the error reporting higher up.
-rw-r--r--src/eval.c4
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/eval.c b/src/eval.c
index a5e358fe15..e7dcf07499 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -6462,7 +6462,9 @@ get_name_len(
}
len += get_id_len(arg);
- if (len == 0 && verbose)
+ // Only give an error when there is something, otherwise it will be
+ // reported at a higher level.
+ if (len == 0 && verbose && **arg != NUL)
EMSG2(_(e_invexpr2), *arg);
return len;
diff --git a/src/version.c b/src/version.c
index 8afe3e147a..d8681371f7 100644
--- a/src/version.c
+++ b/src/version.c
@@ -796,6 +796,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 740,
+/**/
739,
/**/
738,