mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-01 15:38:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4239 from jbradaric/vim-7.4.885

Browse Source 
vim-patch:7.4.885
This commit is contained in:
Justin M. Keyes
2016-02-17 04:31:21 -05:00
parent bd7de9dac9 d12460123e
commit 498eb02049
2 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/nvim/file_search.c
View File

@@ -484,28 +484,21 @@ vim_findfile_init (
len = (int)(p - search_ctx->ffsc_fix_path) - 1; len = (int)(p - search_ctx->ffsc_fix_path) - 1;
STRNCAT(ff_expand_buffer, search_ctx->ffsc_fix_path, len); STRNCAT(ff_expand_buffer, search_ctx->ffsc_fix_path, len);
add_pathsep((char *)ff_expand_buffer); add_pathsep((char *)ff_expand_buffer);
} else } else {
len = (int)STRLEN(search_ctx->ffsc_fix_path); len = (int)STRLEN(search_ctx->ffsc_fix_path);
}
if (search_ctx->ffsc_wc_path != NULL) { if (search_ctx->ffsc_wc_path != NULL) {
wc_path = vim_strsave(search_ctx->ffsc_wc_path); wc_path = vim_strsave(search_ctx->ffsc_wc_path);
temp = xmalloc(STRLEN(search_ctx->ffsc_wc_path) temp = xmalloc(STRLEN(search_ctx->ffsc_wc_path)
+ STRLEN(search_ctx->ffsc_fix_path + len) + STRLEN(search_ctx->ffsc_fix_path + len)
+ 1); + 1);
} STRCPY(temp, search_ctx->ffsc_fix_path + len);
STRCAT(temp, search_ctx->ffsc_wc_path);
if (temp == NULL || wc_path == NULL) { xfree(search_ctx->ffsc_wc_path);
xfree(buf);
xfree(temp);
xfree(wc_path); xfree(wc_path);
goto error_return; search_ctx->ffsc_wc_path = temp;
} }
STRCPY(temp, search_ctx->ffsc_fix_path + len);
STRCAT(temp, search_ctx->ffsc_wc_path);
xfree(search_ctx->ffsc_wc_path);
xfree(wc_path);
search_ctx->ffsc_wc_path = temp;
} }
xfree(buf); xfree(buf);
} }

2
src/nvim/version.c
View File

@@ -403,7 +403,7 @@ static int included_patches[] = {
// 888, // 888,
887, 887,
// 886 NA // 886 NA
// 885, 885,
// 884 NA // 884 NA
883, 883,
// 882, // 882,