diff options
| author | James McCoy <jamessan@jamessan.com> | 2017-04-29 21:49:19 -0400 |
|---|---|---|
| committer | James McCoy <jamessan@jamessan.com> | 2017-04-29 23:48:28 -0400 |
| commit | b6e36558d1e119a4382e96495b0e1faf402197f3 (patch) | |
| tree | e0aa34e535add8f982d797fa374080b5818bb727 /src/nvim/ex_docmd.c | |
| parent | f219657453271f19519148d76536879bec044534 (diff) | |
| download | rneovim-b6e36558d1e119a4382e96495b0e1faf402197f3.tar.gz rneovim-b6e36558d1e119a4382e96495b0e1faf402197f3.tar.bz2 rneovim-b6e36558d1e119a4382e96495b0e1faf402197f3.zip | |
vim-patch:8.0.0150
Problem: When the pattern of :filter does not have a separator then
completion of the command fails.
Solution: Skip over the pattern. (Ozaki Kiichi, clodes vim/vim#1299)
https://github.com/vim/vim/commit/7069bf18e1b1b7bc7640335e07d1022b5acc9048
Diffstat (limited to 'src/nvim/ex_docmd.c')
| -rw-r--r-- | src/nvim/ex_docmd.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c index 2eaf92df00..e844c89516 100644 --- a/src/nvim/ex_docmd.c +++ b/src/nvim/ex_docmd.c @@ -3045,7 +3045,6 @@ const char * set_one_cmd_context( case CMD_cfdo: case CMD_confirm: case CMD_debug: - case CMD_filter: case CMD_folddoclosed: case CMD_folddoopen: case CMD_hide: @@ -3070,6 +3069,16 @@ const char * set_one_cmd_context( case CMD_windo: return arg; + case CMD_filter: + if (*arg != NUL) { + arg = (const char *)skip_vimgrep_pat((char_u *)arg, NULL, NULL); + } + if (arg == NULL || *arg == NUL) { + xp->xp_context = EXPAND_NOTHING; + return NULL; + } + return (const char *)skipwhite((const char_u *)arg); + case CMD_match: if (*arg == NUL || !ends_excmd(*arg)) { /* also complete "None" */ |