diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2014-09-20 18:57:10 -0400 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2014-09-20 18:57:10 -0400 |
| commit | 0ed9f3ec8338783466b0a6ab2661d9a061a436fa (patch) | |
| tree | 0776a0ace9d7060e91d3b8125620eb54e4590cbf /src | |
| parent | 9d4e8fffa11f1794a385165a14a9a84e69ac26ec (diff) | |
| parent | b57d6ef09a86d3cf26a3ebc0fa03a5af21bd2e27 (diff) | |
| download | rneovim-0ed9f3ec8338783466b0a6ab2661d9a061a436fa.tar.gz rneovim-0ed9f3ec8338783466b0a6ab2661d9a061a436fa.tar.bz2 rneovim-0ed9f3ec8338783466b0a6ab2661d9a061a436fa.zip | |
Merge pull request #1197 from Shougo/vim-patch-7.4.392
vim-patch:7.4.392
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/eval.c | 12 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 13 insertions, 1 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index a119cd6eac..0dd261f53a 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -6388,6 +6388,7 @@ static struct fst { {"getcmdline", 0, 0, f_getcmdline}, {"getcmdpos", 0, 0, f_getcmdpos}, {"getcmdtype", 0, 0, f_getcmdtype}, + {"getcmdwintype", 0, 0, f_getcmdwintype}, {"getcurpos", 0, 0, f_getcurpos}, {"getcwd", 0, 0, f_getcwd}, {"getfontname", 0, 1, f_getfontname}, @@ -9156,6 +9157,17 @@ static void f_getcmdtype(typval_T *argvars, typval_T *rettv) } /* + * "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 */ static void f_getcwd(typval_T *argvars, typval_T *rettv) diff --git a/src/nvim/version.c b/src/nvim/version.c index a5f3e91fac..5a0b01df28 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -236,7 +236,7 @@ static int included_patches[] = { //395, //394, //393, - //392, + 392, //391, //390, //389, |