updated for version 7.0-115

diff --git a/src/edit.c b/src/edit.c
index 4858d025562288da30ece65f37ce8eedd1b4dec9..b00608554edb6a61996830ac131fb550a0f9583e 100644 (file)
--- a/src/edit.c
+++ b/src/edit.c
@@ -2157,7 +2157,7 @@ ins_compl_add(str, len, icase, fname, cptext, cdir, flags, adup)
        do
        {
            if (    !(match->cp_flags & ORIGINAL_TEXT)
-                   && ins_compl_equal(match, str, len)
+                   && STRNCMP(match->cp_str, str, len) == 0
                    && match->cp_str[len] == NUL)
                return NOTDONE;
            match = match->cp_next;
@@ -4042,7 +4042,7 @@ ins_compl_get_exp(ini)
            if (got_int)
                break;
            /* Fill the popup menu as soon as possible. */
-           if (pum_wanted() && type != -1)
+           if (type != -1)
                ins_compl_check_keys(0);
 
            if ((ctrl_x_mode != 0 && ctrl_x_mode != CTRL_X_WHOLE_LINE)

diff --git a/src/version.c b/src/version.c
index 5aaccff3ae0f4c9fc528b9fbfd2fdd95c391d5ce..e32783063b36f07ec523613cdfe905ef8d458a4c 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 */
+/**/
+    115,
 /**/
     114,
 /**/