summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzeertzjq <zeertzjq@outlook.com>2023-03-11 16:18:51 +0000
committerBram Moolenaar <Bram@vim.org>2023-03-11 16:18:51 +0000
commitc481ad38f05c9f759ca7fd01a54c78acad794e85 (patch)
tree4264187f2efa8ccc8b0e31320a5cfa850ad04247
parent5145c9a829cd43cb9e7962b181bf99226eb3a53f (diff)
downloadvim-git-c481ad38f05c9f759ca7fd01a54c78acad794e85.tar.gz
patch 9.0.1401: condition is always truev9.0.1401
Problem: Condition is always true. Solution: Remove the condition. (closes #12139)
-rw-r--r--src/eval.c21
-rw-r--r--src/version.c2
2 files changed, 11 insertions, 12 deletions
diff --git a/src/eval.c b/src/eval.c
index c82e7046d..37b50c38e 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -6885,20 +6885,17 @@ handle_subscript(
*arg = skipwhite(p + 2);
else
*arg = p + 2;
- if (ret == OK)
+ if (VIM_ISWHITE(**arg))
{
- if (VIM_ISWHITE(**arg))
- {
- emsg(_(e_no_white_space_allowed_before_parenthesis));
- ret = FAIL;
- }
- else if ((**arg == '{' && !in_vim9script()) || **arg == '(')
- // expr->{lambda}() or expr->(lambda)()
- ret = eval_lambda(arg, rettv, evalarg, verbose);
- else
- // expr->name()
- ret = eval_method(arg, rettv, evalarg, verbose);
+ emsg(_(e_no_white_space_allowed_before_parenthesis));
+ ret = FAIL;
}
+ else if ((**arg == '{' && !in_vim9script()) || **arg == '(')
+ // expr->{lambda}() or expr->(lambda)()
+ ret = eval_lambda(arg, rettv, evalarg, verbose);
+ else
+ // expr->name()
+ ret = eval_method(arg, rettv, evalarg, verbose);
}
// "." is ".name" lookup when we found a dict or when evaluating and
// scriptversion is at least 2, where string concatenation is "..".
diff --git a/src/version.c b/src/version.c
index b1d88f485..0265c47a9 100644
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1401,
+/**/
1400,
/**/
1399,