diff options
| author | Jurica Bradaric <jbradaric@gmail.com> | 2016-09-18 16:20:08 +0200 |
|---|---|---|
| committer | Jurica Bradaric <jbradaric@gmail.com> | 2016-09-18 17:26:39 +0200 |
| commit | 7bf0cfb01f860a4fb2fdb88de752293ea023f4f6 (patch) | |
| tree | a2af98482fa1518cd2265235968f8dd5682a555e | |
| parent | 7b6786f6f9b866faaefcd6e87d440f3f9b8c1fc5 (diff) | |
| download | rneovim-7bf0cfb01f860a4fb2fdb88de752293ea023f4f6.tar.gz rneovim-7bf0cfb01f860a4fb2fdb88de752293ea023f4f6.tar.bz2 rneovim-7bf0cfb01f860a4fb2fdb88de752293ea023f4f6.zip | |
vim-patch:7.4.1670
Problem: Completion doesn't work well for a variable containing "vim/vim#".
Solution: Recognize the "vim/vim#". (Watiko)
https://github.com/vim/vim/commit/a32095fc8fdf5fe3d487c86d9cc54adb1236731e
| -rw-r--r-- | src/nvim/eval.c | 4 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index c762ce9fff..7d7aea83af 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -2684,6 +2684,10 @@ void set_context_for_expression(expand_T *xp, char_u *arg, cmdidx_T cmdidx) } else if (c == '=') { got_eq = TRUE; xp->xp_context = EXPAND_EXPRESSION; + } else if (c == '#' + && xp->xp_context == EXPAND_EXPRESSION) { + // Autoload function/variable contains '#' + break; } else if ((c == '<' || c == '#') && xp->xp_context == EXPAND_FUNCTIONS && vim_strchr(xp->xp_pattern, '(') == NULL) { diff --git a/src/nvim/version.c b/src/nvim/version.c index 439deab139..a62f348398 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -773,7 +773,7 @@ static int included_patches[] = { 1673, // 1672 NA // 1671, - // 1670, + 1670, // 1669 NA // 1668 NA // 1667 NA |