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/ex_cmds.c | |
| parent | 1ca2e361a869c58a775b5fabb2aaf4e2675ea7ba (diff) | |
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/ex_cmds.c')
| -rw-r--r-- | src/ex_cmds.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/ex_cmds.c b/src/ex_cmds.c index ef0ec1ffea..978d516f7d 100644 --- a/src/ex_cmds.c +++ b/src/ex_cmds.c @@ -1158,8 +1158,8 @@ do_filter(line1, line2, eap, cmd, do_in, do_out) } else #endif - if ((do_in && (itmp = vim_tempname('i')) == NULL) - || (do_out && (otmp = vim_tempname('o')) == NULL)) + if ((do_in && (itmp = vim_tempname('i', FALSE)) == NULL) + || (do_out && (otmp = vim_tempname('o', FALSE)) == NULL)) { EMSG(_(e_notmp)); goto filterend; @@ -1963,7 +1963,7 @@ write_viminfo(file, forceit) if (fp_out == NULL) { vim_free(tempname); - if ((tempname = vim_tempname('o')) != NULL) + if ((tempname = vim_tempname('o', TRUE)) != NULL) fp_out = mch_fopen((char *)tempname, WRITEBIN); } |