aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

updated for version 7.4.684

Browse Source 
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.
This commit is contained in:
Bram Moolenaar
2015-03-31 13:33:08 +02:00
parent 1ca2e361a8
commit e5c421cfd7
13 changed files with 29 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/diff.c
View File

@@ -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;