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 ea7f9090aae794c83d400c5ac9a294216d2858da..2c093d4154e630f89abaa28aff258aef571f4e9c 100644 (file)
--- 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 826ee1debe3413e86b59f93d0d57d1664ba03b6d..7039002fc5c4550d3de40916870d8b5cc010105a 100644 (file)
--- 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,
 /**/