patch 9.0.1459: typo in name of type

Problem:    Typo in name of type.
Solution:   Change funccal_T to funccall_T. (closes #12265)

diff --git a/src/blob.c b/src/blob.c
index 6f4297345d83980b1713b5b25c813641d89658a8..9b409f614e78958a4d194d994e90f3ced2b5f229 100644 (file)
--- a/src/blob.c
+++ b/src/blob.c
@@ -629,7 +629,7 @@ blob_filter_map(
     if (b->bv_lock == 0)
        b->bv_lock = VAR_LOCKED;
 
-    // Create one funccal_T for all eval_expr_typval() calls.
+    // Create one funccall_T for all eval_expr_typval() calls.
     fc = eval_expr_get_funccal(expr, &newtv);
 
     for (i = 0; i < b->bv_ga.ga_len; i++)

diff --git a/src/dict.c b/src/dict.c
index 1ce01c15b61a653619e77a49bafc17eb5d65943d..ccd0b5dac2dc4295efc638614ea90fe4ab5757b8 100644 (file)
--- a/src/dict.c
+++ b/src/dict.c
@@ -904,7 +904,7 @@ get_literal_key(char_u **arg)
 eval_dict(char_u **arg, typval_T *rettv, evalarg_T *evalarg, int literal)
 {
     int                evaluate = evalarg == NULL ? FALSE
-                                        : evalarg->eval_flags & EVAL_EVALUATE;
+                                      : (evalarg->eval_flags & EVAL_EVALUATE);
     dict_T     *d = NULL;
     typval_T   tvkey;
     typval_T   tv;
@@ -1359,7 +1359,7 @@ dict_filter_map(
        d_ret = rettv->vval.v_dict;
     }
 
-    // Create one funccal_T for all eval_expr_typval() calls.
+    // Create one funccall_T for all eval_expr_typval() calls.
     fc = eval_expr_get_funccal(expr, &newtv);
 
     int prev_lock = d->dv_lock;

diff --git a/src/list.c b/src/list.c
index 1bb63b0700ee9f9a43fcc1b7e6c7901eb82ff28a..ca435267247cb71beebd5133edd17b8ff6460673 100644 (file)
--- a/src/list.c
+++ b/src/list.c
@@ -2401,7 +2401,7 @@ list_filter_map(
     if (l->lv_lock == 0)
        l->lv_lock = VAR_LOCKED;
 
-    // Create one funccal_T for all eval_expr_typval() calls.
+    // Create one funccall_T for all eval_expr_typval() calls.
     fc = eval_expr_get_funccal(expr, &newtv);
 
     if (l->lv_first == &range_list_item)
@@ -3064,7 +3064,7 @@ list_reduce(
     if (l == NULL)
        return;
 
-    // Create one funccal_T for all eval_expr_typval() calls.
+    // Create one funccall_T for all eval_expr_typval() calls.
     fc = eval_expr_get_funccal(expr, rettv);
 
     prev_locked = l->lv_lock;

diff --git a/src/strings.c b/src/strings.c
index 20997946b9e963dd817d74b8c62b3698ce60a62f..7c868bf1f5716d159fb92a8e2aaaf6f4fd839a74 100644 (file)
--- a/src/strings.c
+++ b/src/strings.c
@@ -902,7 +902,7 @@ string_filter_map(
     // set_vim_var_nr() doesn't set the type
     set_vim_var_type(VV_KEY, VAR_NUMBER);
 
-    // Create one funccal_T for all eval_expr_typval() calls.
+    // Create one funccall_T for all eval_expr_typval() calls.
     fc = eval_expr_get_funccal(expr, &newtv);
 
     ga_init2(&ga, sizeof(char), 80);
@@ -981,7 +981,7 @@ string_reduce(
     else
        copy_tv(&argvars[2], rettv);
 
-    // Create one funccal_T for all eval_expr_typval() calls.
+    // Create one funccall_T for all eval_expr_typval() calls.
     fc = eval_expr_get_funccal(expr, rettv);
 
     for ( ; *p != NUL; p += len)

diff --git a/src/structs.h b/src/structs.h
index 79c4ac695388858eed7aef910e2e03af81391903..55a859b29b79a3003fcb2737d1e81134717f6dd4 100644 (file)
--- a/src/structs.h
+++ b/src/structs.h
@@ -1896,7 +1896,7 @@ struct funccall_S
                                // funccal
     int                fc_copyID;      // for garbage collection
     garray_T   fc_ufuncs;      // list of ufunc_T* which keep a reference to
-                               // "func"
+                               // "fc_func"
 };
 
 // structure used as item in "fc_defer"

diff --git a/src/version.c b/src/version.c
index 018fcf5d61cc962ecc46239354b57e2944325996..0b3c80ec2cec429b9d32bdbe7a63e15e3a1ff536 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 */
+/**/
+    1459,
 /**/
     1458,
 /**/