Merge pull request #4588 from KillTheMule/vim-patch-1285

vim-patch: 7.4.1285
This commit is contained in:
Justin M. Keyes
2016-05-10 03:02:07 -04:00
4 changed files with 66 additions and 5 deletions

View File

@@ -6850,6 +6850,7 @@ static struct fst {
{ "range", 1, 3, f_range },
{ "readfile", 1, 3, f_readfile },
{ "reltime", 0, 2, f_reltime },
{ "reltimefloat", 1, 1, f_reltimefloat },
{ "reltimestr", 1, 1, f_reltimestr },
{ "remove", 2, 3, f_remove },
{ "rename", 2, 2, f_rename },
@@ -15308,6 +15309,21 @@ static void f_uniq(typval_T *argvars, typval_T *rettv)
do_sort_uniq(argvars, rettv, false);
}
//
// "reltimefloat()" function
//
static void f_reltimefloat(typval_T *argvars , typval_T *rettv)
FUNC_ATTR_NONNULL_ALL
{
proftime_T tm;
rettv->v_type = VAR_FLOAT;
rettv->vval.v_float = 0;
if (list2proftime(&argvars[0], &tm) == OK) {
rettv->vval.v_float = ((float_T)tm) / 1000000000;
}
}
/*
* "soundfold({word})" function
*/