summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/fileio.c5
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/src/fileio.c b/src/fileio.c
index 1360fde0cc..0d4511ad5d 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -7483,8 +7483,11 @@ vim_tempname(extra_char)
# else /* WIN3264 */
# ifdef USE_TMPNAM
+ char_u *p;
+
/* tmpnam() will make its own name */
- if (*tmpnam((char *)itmp) == NUL)
+ p = tmpnam((char *)itmp);
+ if (p == NULL || *p == NUL)
return NULL;
# else
char_u *p;
diff --git a/src/version.c b/src/version.c
index 728dadf5a0..6c1bc857f9 100644
--- a/src/version.c
+++ b/src/version.c
@@ -715,6 +715,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 115,
+/**/
114,
/**/
113,