aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

patch 7.4.885

Browse Source 
Problem:    When doing an upwards search without wildcards the search fails if
            the initial directory doesn't exist.
Solution:   Fix the non-wildcard case. (Stefan Kempf)
This commit is contained in:
Bram Moolenaar
2015-09-29 12:08:42 +02:00
parent ca63501fbc
commit c79a5452ac
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/misc2.c
View File

@@ -4369,21 +4369,20 @@ vim_findfile_init(path, filename, stopdirs, level, free_visited, find_what,
temp = alloc((int)(STRLEN(search_ctx->ffsc_wc_path) temp = alloc((int)(STRLEN(search_ctx->ffsc_wc_path)
+ STRLEN(search_ctx->ffsc_fix_path + len) + STRLEN(search_ctx->ffsc_fix_path + len)
+ 1)); + 1));
} if (temp == NULL || wc_path == NULL)
{
vim_free(buf);
vim_free(temp);
vim_free(wc_path);
goto error_return;
}
if (temp == NULL || wc_path == NULL) STRCPY(temp, search_ctx->ffsc_fix_path + len);
{ STRCAT(temp, search_ctx->ffsc_wc_path);
vim_free(buf); vim_free(search_ctx->ffsc_wc_path);
vim_free(temp);
vim_free(wc_path); vim_free(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);
vim_free(search_ctx->ffsc_wc_path);
vim_free(wc_path);
search_ctx->ffsc_wc_path = temp;
} }
#endif #endif
vim_free(buf); vim_free(buf);

2
src/version.c
View File

@@ -741,6 +741,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 */
/**/
885,
/**/ /**/
884, 884,
/**/ /**/