Mercurial > vim
diff src/channel.c @ 14730:193471015e1a v8.1.0377
patch 8.1.0377: xdiff doesn't use the Vim memory allocation functions
commit https://github.com/vim/vim/commit/42335f50bc6fac444a8af74c81df8369d722a6fb
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Sep 13 15:33:43 2018 +0200
patch 8.1.0377: xdiff doesn't use the Vim memory allocation functions
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".
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Thu, 13 Sep 2018 15:45:05 +0200 |
| parents | 71c17b688bc6 |
| children | cb07193c6257 |
line wrap: on
line diff
--- a/src/channel.c +++ b/src/channel.c @@ -1858,7 +1858,7 @@ channel_save(channel_T *channel, ch_part { 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 * 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;