Merge pull request #4720 from jbradaric/vim-7.4.1042

vim-patch:7.4.1042
This commit is contained in:
Justin M. Keyes
2016-05-10 01:40:32 -04:00
8 changed files with 312 additions and 88 deletions

View File

@@ -6949,6 +6949,7 @@ static struct fst {
{ "winrestview", 1, 1, f_winrestview },
{ "winsaveview", 0, 0, f_winsaveview },
{ "winwidth", 1, 1, f_winwidth },
{ "wordcount", 0, 0, f_wordcount },
{ "writefile", 2, 3, f_writefile },
{ "xor", 2, 2, f_xor },
};
@@ -16921,6 +16922,13 @@ static void f_winwidth(typval_T *argvars, typval_T *rettv)
rettv->vval.v_number = wp->w_width;
}
/// "wordcount()" function
static void f_wordcount(typval_T *argvars, typval_T *rettv)
{
rettv_dict_alloc(rettv);
cursor_pos_info(rettv->vval.v_dict);
}
/// "writefile()" function
static void f_writefile(typval_T *argvars, typval_T *rettv)
{