mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-14 15:28:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:7.4.1842

Browse Source 
Problem:    get() works for Partial but not for Funcref.
Solution:   Accept Funcref.  Also return the function itself. (Nikolai Pavlov)

03e19a04ac
This commit is contained in:
Michael Ennen
2016-10-28 22:58:11 -07:00
committed by James McCoy
parent 02c58d8a07
commit c52856af2c
4 changed files with 31 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/nvim/eval.c
View File

@@ -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);
}