diff options
| author | Josh Rahm <joshuarahm@gmail.com> | 2022-08-03 00:08:17 -0600 |
|---|---|---|
| committer | Josh Rahm <joshuarahm@gmail.com> | 2022-08-03 00:08:17 -0600 |
| commit | 9449e1b8d273ff78eb894c588110ffa0c17d6ee3 (patch) | |
| tree | 9e4470c33bd4187d9f42f0b2c4aaa995310c5be8 /src/nvim/ex_cmds2.c | |
| parent | 308e1940dcd64aa6c344c403d4f9e0dda58d9c5c (diff) | |
| parent | b8dcbcc732baf84fc48d6b272c3ade0bcb129b3b (diff) | |
| download | rneovim-9449e1b8d273ff78eb894c588110ffa0c17d6ee3.tar.gz rneovim-9449e1b8d273ff78eb894c588110ffa0c17d6ee3.tar.bz2 rneovim-9449e1b8d273ff78eb894c588110ffa0c17d6ee3.zip | |
Merge remote-tracking branch 'upstream/master' into rahm
Diffstat (limited to 'src/nvim/ex_cmds2.c')
| -rw-r--r-- | src/nvim/ex_cmds2.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/nvim/ex_cmds2.c b/src/nvim/ex_cmds2.c index e57dc5d13f..730a2f1b69 100644 --- a/src/nvim/ex_cmds2.c +++ b/src/nvim/ex_cmds2.c @@ -24,6 +24,7 @@ #include "nvim/charset.h" #include "nvim/debugger.h" #include "nvim/eval/userfunc.h" +#include "nvim/eval/vars.h" #include "nvim/ex_cmds.h" #include "nvim/ex_cmds2.h" #include "nvim/ex_eval.h" @@ -856,7 +857,7 @@ static void get_arglist(garray_T *gap, char *str, int escaped) /// "fnames[fcountp]". When "wig" is true, removes files matching 'wildignore'. /// /// @return FAIL or OK. -int get_arglist_exp(char_u *str, int *fcountp, char_u ***fnamesp, bool wig) +int get_arglist_exp(char_u *str, int *fcountp, char ***fnamesp, bool wig) { garray_T ga; int i; @@ -864,10 +865,10 @@ int get_arglist_exp(char_u *str, int *fcountp, char_u ***fnamesp, bool wig) get_arglist(&ga, (char *)str, true); if (wig) { - i = expand_wildcards(ga.ga_len, (char_u **)ga.ga_data, + i = expand_wildcards(ga.ga_len, ga.ga_data, fcountp, fnamesp, EW_FILE|EW_NOTFOUND|EW_NOTWILD); } else { - i = gen_expand_wildcards(ga.ga_len, (char_u **)ga.ga_data, + i = gen_expand_wildcards(ga.ga_len, ga.ga_data, fcountp, fnamesp, EW_FILE|EW_NOTFOUND|EW_NOTWILD); } @@ -949,8 +950,8 @@ static int do_arglist(char *str, int what, int after, bool will_edit) } ga_clear(&new_ga); } else { - int i = expand_wildcards(new_ga.ga_len, (char_u **)new_ga.ga_data, - &exp_count, (char_u ***)&exp_files, + int i = expand_wildcards(new_ga.ga_len, new_ga.ga_data, + &exp_count, &exp_files, EW_DIR|EW_FILE|EW_ADDSLASH|EW_NOTFOUND); ga_clear(&new_ga); if (i == FAIL || exp_count == 0) { |