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/channel.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/channel.c')
| -rw-r--r-- | src/channel.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/channel.c b/src/channel.c index 793dbaa833..aa0a0d38ca 100644 --- a/src/channel.c +++ b/src/channel.c @@ -1858,7 +1858,7 @@ channel_save(channel_T *channel, ch_part_T part, char_u *buf, int len, { ch_log_lead(lead, channel, part); fprintf(log_fd, "'"); - ignored = (int)fwrite(buf, len, 1, log_fd); + vim_ignored = (int)fwrite(buf, len, 1, log_fd); fprintf(log_fd, "'\n"); } return OK; @@ -2388,7 +2388,7 @@ append_to_buffer(buf_T *buffer, char_u *msg, channel_T *channel, ch_part_T part) u_sync(TRUE); /* ignore undo failure, undo is not very useful here */ - ignored = u_save(lnum - empty, lnum + 1); + vim_ignored = u_save(lnum - empty, lnum + 1); if (empty) { @@ -3730,7 +3730,7 @@ channel_send( { ch_log_lead("SEND ", channel, part); fprintf(log_fd, "'"); - ignored = (int)fwrite(buf_arg, len_arg, 1, log_fd); + vim_ignored = (int)fwrite(buf_arg, len_arg, 1, log_fd); fprintf(log_fd, "'\n"); fflush(log_fd); did_log_msg = TRUE; |