diff options
| author | Pavel Platto <hinidu@gmail.com> | 2014-06-21 14:07:51 +0300 |
|---|---|---|
| committer | Nicolas Hillegeer <nicolas@hillegeer.com> | 2014-07-14 21:14:40 +0200 |
| commit | 8cfa7b3d15f503ff4fd4fc1df26bca109b31497b (patch) | |
| tree | a36c4884452d938c89a7ec53c384eabfc1b38864 /src/nvim/diff.c | |
| parent | 29e0cd1571b773feb7fd61118930cdac7d83e38c (diff) | |
| download | rneovim-8cfa7b3d15f503ff4fd4fc1df26bca109b31497b.tar.gz rneovim-8cfa7b3d15f503ff4fd4fc1df26bca109b31497b.tar.bz2 rneovim-8cfa7b3d15f503ff4fd4fc1df26bca109b31497b.zip | |
Add vim_gettempdir(), remove global vim_tempdir
vim_gettempdir() and vim_maketempdir() was extracted from
vim_tempname().
Diffstat (limited to 'src/nvim/diff.c')
| -rw-r--r-- | src/nvim/diff.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/nvim/diff.c b/src/nvim/diff.c index 37210e447c..be4a923d14 100644 --- a/src/nvim/diff.c +++ b/src/nvim/diff.c @@ -893,11 +893,11 @@ void ex_diffpatch(exarg_T *eap) || (os_chdir((char *)dirbuf) != 0)) { dirbuf[0] = NUL; } else { - if (vim_tempdir != NULL) { - ignored = os_chdir((char *)vim_tempdir); - } else { - ignored = os_chdir("/tmp"); + char *tempdir = (char *)vim_gettempdir(); + if (tempdir == NULL) { + tempdir = "/tmp"; } + os_chdir(tempdir); shorten_fnames(TRUE); } #endif // ifdef UNIX |