diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2014-12-18 12:57:39 -0500 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2014-12-18 12:57:39 -0500 |
| commit | bd19cc4f8fc3d02a030caba911a1af008585f688 (patch) | |
| tree | b25d967fdd23c9a5333ff50a5ace16dfd7cbe519 /src/nvim/os_unix.c | |
| parent | cef6ec9dfcdef723d6a332bddbb96f96151b2643 (diff) | |
| parent | c780075afad41fd4de30212845becdca83c4dd7c (diff) | |
| download | rneovim-bd19cc4f8fc3d02a030caba911a1af008585f688.tar.gz rneovim-bd19cc4f8fc3d02a030caba911a1af008585f688.tar.bz2 rneovim-bd19cc4f8fc3d02a030caba911a1af008585f688.zip | |
Merge pull request #1701 from fwalch/vim-7.4.423
vim-patch:7.4.423
Diffstat (limited to 'src/nvim/os_unix.c')
| -rw-r--r-- | src/nvim/os_unix.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/nvim/os_unix.c b/src/nvim/os_unix.c index a9c1fec0b4..612f475933 100644 --- a/src/nvim/os_unix.c +++ b/src/nvim/os_unix.c @@ -1066,10 +1066,12 @@ int mch_expand_wildcards(int num_pat, char_u **pat, int *num_file, || pat[i][j + 1] == '`') *p++ = '\\'; ++j; - } else if (!intick && vim_strchr(SHELL_SPECIAL, - pat[i][j]) != NULL) + } else if (!intick + && ((flags & EW_KEEPDOLLAR) == 0 || pat[i][j] != '$') + && vim_strchr(SHELL_SPECIAL, pat[i][j]) != NULL) /* Put a backslash before a special character, but not - * when inside ``. */ + * when inside ``. And not for $var when EW_KEEPDOLLAR is + * set. */ *p++ = '\\'; /* Copy one character. */ |