summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErnie Rael <errael@raelity.com>2023-10-05 20:28:16 +0200
committerChristian Brabandt <cb@256bit.org>2023-10-05 20:28:16 +0200
commitd615a3122a1347ee0d446be4ecb4295b1e0aaabf (patch)
tree7e256747edaa1de6eb7a9d4353471e8b5f9f8247
parentd2f4800099733216e28d59e1a5710f624b0d9ec1 (diff)
patch 9.0.1989: Vim9: double error message givenv9.0.1989
Problem: Vim9: double error message given Solution: Only give second error message, if ther wasn't one given before closes: #13278 Signed-off-by: Christian Brabandt <cb@256bit.org> Co-authored-by: Ernie Rael <errael@raelity.com>
-rw-r--r--src/version.c2
-rw-r--r--src/vim9class.c4
2 files changed, 5 insertions, 1 deletions
diff --git a/src/version.c b/src/version.c
index 02dd9bfe47..64c68d99dc 100644
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1989,
+/**/
1988,
/**/
1987,
diff --git a/src/vim9class.c b/src/vim9class.c
index 925149e669..295716e18e 100644
--- a/src/vim9class.c
+++ b/src/vim9class.c
@@ -2221,6 +2221,7 @@ class_object_index(
return FAIL;
size_t len = name_end - name;
+ int did_emsg_save = did_emsg;
class_T *cl;
if (rettv->v_type == VAR_CLASS)
cl = rettv->vval.v_class;
@@ -2310,7 +2311,8 @@ class_object_index(
return OK;
}
- member_not_found_msg(cl, VAR_OBJECT, name, len);
+ if (did_emsg == did_emsg_save)
+ member_not_found_msg(cl, VAR_OBJECT, name, len);
}
else if (rettv->v_type == VAR_CLASS)