From: Bram Moolenaar <Bram@vim.org>
Date: Mon, 28 Mar 2016 17:27:13 +0000 (+0200)
Subject: patch 7.4.1670
X-Git-Tag: v7.4.1670
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a32095fc8fdf5fe3d487c86d9cc54adb1236731e;p=vim

patch 7.4.1670
Problem:    Completion doesn't work well for a variable containing "#".
Solution:   Recognize the "#". (Watiko)
---

diff --git a/src/eval.c b/src/eval.c
index ea7f9090a..2c093d415 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -3399,6 +3399,12 @@ set_context_for_expression(
 	    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/version.c b/src/version.c
index 826ee1deb..7039002fc 100644
--- a/src/version.c
+++ b/src/version.c
@@ -748,6 +748,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1670,
 /**/
     1669,
 /**/