diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2016-05-04 21:32:53 -0400 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2016-05-04 21:32:53 -0400 |
| commit | a62cc5f807a6dc730c871c1fd53f29805a9cdc6e (patch) | |
| tree | 03e26246b5a89ffcd584b0b33f69dbf857450344 /src/nvim/os_unix.c | |
| parent | e2cc3f98fb3ca771d9bd108ae9c37c19bea8025b (diff) | |
| parent | 11f41a3c8c4b667b30db38875b37d5d25979003e (diff) | |
| download | rneovim-a62cc5f807a6dc730c871c1fd53f29805a9cdc6e.tar.gz rneovim-a62cc5f807a6dc730c871c1fd53f29805a9cdc6e.tar.bz2 rneovim-a62cc5f807a6dc730c871c1fd53f29805a9cdc6e.zip | |
Merge pull request #4678 from KillTheMule/vim-7.4.672
vim-patch:7.4.672
Diffstat (limited to 'src/nvim/os_unix.c')
| -rw-r--r-- | src/nvim/os_unix.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/nvim/os_unix.c b/src/nvim/os_unix.c index 63a3dbc054..2ed0c2c856 100644 --- a/src/nvim/os_unix.c +++ b/src/nvim/os_unix.c @@ -576,9 +576,11 @@ int mch_expand_wildcards(int num_pat, char_u **pat, int *num_file, if ((dir && !(flags & EW_DIR)) || (!dir && !(flags & EW_FILE))) continue; - /* Skip files that are not executable if we check for that. */ - if (!dir && (flags & EW_EXEC) && !os_can_exe((*file)[i], NULL)) + // Skip files that are not executable if we check for that. + if (!dir && (flags & EW_EXEC) + && !os_can_exe((*file)[i], NULL, !(flags & EW_SHELLCMD))) { continue; + } p = xmalloc(STRLEN((*file)[i]) + 1 + dir); STRCPY(p, (*file)[i]); |