updated for version 7.3.418

Problem:    When a user complete function returns -1 an error message is
            given.
Solution:   When -2 is returned stop completion silently. (Yasuhiro Matsumoto)

diff --git a/src/edit.c b/src/edit.c
index 08b555ba2c69bcd62e833c83f670261756217745..9a0abf94f48bea9f499aee0efb8872a7748452fc 100644 (file)
--- 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 2d82cd80c7bd19775a89717aa4de443481a90ef7..8dadac45066ac1ac6b5116a83a97b28efd10ed1e 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 */
+/**/
+    418,
 /**/
     417,
 /**/