0
0
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00

updated for version 7.0-115

This commit is contained in:
Bram Moolenaar
2006-10-03 13:49:29 +00:00
parent d9dfd57f4a
commit 5948a57702
2 changed files with 4 additions and 2 deletions

View File

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

View File

@@ -666,6 +666,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
115,
/**/ /**/
114, 114,
/**/ /**/