patch 8.2.1428: Vim9: :def function does not abort on nested function error
Problem: Vim9: :def function does not abort on nested function error.
Solution: Check whether an error message was given. (closes #6691)
diff --git a/src/vim9execute.c b/src/vim9execute.c
index fed7fed..00adff3 100644
--- a/src/vim9execute.c
+++ b/src/vim9execute.c
@@ -505,6 +505,7 @@
funcexe_T funcexe;
int error;
int idx;
+ int called_emsg_before = called_emsg;
if (ufunc->uf_def_status == UF_TO_BE_COMPILED
&& compile_def_function(ufunc, FALSE, NULL) == FAIL)
@@ -542,6 +543,9 @@
user_func_error(error, ufunc->uf_name);
return FAIL;
}
+ if (called_emsg > called_emsg_before)
+ // Error other than from calling the function itself.
+ return FAIL;
return OK;
}
@@ -670,10 +674,11 @@
static int
call_eval_func(char_u *name, int argcount, ectx_T *ectx, isn_T *iptr)
{
- int called_emsg_before = called_emsg;
+ int called_emsg_before = called_emsg;
+ int res;
- if (call_by_name(name, argcount, ectx, iptr) == FAIL
- && called_emsg == called_emsg_before)
+ res = call_by_name(name, argcount, ectx, iptr);
+ if (res == FAIL && called_emsg == called_emsg_before)
{
dictitem_T *v;
@@ -690,7 +695,7 @@
}
return call_partial(&v->di_tv, argcount, ectx);
}
- return OK;
+ return res;
}
/*