# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1459186206 -7200
# Node ID 4b83af41f5dbbcdaab1769e7cd48bf4577f07afa
# Parent  bc5139e55a67ea1251aba143cf170abe397ae68f
commit https://github.com/vim/vim/commit/a32095fc8fdf5fe3d487c86d9cc54adb1236731e
Author: Bram Moolenaar <Bram@vim.org>
Date:   Mon Mar 28 19:27:13 2016 +0200

    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
--- 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
--- a/src/version.c
+++ b/src/version.c
@@ -749,6 +749,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1670,
+/**/
     1669,
 /**/
     1668,