aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames McCoy <jamessan@jamessan.com>2016-09-26 22:51:37 -0400
committerGitHub <noreply@github.com>2016-09-26 22:51:37 -0400
commitddb9f027126b54e6015401c4f0320db4f25d2a5a (patch)
tree4b6f7d7e7492916b28a02890f7eff8d66d6a2ee7
parentf610b807b48dbaf96fe05459927a8c926b67f8bb (diff)
parent7bf0cfb01f860a4fb2fdb88de752293ea023f4f6 (diff)
downloadrneovim-ddb9f027126b54e6015401c4f0320db4f25d2a5a.tar.gz
rneovim-ddb9f027126b54e6015401c4f0320db4f25d2a5a.tar.bz2
rneovim-ddb9f027126b54e6015401c4f0320db4f25d2a5a.zip
Merge pull request #5356 from jbradaric/vim-7.4.1670
vim-patch:7.4.1670
-rw-r--r--src/nvim/eval.c4
-rw-r--r--src/nvim/version.c2
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 b403ccfb80..dc5e313579 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