summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/version.c2
-rw-r--r--src/vim9compile.c4
2 files changed, 5 insertions, 1 deletions
diff --git a/src/version.c b/src/version.c
index fcb0d927a..7f459c27a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2984,
+/**/
2983,
/**/
2982,
diff --git a/src/vim9compile.c b/src/vim9compile.c
index dfd5aaa3c..47847af3a 100644
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -9596,7 +9596,9 @@ nextline:
if (!cctx.ctx_had_return)
{
- if (ufunc->uf_ret_type->tt_type != VAR_VOID)
+ if (ufunc->uf_ret_type->tt_type == VAR_UNKNOWN)
+ ufunc->uf_ret_type = &t_void;
+ else if (ufunc->uf_ret_type->tt_type != VAR_VOID)
{
emsg(_(e_missing_return_statement));
goto erret;