]> git.ipfire.org Git - thirdparty/vim.git/commitdiff
patch 9.0.1754: still Ci breakage (after 9.0.1741) v9.0.1754
authorLemonBoy <thatlemon@gmail.com>
Sat, 19 Aug 2023 14:02:04 +0000 (16:02 +0200)
committerChristian Brabandt <cb@256bit.org>
Sat, 19 Aug 2023 14:02:04 +0000 (16:02 +0200)
Problem: still ci breakage (after 9.0.1741)
Solution: fix remaining issue

Signed-off-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: LemonBoy <thatlemon@gmail.com>
src/version.c
src/vim9execute.c
src/vim9type.c

index bb04cd384494c13154616c2bf9158497c4f29d57..3611cb20ba1af2237200cd3a0346a6d177f45bc3 100644 (file)
@@ -695,6 +695,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1754,
 /**/
     1753,
 /**/
index 6c208786a3e1fc7856a03605e44dc528f676cb6c..2eb6ba4cae92ff993079b881ba89b7e2a3ba1e65 100644 (file)
@@ -5451,8 +5451,8 @@ exec_instructions(ectx_T *ectx)
                    {
                        where.wt_index = ct->ct_arg_idx;
                        where.wt_kind = ct->ct_is_var ? WT_VARIABLE : WT_ARGUMENT;
-                       where.wt_func_name = ectx->ec_where.wt_func_name;
                    }
+                   where.wt_func_name = ectx->ec_where.wt_func_name;
                    r = check_typval_type(ct->ct_type, tv, where);
                    if (r == FAIL)
                        goto on_error;
index 1363a1c3e726b99cb93f5660e63cc16a4f83802a..4c1693668a86866b5853e0e8a9301ab7a0a4ace0 100644 (file)
@@ -682,8 +682,8 @@ check_typval_arg_type(
     {
        where.wt_index = arg_idx;
        where.wt_kind = WT_ARGUMENT;
-       where.wt_func_name = func_name;
     }
+    where.wt_func_name = func_name;
     return check_typval_type(expected, actual_tv, where);
 }