diff --git a/src/edit.c b/src/edit.c
index 08b555ba2c..9a0abf94f4 100644
--- 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
index 2d82cd80c7..8dadac4506 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 */
+/**/
+    418,
 /**/
     417,
 /**/