# HG changeset patch
# User Bram Moolenaar <bram@vim.org>
# Date 1327600718 -3600
# Node ID 4500a0ad2e0a24f54e5c4b4a3266456cd5ccb2eb
# Parent  a30e19f222a52a1cbe1a6625d24756b6814f11d3
updated for version 7.3.418
Problem:    When a user complete function returns -1 an error message is
	    given.
Solution:   When -2 is returned stop completion silently. (Yasuhiro Matsumoto)

diff --git a/src/edit.c b/src/edit.c
--- a/src/edit.c
+++ b/src/edit.c
@@ -5189,6 +5189,11 @@ ins_complete(c)
 		return FAIL;
 	    }
 
+	    /* Return value -2 means the user complete function wants to
+	     * cancel the complete without an error. */
+	    if (col == -2)
+		return FAIL;
+
 	    /*
 	     * Reset extended parameters of completion, when start new
 	     * completion.
diff --git a/src/version.c b/src/version.c
--- 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 */
 /**/
+    418,
+/**/
     417,
 /**/
     416,