From d615a3122a1347ee0d446be4ecb4295b1e0aaabf Mon Sep 17 00:00:00 2001 From: Ernie Rael Date: Thu, 5 Oct 2023 20:28:16 +0200 Subject: [PATCH] patch 9.0.1989: Vim9: double error message given 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 Co-authored-by: Ernie Rael --- src/version.c | 2 ++ src/vim9class.c | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/version.c b/src/version.c index 02dd9bfe47..64c68d99dc 100644 --- a/src/version.c +++ b/src/version.c @@ -704,6 +704,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1989, /**/ 1988, /**/ 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)