From 5948a57702e628ae1134c26cbfa02c97d4269503 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Tue, 3 Oct 2006 13:49:29 +0000 Subject: updated for version 7.0-115 --- src/edit.c | 4 ++-- src/version.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/edit.c b/src/edit.c index 4858d02556..b00608554e 100644 --- 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 5aaccff3ae..e32783063b 100644 --- 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, /**/ -- cgit v1.2.3