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 17bbc6f2eec9316697e006d3b2ff0a4ebc31854d..badebb0bd69b2756ecaf21af62df45b5bcc390e5 100644 (file)
--- 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 b05c84345ee43c4a999da16541e30929e3d8e03a..accf0b9b33a2e724d78e40499a39c753f68ec5fb 100644 (file)
--- 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,
 /**/