diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2016-01-24 16:05:20 -0500 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2016-01-24 16:05:20 -0500 |
| commit | 31047607f89c58d51252044f00a7ae37ea94578c (patch) | |
| tree | 0842081b75f8a55275fe385c713111e6019ef5e6 /src/nvim/eval.c | |
| parent | a15cfb4d52c5d9098da98059592d8ca79e03c5d9 (diff) | |
| parent | 22230196cb7cee5c055a0be7a1864ecaf11a7c54 (diff) | |
| download | rneovim-31047607f89c58d51252044f00a7ae37ea94578c.tar.gz rneovim-31047607f89c58d51252044f00a7ae37ea94578c.tar.bz2 rneovim-31047607f89c58d51252044f00a7ae37ea94578c.zip | |
Merge pull request #4073 from jbradaric/vim-7.4.654
vim-patch:7.4.654
Diffstat (limited to 'src/nvim/eval.c')
| -rw-r--r-- | src/nvim/eval.c | 30 |
1 files changed, 20 insertions, 10 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index 9bdf314a3a..219bd38d82 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -7191,9 +7191,9 @@ static struct fst { { "getwinposx", 0, 0, f_getwinposx }, { "getwinposy", 0, 0, f_getwinposy }, { "getwinvar", 2, 3, f_getwinvar }, - { "glob", 1, 3, f_glob }, + { "glob", 1, 4, f_glob }, { "glob2regpat", 1, 1, f_glob2regpat }, - { "globpath", 2, 4, f_globpath }, + { "globpath", 2, 5, f_globpath }, { "has", 1, 1, f_has }, { "has_key", 2, 2, f_has_key }, { "haslocaldir", 0, 0, f_haslocaldir }, @@ -10704,10 +10704,15 @@ static void f_glob(typval_T *argvars, typval_T *rettv) if (argvars[1].v_type != VAR_UNKNOWN) { if (get_tv_number_chk(&argvars[1], &error)) options |= WILD_KEEP_ALL; - if (argvars[2].v_type != VAR_UNKNOWN - && get_tv_number_chk(&argvars[2], &error)) { - rettv->v_type = VAR_LIST; - rettv->vval.v_list = NULL; + if (argvars[2].v_type != VAR_UNKNOWN) { + if (get_tv_number_chk(&argvars[2], &error)) { + rettv->v_type = VAR_LIST; + rettv->vval.v_list = NULL; + } + if (argvars[3].v_type != VAR_UNKNOWN + && get_tv_number_chk(&argvars[3], &error)) { + options |= WILD_ALLLINKS; + } } } if (!error) { @@ -10746,10 +10751,15 @@ static void f_globpath(typval_T *argvars, typval_T *rettv) flags |= WILD_KEEP_ALL; } - if (argvars[3].v_type != VAR_UNKNOWN - && get_tv_number_chk(&argvars[3], &error)) { - rettv->v_type = VAR_LIST; - rettv->vval.v_list = NULL; + if (argvars[3].v_type != VAR_UNKNOWN) { + if (get_tv_number_chk(&argvars[3], &error)) { + rettv->v_type = VAR_LIST; + rettv->vval.v_list = NULL; + } + if (argvars[4].v_type != VAR_UNKNOWN + && get_tv_number_chk(&argvars[4], &error)) { + flags |= WILD_ALLLINKS; + } } } |