summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2012-01-26 14:32:30 +0100
committerBram Moolenaar <Bram@vim.org>2012-01-26 14:32:30 +0100
commitabe838b099c4d5cb378c56170caa53b69d6a875b (patch)
treef75c5df62e0cd0eae667f59391af9453d0c8a27f /src
parent06af60244e0a3e32c8790bce6be40b9c5f330b82 (diff)
downloadvim-abe838b099c4d5cb378c56170caa53b69d6a875b.zip
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.
Diffstat (limited to 'src')
-rw-r--r--src/eval.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
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
@@ -715,6 +715,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 415,
+/**/
414,
/**/
413,