Mercurial > vim

changeset 3516:ebec52bc2800 v7.3.519

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.3.519 Problem: When completefunction returns it cannot indicate end of completion mode. Solution: Recognize completefunction returning -3. (Mtsushita Shougo)
author Bram Moolenaar <bram@vim.org>
date Fri, 18 May 2012 16:35:21 +0200
parents 402e07514b00
children 20507e1e60e8
files src/edit.c src/version.c
diffstat 2 files changed, 11 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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 */
 /**/
+    519,
+/**/
     518,
 /**/
     517,