aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorwatiko <service@mail.watiko.net>2016-02-22 23:00:50 +0900
committerwatiko <service@mail.watiko.net>2016-03-02 15:51:39 +0900
commit55c0621ff3e9e585ad0340f5d1f475dc23f38daa (patch)
treed24a030e6f124ffa7667ae17733762c4733d67fb /src
parent576c5f7b74bfa46ba4c7290b5e5b951d3ee2d0bc (diff)
downloadrneovim-55c0621ff3e9e585ad0340f5d1f475dc23f38daa.tar.gz
rneovim-55c0621ff3e9e585ad0340f5d1f475dc23f38daa.tar.bz2
rneovim-55c0621ff3e9e585ad0340f5d1f475dc23f38daa.zip
vim-patch:7.4.958
Problem: Vim checks if the directory "$TMPDIR" exists. Solution: Do not check if the name starts with "$". https://github.com/vim/vim/commit/e1a61991d9b6fd5f65636d17583f93118268cda5 --- see: "$TMPDIR bug" https://groups.google.com/d/msg/vim_dev/UWjbjOf9tEY/wfwnkh41AwAJ
Diffstat (limited to 'src')
-rw-r--r--src/nvim/tempfile.c3
-rw-r--r--src/nvim/version.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/src/nvim/tempfile.c b/src/nvim/tempfile.c
index a218c03fdb..afe926b2ef 100644
--- a/src/nvim/tempfile.c
+++ b/src/nvim/tempfile.c
@@ -32,8 +32,9 @@ static void vim_maketempdir(void)
char_u path[TEMP_FILE_PATH_MAXLEN];
for (size_t i = 0; i < ARRAY_SIZE(temp_dirs); ++i) {
// 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);
- if (!os_isdir(template)) { // directory doesn't exist
+ if (template[0] == '$' || !os_isdir(template)) {
continue;
}
diff --git a/src/nvim/version.c b/src/nvim/version.c
index bc10187aa3..d83ae292d5 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -332,7 +332,7 @@ static int included_patches[] = {
961,
// 960 NA
// 959 NA
- // 958,
+ 958,
// 957,
// 956 NA
955,