diff options
| author | vimboss <devnull@localhost> | 2006-08-29 14:30:35 +0000 |
|---|---|---|
| committer | vimboss <devnull@localhost> | 2006-08-29 14:30:35 +0000 |
| commit | 258402d3e3ddb3e28f47a5c329f699de63b8c24f (patch) | |
| tree | 566fc50e94c957674cd347a631eef928f69705f9 | |
| parent | 966545cd83832aff34fb91285e7d61e3bc5b2b87 (diff) | |
| download | vim-258402d3e3ddb3e28f47a5c329f699de63b8c24f.tar.gz | |
| -rw-r--r-- | src/edit.c | 14 | ||||
| -rw-r--r-- | src/search.c | 2 | ||||
| -rw-r--r-- | src/spell.c | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 11 insertions, 9 deletions
@@ -2405,7 +2405,7 @@ set_completion(startcol, list) /* compl_pattern doesn't need to be set */ compl_orig_text = vim_strnsave(ml_get_curline() + compl_col, compl_length); if (compl_orig_text == NULL || ins_compl_add(compl_orig_text, - -1, FALSE, NULL, NULL, 0, ORIGINAL_TEXT, FALSE) != OK) + -1, p_ic, NULL, NULL, 0, ORIGINAL_TEXT, FALSE) != OK) return; /* Handle like dictionary completion. */ @@ -2821,7 +2821,7 @@ ins_compl_files(count, files, thesaurus, flags, regmatch, buf, dir) ptr = find_word_end(ptr); add_r = ins_compl_add_infercase(regmatch->startp[0], (int)(ptr - regmatch->startp[0]), - FALSE, files[i], *dir, 0); + p_ic, files[i], *dir, 0); if (thesaurus) { char_u *wstart; @@ -2857,7 +2857,7 @@ ins_compl_files(count, files, thesaurus, flags, regmatch, buf, dir) ptr = find_word_end(ptr); add_r = ins_compl_add_infercase(wstart, (int)(ptr - wstart), - FALSE, files[i], *dir, 0); + p_ic, files[i], *dir, 0); } } if (add_r == OK) @@ -3826,7 +3826,7 @@ ins_compl_get_exp(ini) TAG_INS_COMP | (ctrl_x_mode ? TAG_VERBOSE : 0), TAG_MANY, curbuf->b_ffname) == OK && num_matches > 0) { - ins_compl_add_matches(num_matches, matches, FALSE); + ins_compl_add_matches(num_matches, matches, p_ic); } p_ic = save_p_ic; break; @@ -3867,7 +3867,7 @@ ins_compl_get_exp(ini) num_matches = expand_spelling(first_match_pos.lnum, first_match_pos.col, compl_pattern, &matches); if (num_matches > 0) - ins_compl_add_matches(num_matches, matches, FALSE); + ins_compl_add_matches(num_matches, matches, p_ic); #endif break; @@ -4001,7 +4001,7 @@ ins_compl_get_exp(ini) continue; } } - if (ins_compl_add_infercase(ptr, len, FALSE, + if (ins_compl_add_infercase(ptr, len, p_ic, ins_buf == curbuf ? NULL : ins_buf->b_sfname, 0, flags) != NOTDONE) { @@ -4809,7 +4809,7 @@ ins_complete(c) vim_free(compl_orig_text); compl_orig_text = vim_strnsave(line + compl_col, compl_length); if (compl_orig_text == NULL || ins_compl_add(compl_orig_text, - -1, FALSE, NULL, NULL, 0, ORIGINAL_TEXT, FALSE) != OK) + -1, p_ic, NULL, NULL, 0, ORIGINAL_TEXT, FALSE) != OK) { vim_free(compl_pattern); compl_pattern = NULL; diff --git a/src/search.c b/src/search.c index a8a390e1..1bbc2776 100644 --- a/src/search.c +++ b/src/search.c @@ -4871,7 +4871,7 @@ search_line: goto exit_matched; } - add_r = ins_compl_add_infercase(aux, i, FALSE, + add_r = ins_compl_add_infercase(aux, i, p_ic, curr_fname == curbuf->b_fname ? NULL : curr_fname, dir, reuse); if (add_r == OK) diff --git a/src/spell.c b/src/spell.c index 8b653364..ad139708 100644 --- a/src/spell.c +++ b/src/spell.c @@ -15658,7 +15658,7 @@ dump_word(slang, word, pat, dir, dumpflags, wordflags, lnum) ? MB_STRNICMP(p, pat, STRLEN(pat)) == 0 : STRNCMP(p, pat, STRLEN(pat)) == 0) && ins_compl_add_infercase(p, (int)STRLEN(p), - FALSE, NULL, *dir, 0) == OK) + p_ic, NULL, *dir, 0) == OK) /* if dir was BACKWARD then honor it just once */ *dir = FORWARD; } diff --git a/src/version.c b/src/version.c index 14292893..cfbf39d5 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 */ /**/ + 68, +/**/ 67, /**/ 66, |