diff options
| author | Florian Walch <florian@fwalch.com> | 2014-12-23 21:41:30 +0100 |
|---|---|---|
| committer | Florian Walch <florian@fwalch.com> | 2014-12-24 00:32:53 +0100 |
| commit | 328617640617b07441b5cde8470c103f5d4591d6 (patch) | |
| tree | 19e56c975c6b094b2a509d7b6444ce81110c383c | |
| parent | 5e542ba56e7d34516ebe7d717b84959d476eb04c (diff) | |
| download | rneovim-328617640617b07441b5cde8470c103f5d4591d6.tar.gz rneovim-328617640617b07441b5cde8470c103f5d4591d6.tar.bz2 rneovim-328617640617b07441b5cde8470c103f5d4591d6.zip | |
vim-patch:7.4.516
Problem: Completing a function name containing a # does not work. Issue
253.
Solution: Recognize the # character. (Christian Brabandt)
https://code.google.com/p/vim/source/detail?r=v7-4-516
| -rw-r--r-- | src/nvim/eval.c | 4 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index ffae24a380..116944b28d 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -2580,10 +2580,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 == '<' + } else if ((c == '<' || c == '#') && xp->xp_context == EXPAND_FUNCTIONS && vim_strchr(xp->xp_pattern, '(') == NULL) { - /* Function name can start with "<SNR>" */ + /* Function name can start with "<SNR>" and contain '#'. */ break; } else if (cmdidx != CMD_let || got_eq) { if (c == '"') { /* string */ diff --git a/src/nvim/version.c b/src/nvim/version.c index 039a49006e..4d068627af 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -222,7 +222,7 @@ static int included_patches[] = { //519, //518, //517, - //516, + 516, //515, //514, 513, |