summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzeertzjq <zeertzjq@outlook.com>2023-04-16 20:53:55 +0100
committerBram Moolenaar <Bram@vim.org>2023-04-16 20:53:55 +0100
commite7d49465a4ad390c1b0fb6d6b97bc30241fe5db9 (patch)
tree1ad57eac5490d8d424696ab81b15a7c2a256cfcd
parenta77670726e3706973adffc2b118f4576e1f58ea0 (diff)
downloadvim-git-9.0.1459.tar.gz
patch 9.0.1459: typo in name of typev9.0.1459
Problem: Typo in name of type. Solution: Change funccal_T to funccall_T. (closes #12265)
-rw-r--r--src/blob.c2
-rw-r--r--src/dict.c4
-rw-r--r--src/list.c4
-rw-r--r--src/strings.c4
-rw-r--r--src/structs.h2
-rw-r--r--src/version.c2
6 files changed, 10 insertions, 8 deletions
diff --git a/src/blob.c b/src/blob.c
index 6f4297345..9b409f614 100644
--- 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 1ce01c15b..ccd0b5dac 100644
--- 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 1bb63b070..ca4352672 100644
--- 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 20997946b..7c868bf1f 100644
--- 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 79c4ac695..55a859b29 100644
--- 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 018fcf5d6..0b3c80ec2 100644
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1459,
+/**/
1458,
/**/
1457,