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/ex_cmds.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/ex_cmds.c')
| -rw-r--r-- | src/ex_cmds.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ex_cmds.c b/src/ex_cmds.c index 6e713c49a3..0a87f7b38f 100644 --- a/src/ex_cmds.c +++ b/src/ex_cmds.c @@ -2117,7 +2117,7 @@ write_viminfo(char_u *file, int forceit) if (st_old.st_uid != tmp_st.st_uid) /* Changing the owner might fail, in which case the * file will now owned by the current user, oh well. */ - ignored = fchown(fileno(fp_out), st_old.st_uid, -1); + vim_ignored = fchown(fileno(fp_out), st_old.st_uid, -1); if (st_old.st_gid != tmp_st.st_gid && fchown(fileno(fp_out), -1, st_old.st_gid) == -1) /* can't set the group to what it should be, remove |