kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-29 14:41:06 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1197 from Shougo/vim-patch-7.4.392

Browse Source 
vim-patch:7.4.392
This commit is contained in:
Justin M. Keyes 2014-09-20 18:57:10 -04:00
commit 0ed9f3ec83
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/nvim/eval.c
View File

@ -6388,6 +6388,7 @@ static struct fst {
{"getcmdline", 0, 0, f_getcmdline}, {"getcmdline", 0, 0, f_getcmdline},
{"getcmdpos", 0, 0, f_getcmdpos}, {"getcmdpos", 0, 0, f_getcmdpos},
{"getcmdtype", 0, 0, f_getcmdtype}, {"getcmdtype", 0, 0, f_getcmdtype},
{"getcmdwintype", 0, 0, f_getcmdwintype},
{"getcurpos", 0, 0, f_getcurpos}, {"getcurpos", 0, 0, f_getcurpos},
{"getcwd", 0, 0, f_getcwd}, {"getcwd", 0, 0, f_getcwd},
{"getfontname", 0, 1, f_getfontname}, {"getfontname", 0, 1, f_getfontname},
@ -9155,6 +9156,17 @@ static void f_getcmdtype(typval_T *argvars, typval_T *rettv)
rettv->vval.v_string[0] = get_cmdline_type(); rettv->vval.v_string[0] = get_cmdline_type();
} }
/*
* "getcmdwintype()" function
*/
static void f_getcmdwintype(typval_T *argvars, typval_T *rettv)
{
rettv->v_type = VAR_STRING;
rettv->vval.v_string = NULL;
rettv->vval.v_string = xmallocz(1);
rettv->vval.v_string[0] = cmdwin_type;
}
/* /*
* "getcwd()" function * "getcwd()" function
*/ */

2
src/nvim/version.c
View File

@ -236,7 +236,7 @@ static int included_patches[] = {
//395, //395,
//394, //394,
//393, //393,
//392, 392,
//391, //391,
//390, //390,
//389, //389,