patch 8.2.0251: a couple of function return types can be more specific

Problem: A couple of function return types can be more specific. Solution: Use a better return type. (Ken Takata, closes vim#5629)
k-takata · Feb 12, 2020 · 7306d6b · 7306d6b
1 parent 4f5776c
commit 7306d6b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git 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
@@ -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
@@ -742,6 +742,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    251,
 /**/
     250,
 /**/