From: Bram Moolenaar <Bram@vim.org>
Date: Fri, 18 May 2012 14:35:21 +0000 (+0200)
Subject: updated for version 7.3.519
X-Git-Tag: v7.3.519
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8a4c136a90574ae1800fd088818f0e3bceaa9f21;p=thirdparty%2Fvim.git

updated for version 7.3.519
Problem:    When completefunction returns it cannot indicate end of completion
            mode.
Solution:   Recognize completefunction returning -3.  (Mtsushita Shougo)
---

diff --git a/src/edit.c b/src/edit.c
index 17bbc6f2ee..badebb0bd6 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -5205,9 +5205,17 @@ ins_complete(c)
 	    }
 
 	    /* Return value -2 means the user complete function wants to
-	     * cancel the complete without an error. */
+	     * cancel the complete without an error.
+	     * Return value -3 does the same as -2 and leaves CTRL-X mode.*/
 	    if (col == -2)
 		return FAIL;
+	    if (col == -3)
+	    {
+		ctrl_x_mode = 0;
+		edit_submode = NULL;
+		msg_clr_cmdline();
+		return FAIL;
+	    }
 
 	    /*
 	     * Reset extended parameters of completion, when start new
diff --git a/src/version.c b/src/version.c
index b05c84345e..accf0b9b33 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 */
+/**/
+    519,
 /**/
     518,
 /**/