changeset 7305:372c785c04b6 v7.4.958

commit https://github.com/vim/vim/commit/e1a61991d9b6fd5f65636d17583f93118268cda5 Author: Bram Moolenaar <Bram@vim.org> Date: Thu Dec 3 21:02:27 2015 +0100 patch 7.4.958 Problem: Vim checks if the directory "$TMPDIR" exists. Solution: Do not check if the name starts with "$".
author Christian Brabandt <cb@256bit.org>
date Thu, 03 Dec 2015 21:15:04 +0100
parents a16217d6c53e
children a9dc9da618a4
files src/fileio.c src/version.c
diffstat 2 files changed, 7 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -7388,10 +7388,12 @@ vim_tempname(extra_char, keep)
 	    long	off;
 # endif
 
-	    /* expand $TMP, leave room for "/v1100000/999999999" */
+	    /* Expand $TMP, leave room for "/v1100000/999999999".
+	     * Skip the directory check if the expansion fails. */
 	    expand_env((char_u *)tempdirs[i], itmp, TEMPNAMELEN - 20);
-	    if (mch_isdir(itmp))		/* directory exists */
-	    {
+	    if (itmp[0] != '$' && mch_isdir(itmp))
+	    {
+		/* directory exists */
 # ifdef __EMX__
 		/* If $TMP contains a forward slash (perhaps using bash or
 		 * tcsh), don't add a backslash, use a forward slash!
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    958,
+/**/
     957,
 /**/
     956,