aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

updated for version 7.3.888

Browse Source 
Problem:    Filename completion with 'fileignorecase' does not work for
            multi-byte characters.
Solution:   Make 'fileignorecase' work properly. (Hirohito Higashi)
This commit is contained in:
Bram Moolenaar
2013-04-12 14:42:39 +02:00
parent e3e6e573d1
commit 38ec50bea8
2 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/misc2.c
View File

@@ -6099,52 +6099,59 @@ pathcmp(p, q, maxlen)
int maxlen; int maxlen;
{ {
int i; int i;
int c1, c2;
const char *s = NULL; const char *s = NULL;
for (i = 0; maxlen < 0 || i < maxlen; ++i) for (i = 0; maxlen < 0 || i < maxlen; i += MB_PTR2LEN((char_u *)p + i))
{ {
c1 = PTR2CHAR((char_u *)p + i);
c2 = PTR2CHAR((char_u *)q + i);
/* End of "p": check if "q" also ends or just has a slash. */ /* End of "p": check if "q" also ends or just has a slash. */
if (p[i] == NUL) if (c1 == NUL)
{ {
if (q[i] == NUL) /* full match */ if (c2 == NUL) /* full match */
return 0; return 0;
s = q; s = q;
break; break;
} }
/* End of "q": check if "p" just has a slash. */ /* End of "q": check if "p" just has a slash. */
if (q[i] == NUL) if (c2 == NUL)
{ {
s = p; s = p;
break; break;
} }
if ((p_fic ? TOUPPER_LOC(p[i]) != TOUPPER_LOC(q[i]) : p[i] != q[i]) if ((p_fic ? MB_TOUPPER(c1) != MB_TOUPPER(c2) : c1 != c2)
#ifdef BACKSLASH_IN_FILENAME #ifdef BACKSLASH_IN_FILENAME
/* consider '/' and '\\' to be equal */ /* consider '/' and '\\' to be equal */
&& !((p[i] == '/' && q[i] == '\\') && !((c1 == '/' && c2 == '\\')
|| (p[i] == '\\' && q[i] == '/')) || (c1 == '\\' && c2 == '/'))
#endif #endif
) )
{ {
if (vim_ispathsep(p[i])) if (vim_ispathsep(c1))
return -1; return -1;
if (vim_ispathsep(q[i])) if (vim_ispathsep(c2))
return 1; return 1;
return ((char_u *)p)[i] - ((char_u *)q)[i]; /* no match */ return p_fic ? MB_TOUPPER(c1) - MB_TOUPPER(c2)
: c1 - c2; /* no match */
} }
} }
if (s == NULL) /* "i" ran into "maxlen" */ if (s == NULL) /* "i" ran into "maxlen" */
return 0; return 0;
c1 = PTR2CHAR((char_u *)s + i);
c2 = PTR2CHAR((char_u *)s + i + MB_PTR2LEN((char_u *)s + i));
/* ignore a trailing slash, but not "//" or ":/" */ /* ignore a trailing slash, but not "//" or ":/" */
if (s[i + 1] == NUL if (c2 == NUL
&& i > 0 && i > 0
&& !after_pathsep((char_u *)s, (char_u *)s + i) && !after_pathsep((char_u *)s, (char_u *)s + i)
#ifdef BACKSLASH_IN_FILENAME #ifdef BACKSLASH_IN_FILENAME
&& (s[i] == '/' || s[i] == '\\') && (c1 == '/' || c1 == '\\')
#else #else
&& s[i] == '/' && c1 == '/'
#endif #endif
) )
return 0; /* match with trailing slash */ return 0; /* match with trailing slash */

2
src/version.c
View File

@@ -728,6 +728,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 */
/**/
888,
/**/ /**/
887, 887,
/**/ /**/