diff --git a/src/edit.c b/src/edit.c
index 08b555b..9a0abf9 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -5189,6 +5189,11 @@
 		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 2d82cd8..8dadac4 100644
--- a/src/version.c
+++ b/src/version.c
@@ -715,6 +715,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    418,
+/**/
     417,
 /**/
     416,