mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-04 17:06:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4267 from watiko/vim-7.4.932

Browse Source 
vim-patch:7.4.{926,932,933}
This commit is contained in:
Justin M. Keyes
2016-02-22 01:10:50 -05:00
parent 44179d7444 c9f4f828d5
commit 95230ec702
3 changed files with 60 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/nvim/ex_getln.c
View File

@@ -2957,20 +2957,37 @@ ExpandOne (
}
}
/* Find longest common part */
// Find longest common part
if (mode == WILD_LONGEST && xp->xp_numfiles > 0) {
size_t len;
for (len = 0; xp->xp_files[0][len]; ++len) {
for (i = 0; i < xp->xp_numfiles; ++i) {
size_t mb_len = 1;
int c0;
int ci;
for (len = 0; xp->xp_files[0][len]; len += mb_len) {
if (has_mbyte) {
mb_len = (* mb_ptr2len)(&xp->xp_files[0][len]);
c0 = (* mb_ptr2char)(&xp->xp_files[0][len]);
} else {
c0 = xp->xp_files[0][len];
}
for (i = 1; i < xp->xp_numfiles; ++i) {
if (has_mbyte) {
ci =(* mb_ptr2char)(&xp->xp_files[i][len]);
} else {
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 (vim_tolower(c0) != vim_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) {
if (!(options & WILD_NO_BEEP)) {
@@ -2979,8 +2996,9 @@ ExpandOne (
break;
}
}
ss = (char_u *)xstrndup((char *)xp->xp_files[0], len);
findex = -1; /* next p_wc gets first one */
findex = -1; // next p_wc gets first one
}
// Concatenate all matching names

8
src/nvim/version.c
View File

@@ -355,16 +355,16 @@ static int included_patches[] = {
// 938 NA
// 937,
// 936,
// 935,
// 935 NA
// 934 NA
// 933,
// 932,
933,
932,
// 931 NA
// 930 NA
929,
// 928 NA
// 927 NA
// 926,
926,
// 925,
// 924 NA
// 923 NA