patch 9.0.1989: Vim9: double error message given

errael · chrisbra · commit d615a3122a13 · 2023-10-05T20:28:16.000+02:00
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 &lt;cb@256bit.org&gt;
Co-authored-by: Ernie Rael &lt;errael@raelity.com&gt;
diff --git 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
@@ -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)

Original file line number	Diff line number	Diff line change
`@@ -2221,6 +2221,7 @@ class_object_index(`
`2221`	`2221`	`return FAIL;`
`2222`	`2222`	`size_t len = name_end - name;`
`2223`	`2223`
	`2224`	`+ int did_emsg_save = did_emsg;`
`2224`	`2225`	`class_T *cl;`
`2225`	`2226`	`if (rettv->v_type == VAR_CLASS)`
`2226`	`2227`	`cl = rettv->vval.v_class;`
`@@ -2310,7 +2311,8 @@ class_object_index(`
`2310`	`2311`	`return OK;`
`2311`	`2312`	`}`
`2312`	`2313`
`2313`		`- member_not_found_msg(cl, VAR_OBJECT, name, len);`
	`2314`	`+ if (did_emsg == did_emsg_save)`
	`2315`	`+ member_not_found_msg(cl, VAR_OBJECT, name, len);`
`2314`	`2316`	`}`
`2315`	`2317`
`2316`	`2318`	`else if (rettv->v_type == VAR_CLASS)`