Mirror of the Vim source from https://github.com/vim/vim
Revision | 3f8cf4c668c30ec99289b5683f4fd36a1df602fa (tree) |
---|---|
Zeit | 2006-10-03 22:49:29 |
Autor | vimboss |
Commiter | vimboss |
updated for version 7.0-115
@@ -2157,7 +2157,7 @@ | ||
2157 | 2157 | do |
2158 | 2158 | { |
2159 | 2159 | if ( !(match->cp_flags & ORIGINAL_TEXT) |
2160 | - && ins_compl_equal(match, str, len) | |
2160 | + && STRNCMP(match->cp_str, str, len) == 0 | |
2161 | 2161 | && match->cp_str[len] == NUL) |
2162 | 2162 | return NOTDONE; |
2163 | 2163 | match = match->cp_next; |
@@ -4042,7 +4042,7 @@ | ||
4042 | 4042 | if (got_int) |
4043 | 4043 | break; |
4044 | 4044 | /* Fill the popup menu as soon as possible. */ |
4045 | - if (pum_wanted() && type != -1) | |
4045 | + if (type != -1) | |
4046 | 4046 | ins_compl_check_keys(0); |
4047 | 4047 | |
4048 | 4048 | if ((ctrl_x_mode != 0 && ctrl_x_mode != CTRL_X_WHOLE_LINE) |
@@ -667,6 +667,8 @@ | ||
667 | 667 | static int included_patches[] = |
668 | 668 | { /* Add new patch number below this line */ |
669 | 669 | /**/ |
670 | + 115, | |
671 | +/**/ | |
670 | 672 | 114, |
671 | 673 | /**/ |
672 | 674 | 113, |