Merge pull request #4320 from watiko/vim-7.4.958

vim-patch:7.4.958
This commit is contained in:
Justin M. Keyes 2016-03-04 13:12:59 -05:00
commit 8991b4b095
2 changed files with 3 additions and 2 deletions

View File

@ -32,8 +32,9 @@ static void vim_maketempdir(void)
char_u path[TEMP_FILE_PATH_MAXLEN]; char_u path[TEMP_FILE_PATH_MAXLEN];
for (size_t i = 0; i < ARRAY_SIZE(temp_dirs); ++i) { for (size_t i = 0; i < ARRAY_SIZE(temp_dirs); ++i) {
// Expand environment variables, leave room for "/nvimXXXXXX/999999999" // Expand environment variables, leave room for "/nvimXXXXXX/999999999"
// Skip the directory check if the expansion fails.
expand_env((char_u *)temp_dirs[i], template, TEMP_FILE_PATH_MAXLEN - 22); expand_env((char_u *)temp_dirs[i], template, TEMP_FILE_PATH_MAXLEN - 22);
if (!os_isdir(template)) { // directory doesn't exist if (template[0] == '$' || !os_isdir(template)) {
continue; continue;
} }

View File

@ -332,7 +332,7 @@ static int included_patches[] = {
961, 961,
// 960 NA // 960 NA
// 959 NA // 959 NA
// 958, 958,
// 957, // 957,
// 956 NA // 956 NA
955, 955,