From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 26 Jan 2012 13:32:30 +0000 (+0100)
Subject: updated for version 7.3.415
X-Git-Tag: v7.3.415
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=abe838b099c4d5cb378c56170caa53b69d6a875b;p=vim

updated for version 7.3.415
Problem:    Completion of functions stops once a dictionary is encountered.
            (James McCoy)
Solution:   Return an empty string instead of NULL.
---

diff --git a/src/eval.c b/src/eval.c
index 4ba4121d7..c63a5e0e5 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -21802,7 +21802,7 @@ get_user_func_name(xp, idx)
 	fp = HI2UF(hi);
 
 	if (fp->uf_flags & FC_DICT)
-	    return NULL; /* don't show dict functions */
+	    return ""; /* don't show dict functions */
 
 	if (STRLEN(fp->uf_name) + 4 >= IOSIZE)
 	    return fp->uf_name;	/* prevents overflow */
diff --git a/src/version.c b/src/version.c
index f7ddf644d..cdd57ad1b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -714,6 +714,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    415,
 /**/
     414,
 /**/