diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-02-12 22:25:56 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-02-12 22:25:56 +0100 |
| commit | 7306d6b1c9528dcfe89eb77aa7ef354ffa9605a8 (patch) | |
| tree | 4f5f223715b1089fbaa1693ea628e4ca01eb77af | |
| parent | 4f5776c17cd86f904a7e2f92db297c73e28939b7 (diff) | |
patch 8.2.0251: a couple of function return types can be more specificv8.2.0251
Problem: A couple of function return types can be more specific.
Solution: Use a better return type. (Ken Takata, closes #5629)
| -rw-r--r-- | src/evalfunc.c | 4 | ||||
| -rw-r--r-- | src/globals.h | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/src/evalfunc.c b/src/evalfunc.c index 58f1218f21..6e96d0d1b8 100644 --- a/src/evalfunc.c +++ b/src/evalfunc.c @@ -569,7 +569,7 @@ static funcentry_T global_functions[] = {"matcharg", 1, 1, FEARG_1, &t_list_string, f_matcharg}, {"matchdelete", 1, 2, FEARG_1, &t_number, f_matchdelete}, {"matchend", 2, 4, FEARG_1, &t_number, f_matchend}, - {"matchlist", 2, 4, FEARG_1, &t_list_any, f_matchlist}, + {"matchlist", 2, 4, FEARG_1, &t_list_string, f_matchlist}, {"matchstr", 2, 4, FEARG_1, &t_string, f_matchstr}, {"matchstrpos", 2, 4, FEARG_1, &t_list_any, f_matchstrpos}, {"max", 1, 1, FEARG_1, &t_any, f_max}, @@ -622,7 +622,7 @@ static funcentry_T global_functions[] = {"prop_add", 3, 3, FEARG_1, &t_void, f_prop_add}, {"prop_clear", 1, 3, FEARG_1, &t_void, f_prop_clear}, {"prop_find", 1, 2, FEARG_1, &t_dict_any, f_prop_find}, - {"prop_list", 1, 2, FEARG_1, &t_list_any, f_prop_list}, + {"prop_list", 1, 2, FEARG_1, &t_list_dict_any, f_prop_list}, {"prop_remove", 1, 3, FEARG_1, &t_number, f_prop_remove}, {"prop_type_add", 2, 2, FEARG_1, &t_void, f_prop_type_add}, {"prop_type_change", 2, 2, FEARG_1, &t_void, f_prop_type_change}, diff --git a/src/globals.h b/src/globals.h index 562d956eb1..bda75b486e 100644 --- a/src/globals.h +++ b/src/globals.h @@ -384,9 +384,9 @@ EXTERN type_T t_void INIT4(VAR_VOID, 0, NULL, NULL); EXTERN type_T t_bool INIT4(VAR_BOOL, 0, NULL, NULL); EXTERN type_T t_special INIT4(VAR_SPECIAL, 0, NULL, NULL); EXTERN type_T t_number INIT4(VAR_NUMBER, 0, NULL, NULL); -#ifdef FEAT_FLOAT +# ifdef FEAT_FLOAT EXTERN type_T t_float INIT4(VAR_FLOAT, 0, NULL, NULL); -#endif +# endif EXTERN type_T t_string INIT4(VAR_STRING, 0, NULL, NULL); EXTERN type_T t_blob INIT4(VAR_BLOB, 0, NULL, NULL); EXTERN type_T t_job INIT4(VAR_JOB, 0, NULL, NULL); diff --git a/src/version.c b/src/version.c index a28fc03858..8d43c79141 100644 --- a/src/version.c +++ b/src/version.c @@ -743,6 +743,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 251, +/**/ 250, /**/ 249, |