diff options
author | Bram Moolenaar <Bram@vim.org> | 2015-03-31 13:33:08 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2015-03-31 13:33:08 +0200 |
commit | e5c421cfd70a4d864faa0fac4e9f2dd6cdf5881d (patch) | |
tree | 77b845e567cd28c87bf4e9226384cccf04ab645b /src/diff.c | |
parent | 1ca2e361a869c58a775b5fabb2aaf4e2675ea7ba (diff) | |
download | vim-git-e5c421cfd70a4d864faa0fac4e9f2dd6cdf5881d.tar.gz |
updated for version 7.4.684v7.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.
Diffstat (limited to 'src/diff.c')
-rw-r--r-- | src/diff.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/diff.c b/src/diff.c index caee6e5a5..aec54c2b0 100644 --- a/src/diff.c +++ b/src/diff.c @@ -688,9 +688,9 @@ ex_diffupdate(eap) 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 @@ ex_diffpatch(eap) #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; |