From 328617640617b07441b5cde8470c103f5d4591d6 Mon Sep 17 00:00:00 2001
From: Florian Walch <florian@fwalch.com>
Date: Tue, 23 Dec 2014 21:41:30 +0100
Subject: vim-patch:7.4.516

Problem:    Completing a function name containing a # does not work.  Issue
	    253.
Solution:   Recognize the # character. (Christian Brabandt)

https://code.google.com/p/vim/source/detail?r=v7-4-516
---
 src/nvim/eval.c    | 4 ++--
 src/nvim/version.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index ffae24a380..116944b28d 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -2580,10 +2580,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 == '<'
+    } 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) {
       if (c == '"') {               /* string */
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 039a49006e..4d068627af 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -222,7 +222,7 @@ static int included_patches[] = {
   //519,
   //518,
   //517,
-  //516,
+  516,
   //515,
   //514,
   513,
-- 
cgit