patch 9.0.1321: vimscript test fails where using {expr} syntax

Problem:    vimscript test fails where using {expr} syntax.
Solution:   Only return FCERR_FAILED in call_user_func() for Vim9 script.

diff --git a/src/userfunc.c b/src/userfunc.c
index d5dd3698983496c25b60bdcbed731da5f2dae275..c3b2a2535a6d1afe34beab73fc3061d539ea8e86 100644 (file)
--- a/src/userfunc.c
+++ b/src/userfunc.c
@@ -3060,7 +3060,11 @@ call_user_func(
        clear_tv(rettv);
        rettv->v_type = VAR_NUMBER;
        rettv->vval.v_number = -1;
-       retval = FCERR_FAILED;
+
+       // In corner cases returning a "failed" value is not backwards
+       // compatible.  Only do this for Vim9 script.
+       if (in_vim9script())
+           retval = FCERR_FAILED;
     }
 
 #ifdef FEAT_PROFILE

diff --git a/src/version.c b/src/version.c
index 20df49098a0e8e647948a658901ce137db485bf9..41822fdf48a30af8f5342bc3696765013cbc8de3 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -695,6 +695,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1321,
 /**/
     1320,
 /**/