diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-09-13 15:33:43 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-09-13 15:33:43 +0200 |
| commit | 42335f50bc6fac444a8af74c81df8369d722a6fb (patch) | |
| tree | fc6596503a515a25a7c2a046321108642848b935 /src/diff.c | |
| parent | c787539747f6bb2510a56aa14dbf6808aff5681a (diff) | |
patch 8.1.0377: xdiff doesn't use the Vim memory allocation functionsv8.1.0377
Problem: Xdiff doesn't use the Vim memory allocation functions.
Solution: Change the xdl_ defines. Check for out-of-memory. Rename
"ignored" to "vim_ignored".
Diffstat (limited to 'src/diff.c')
| -rw-r--r-- | src/diff.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/diff.c b/src/diff.c index 59daf1eeb0..0bf0ef2cfa 100644 --- a/src/diff.c +++ b/src/diff.c @@ -1203,10 +1203,10 @@ ex_diffpatch(exarg_T *eap) { # ifdef TEMPDIRNAMES if (vim_tempdir != NULL) - ignored = mch_chdir((char *)vim_tempdir); + vim_ignored = mch_chdir((char *)vim_tempdir); else # endif - ignored = mch_chdir("/tmp"); + vim_ignored = mch_chdir("/tmp"); shorten_fnames(TRUE); } #endif |