summaryrefslogtreecommitdiffstats
path: root/src/eval.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2015-03-31 13:33:08 +0200
committerBram Moolenaar <Bram@vim.org>2015-03-31 13:33:08 +0200
commite5c421cfd70a4d864faa0fac4e9f2dd6cdf5881d (patch)
tree77b845e567cd28c87bf4e9226384cccf04ab645b /src/eval.c
parent1ca2e361a869c58a775b5fabb2aaf4e2675ea7ba (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/eval.c')
-rw-r--r--src/eval.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/eval.c b/src/eval.c
index ebd7e379e8..5b06a30a52 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -18775,7 +18775,7 @@ get_cmd_output_as_rettv(argvars, rettv, retlist)
* Write the string to a temp file, to be used for input of the shell
* command.
*/
- if ((infile = vim_tempname('i')) == NULL)
+ if ((infile = vim_tempname('i', TRUE)) == NULL)
{
EMSG(_(e_notmp));
goto errret;
@@ -19134,7 +19134,7 @@ f_tempname(argvars, rettv)
static int x = 'A';
rettv->v_type = VAR_STRING;
- rettv->vval.v_string = vim_tempname(x);
+ rettv->vval.v_string = vim_tempname(x, FALSE);
/* Advance 'x' to use A-Z and 0-9, so that there are at least 34 different
* names. Skip 'I' and 'O', they are used for shell redirection. */