Mercurial > vim
changeset 7235:e45271250496 v7.4.926
commit https://github.com/vim/vim/commit/4f8fa1633cdfbd09a41160c8480fe67c198067e9
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Nov 19 19:00:05 2015 +0100
patch 7.4.926
Problem: Completing the longest match doesn't work properly with multi-byte
characters.
Solution: When using multi-byte characters use another way to find the
longest match. (Hirohito Higashi)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Thu, 19 Nov 2015 19:15:04 +0100 |
| parents | 7f588bdd1b03 |
| children | 99a879745889 |
| files | src/ex_getln.c src/testdir/test_utf8.in src/testdir/test_utf8.ok src/version.c |
| diffstat | 4 files changed, 47 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ex_getln.c +++ b/src/ex_getln.c @@ -3691,20 +3691,37 @@ ExpandOne(xp, str, orig, options, mode) /* Find longest common part */ if (mode == WILD_LONGEST && xp->xp_numfiles > 0) { - for (len = 0; xp->xp_files[0][len]; ++len) + int mb_len = 1; + int c0, ci; + + for (len = 0; xp->xp_files[0][len]; len += mb_len) { - for (i = 0; i < xp->xp_numfiles; ++i) +#ifdef FEAT_MBYTE + if (has_mbyte) { + mb_len = (*mb_ptr2len)(&xp->xp_files[0][len]); + c0 =(* mb_ptr2char)(&xp->xp_files[0][len]); + } + else +#endif + c0 = xp->xp_files[i][len]; + for (i = 1; i < xp->xp_numfiles; ++i) + { +#ifdef FEAT_MBYTE + if (has_mbyte) + ci =(* mb_ptr2char)(&xp->xp_files[i][len]); + else +#endif + ci = xp->xp_files[i][len]; if (p_fic && (xp->xp_context == EXPAND_DIRECTORIES || xp->xp_context == EXPAND_FILES || xp->xp_context == EXPAND_SHELLCMD || xp->xp_context == EXPAND_BUFFERS)) { - if (TOLOWER_LOC(xp->xp_files[i][len]) != - TOLOWER_LOC(xp->xp_files[0][len])) + if (MB_TOLOWER(c0) != MB_TOLOWER(ci)) break; } - else if (xp->xp_files[i][len] != xp->xp_files[0][len]) + else if (c0 != ci) break; } if (i < xp->xp_numfiles) @@ -3714,6 +3731,7 @@ ExpandOne(xp, str, orig, options, mode) break; } } + ss = alloc((unsigned)len + 1); if (ss) vim_strncpy(ss, xp->xp_files[0], (size_t)len);
--- a/src/testdir/test_utf8.in +++ b/src/testdir/test_utf8.in @@ -17,6 +17,25 @@ STARTTEST : $put=strchars(str, 0) : $put=strchars(str, 1) :endfor +:" Test for customlist completion +:function! CustomComplete1(lead, line, pos) +: return ['あ', 'い'] +:endfunction +:command -nargs=1 -complete=customlist,CustomComplete1 Test1 : +:call feedkeys(":Test1 \<C-L>'\<C-B>$put='\<CR>", 't') +: +:function! CustomComplete2(lead, line, pos) +: return ['あたし', 'あたま', 'あたりめ'] +:endfunction +:command -nargs=1 -complete=customlist,CustomComplete2 Test2 : +:call feedkeys(":Test2 \<C-L>'\<C-B>$put='\<CR>", 't') +: +:function! CustomComplete3(lead, line, pos) +: return ['Nこ', 'Nん', 'Nぶ'] +:endfunction +:command -nargs=1 -complete=customlist,CustomComplete3 Test3 : +:call feedkeys(":Test3 \<C-L>'\<C-B>$put='\<CR>", 't') +: :call garbagecollect(1) :/^start:/,$wq! test.out ENDTEST