diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2016-02-17 04:31:21 -0500 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2016-02-17 04:31:21 -0500 |
| commit | 498eb020498010c157e453daa8a1f3a518a82ff3 (patch) | |
| tree | 9a7b466a45b93c3aeb468eda66abaaa609958c94 /src | |
| parent | bd7de9dac9183bea61e53758721e523495839142 (diff) | |
| parent | d12460123e171c224f3aca3952f026590c935ad7 (diff) | |
| download | rneovim-498eb020498010c157e453daa8a1f3a518a82ff3.tar.gz rneovim-498eb020498010c157e453daa8a1f3a518a82ff3.tar.bz2 rneovim-498eb020498010c157e453daa8a1f3a518a82ff3.zip | |
Merge pull request #4239 from jbradaric/vim-7.4.885
vim-patch:7.4.885
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/file_search.c | 19 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 7 insertions, 14 deletions
diff --git a/src/nvim/file_search.c b/src/nvim/file_search.c index 3ad20991a4..2929790ebf 100644 --- a/src/nvim/file_search.c +++ b/src/nvim/file_search.c @@ -484,28 +484,21 @@ vim_findfile_init ( len = (int)(p - search_ctx->ffsc_fix_path) - 1; STRNCAT(ff_expand_buffer, search_ctx->ffsc_fix_path, len); add_pathsep((char *)ff_expand_buffer); - } else + } else { len = (int)STRLEN(search_ctx->ffsc_fix_path); + } if (search_ctx->ffsc_wc_path != NULL) { wc_path = vim_strsave(search_ctx->ffsc_wc_path); temp = xmalloc(STRLEN(search_ctx->ffsc_wc_path) + STRLEN(search_ctx->ffsc_fix_path + len) + 1); - } - - if (temp == NULL || wc_path == NULL) { - xfree(buf); - xfree(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); - 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); } diff --git a/src/nvim/version.c b/src/nvim/version.c index de936c989a..39b8e3db84 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -403,7 +403,7 @@ static int included_patches[] = { // 888, 887, // 886 NA - // 885, + 885, // 884 NA 883, // 882, |