commit e5c421cfd70a4d864faa0fac4e9f2dd6cdf5881d
author Bram Moolenaar <Bram@vim.org> Tue Mar 31 13:33:08 2015 +0200
committer Bram Moolenaar <Bram@vim.org> Tue Mar 31 13:33:08 2015 +0200
tree 77b845e567cd28c87bf4e9226384cccf04ab645b
parent 1ca2e361a869c58a775b5fabb2aaf4e2675ea7ba

updated for version 7.4.684
Problem:    When starting several Vim instances in diff mode, the temp files
            used may not be unique. (Issue 353)
Solution:   Add an argument to vim_tempname() to keep the file.

src/diff.c

diff --git a/src/diff.c b/src/diff.c
index caee6e5..aec54c2 100644
--- a/src/diff.c
+++ b/src/diff.c
@@ -688,9 +688,9 @@
 	return;
 
     /* We need three temp file names. */
-    tmp_orig = vim_tempname('o');
-    tmp_new = vim_tempname('n');
-    tmp_diff = vim_tempname('d');
+    tmp_orig = vim_tempname('o', TRUE);
+    tmp_new = vim_tempname('n', TRUE);
+    tmp_diff = vim_tempname('d', TRUE);
     if (tmp_orig == NULL || tmp_new == NULL || tmp_diff == NULL)
 	goto theend;
 
@@ -920,8 +920,8 @@
 #endif
 
     /* We need two temp file names. */
-    tmp_orig = vim_tempname('o');
-    tmp_new = vim_tempname('n');
+    tmp_orig = vim_tempname('o', FALSE);
+    tmp_new = vim_tempname('n', FALSE);
     if (tmp_orig == NULL || tmp_new == NULL)
 	goto theend;