updated for version 7.0-061

diff --git a/src/edit.c b/src/edit.c
index 4ee21d5f36177c93d461b22d72b43161d30de403..a8044151b0dda10ea04c726c0ce105d8d4eae763 100644 (file)
--- a/src/edit.c
+++ b/src/edit.c
@@ -4691,18 +4691,12 @@ ins_complete(c)
                                     (int)STRLEN(compl_pattern), curs_col);
            if (compl_xp.xp_context == EXPAND_UNSUCCESSFUL
                    || compl_xp.xp_context == EXPAND_NOTHING)
-           {
+               /* No completion possible, use an empty pattern to get a
+                * "pattern not found" message. */
                compl_col = curs_col;
-               compl_length = 0;
-               vim_free(compl_pattern);
-               compl_pattern = NULL;
-           }
            else
-           {
-               startcol = (int)(compl_xp.xp_pattern - compl_pattern);
-               compl_col = startcol;
-               compl_length = curs_col - startcol;
-           }
+               compl_col = (int)(compl_xp.xp_pattern - compl_pattern);
+           compl_length = curs_col - compl_col;
        }
        else if (ctrl_x_mode == CTRL_X_FUNCTION || ctrl_x_mode == CTRL_X_OMNI)
        {

diff --git a/src/version.c b/src/version.c
index 5cfc2346ee2b92317e591ee0494cec5d455f4aa8..7ed4e4b23689592583f3c27244f09ef4c5dd7d9c 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    61,
 /**/
     60,
 /**/