Skip to content

Commit e7d4946

Browse files
zeertzjqbrammool
authored andcommitted
patch 9.0.1459: typo in name of type
Problem: Typo in name of type. Solution: Change funccal_T to funccall_T. (closes vim#12265)
1 parent a776707 commit e7d4946

File tree

6 files changed

+10
-8
lines changed

6 files changed

+10
-8
lines changed

src/blob.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -629,7 +629,7 @@ blob_filter_map(
629629
if (b->bv_lock == 0)
630630
b->bv_lock = VAR_LOCKED;
631631

632-
// Create one funccal_T for all eval_expr_typval() calls.
632+
// Create one funccall_T for all eval_expr_typval() calls.
633633
fc = eval_expr_get_funccal(expr, &newtv);
634634

635635
for (i = 0; i < b->bv_ga.ga_len; i++)

src/dict.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -904,7 +904,7 @@ get_literal_key(char_u **arg)
904904
eval_dict(char_u **arg, typval_T *rettv, evalarg_T *evalarg, int literal)
905905
{
906906
int evaluate = evalarg == NULL ? FALSE
907-
: evalarg->eval_flags & EVAL_EVALUATE;
907+
: (evalarg->eval_flags & EVAL_EVALUATE);
908908
dict_T *d = NULL;
909909
typval_T tvkey;
910910
typval_T tv;
@@ -1359,7 +1359,7 @@ dict_filter_map(
13591359
d_ret = rettv->vval.v_dict;
13601360
}
13611361

1362-
// Create one funccal_T for all eval_expr_typval() calls.
1362+
// Create one funccall_T for all eval_expr_typval() calls.
13631363
fc = eval_expr_get_funccal(expr, &newtv);
13641364

13651365
int prev_lock = d->dv_lock;

src/list.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -2401,7 +2401,7 @@ list_filter_map(
24012401
if (l->lv_lock == 0)
24022402
l->lv_lock = VAR_LOCKED;
24032403

2404-
// Create one funccal_T for all eval_expr_typval() calls.
2404+
// Create one funccall_T for all eval_expr_typval() calls.
24052405
fc = eval_expr_get_funccal(expr, &newtv);
24062406

24072407
if (l->lv_first == &range_list_item)
@@ -3064,7 +3064,7 @@ list_reduce(
30643064
if (l == NULL)
30653065
return;
30663066

3067-
// Create one funccal_T for all eval_expr_typval() calls.
3067+
// Create one funccall_T for all eval_expr_typval() calls.
30683068
fc = eval_expr_get_funccal(expr, rettv);
30693069

30703070
prev_locked = l->lv_lock;

src/strings.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -902,7 +902,7 @@ string_filter_map(
902902
// set_vim_var_nr() doesn't set the type
903903
set_vim_var_type(VV_KEY, VAR_NUMBER);
904904

905-
// Create one funccal_T for all eval_expr_typval() calls.
905+
// Create one funccall_T for all eval_expr_typval() calls.
906906
fc = eval_expr_get_funccal(expr, &newtv);
907907

908908
ga_init2(&ga, sizeof(char), 80);
@@ -981,7 +981,7 @@ string_reduce(
981981
else
982982
copy_tv(&argvars[2], rettv);
983983

984-
// Create one funccal_T for all eval_expr_typval() calls.
984+
// Create one funccall_T for all eval_expr_typval() calls.
985985
fc = eval_expr_get_funccal(expr, rettv);
986986

987987
for ( ; *p != NUL; p += len)

src/structs.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1896,7 +1896,7 @@ struct funccall_S
18961896
// funccal
18971897
int fc_copyID; // for garbage collection
18981898
garray_T fc_ufuncs; // list of ufunc_T* which keep a reference to
1899-
// "func"
1899+
// "fc_func"
19001900
};
19011901

19021902
// structure used as item in "fc_defer"

src/version.c

+2
Original file line numberDiff line numberDiff line change
@@ -695,6 +695,8 @@ static char *(features[]) =
695695

696696
static int included_patches[] =
697697
{ /* Add new patch number below this line */
698+
/**/
699+
1459,
698700
/**/
699701
1458,
700702
/**/

0 commit comments

Comments
 (0)