summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2014-11-12 20:09:06 +0100
committerBram Moolenaar <Bram@vim.org>2014-11-12 20:09:06 +0100
commit8a349ff944dc01ca0e52f10144d8660aab430c9c (patch)
tree15ea3eca880eadb7c2e6e26d7056802af67d5a57
parent54fb43813443554c685306b92166218c53cdb18f (diff)
updated for version 7.4.516v7.4.516
Problem: Completing a function name containing a # does not work. Issue 253. Solution: Recognize the # character. (Christian Brabandt)
-rw-r--r--src/eval.c4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/eval.c b/src/eval.c
index ea24a9c37f..1b1072cd80 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -3368,11 +3368,11 @@ set_context_for_expression(xp, arg, cmdidx)
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)
diff --git a/src/version.c b/src/version.c
index 2f524c85d6..826679ef38 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 516,
+/**/
515,
/**/
514,