diff options
| author | Michael Ennen <mike.ennen@gmail.com> | 2016-10-28 22:58:11 -0700 |
|---|---|---|
| committer | James McCoy <jamessan@jamessan.com> | 2016-12-12 10:17:35 -0500 |
| commit | c52856af2c5f3b12b89671d91c35689fb2f84a70 (patch) | |
| tree | f4e722d19ee27f08c5bf4ebaf209aa7c197baeb9 /src/nvim/eval.c | |
| parent | 02c58d8a07a6d7ed450c8c7146c93f4dca665ba2 (diff) | |
| download | rneovim-c52856af2c5f3b12b89671d91c35689fb2f84a70.tar.gz rneovim-c52856af2c5f3b12b89671d91c35689fb2f84a70.tar.bz2 rneovim-c52856af2c5f3b12b89671d91c35689fb2f84a70.zip | |
vim-patch:7.4.1842
Problem: get() works for Partial but not for Funcref.
Solution: Accept Funcref. Also return the function itself. (Nikolai Pavlov)
https://github.com/vim/vim/commit/03e19a04ac2ca55643663b97b6ab94043233dcbd
Diffstat (limited to 'src/nvim/eval.c')
| -rw-r--r-- | src/nvim/eval.c | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index be1eb3ef1c..2139d651cd 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -9706,14 +9706,24 @@ static void f_get(typval_T *argvars, typval_T *rettv, FunPtr fptr) if (di != NULL) tv = &di->di_tv; } - } else if (argvars[0].v_type == VAR_PARTIAL) { - partial_T *pt = argvars[0].vval.v_partial; + } else if (argvars[0].v_type == VAR_PARTIAL + || argvars[0].v_type == VAR_FUNC) { + partial_T *pt; + partial_T fref_pt; + + if (argvars[0].v_type == VAR_PARTIAL) { + pt = argvars[0].vval.v_partial; + } else { + memset(&fref_pt, 0, sizeof(fref_pt)); + fref_pt.pt_name = argvars[0].vval.v_string; + pt = &fref_pt; + } if (pt != NULL) { char_u *what = get_tv_string(&argvars[1]); - if (STRCMP(what, "func") == 0) { - rettv->v_type = VAR_STRING; + if (STRCMP(what, "func") == 0 || STRCMP(what, "name") == 0) { + rettv->v_type = (*what == 'f' ? VAR_FUNC : VAR_STRING); if (pt->pt_name != NULL) { rettv->vval.v_string = vim_strsave(pt->pt_name); } |