diff options
| author | Bram Moolenaar <Bram@vim.org> | 2006-10-03 13:49:29 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2006-10-03 13:49:29 +0000 |
| commit | 5948a57702e628ae1134c26cbfa02c97d4269503 (patch) | |
| tree | 45a66cf9ebaf32a917139cf4f6182f2b656aed3c /src | |
| parent | d9dfd57f4a13e92417a32be419a0f1d2656d62dd (diff) | |
| download | vim-git-5948a57702e628ae1134c26cbfa02c97d4269503.tar.gz | |
updated for version 7.0-115v7.0.115
Diffstat (limited to 'src')
| -rw-r--r-- | src/edit.c | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/edit.c b/src/edit.c index 4858d0255..b00608554 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 5aaccff3a..e32783063 100644 --- a/src/version.c +++ b/src/version.c @@ -667,6 +667,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 115, +/**/ 114, /**/ 113, |