Mercurial > vim
comparison src/term.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 | 0a3b9ecf7cb8 |
| children | 7cc2d28778ac |
comparison
equal
deleted
inserted
replaced
| 14729:7cb784c3b08f | 14730:193471015e1a |
|---|---|
| 7011 while (!feof(fd)) | 7011 while (!feof(fd)) |
| 7012 { | 7012 { |
| 7013 size_t len; | 7013 size_t len; |
| 7014 int pos; | 7014 int pos; |
| 7015 | 7015 |
| 7016 ignoredp = fgets(line, LINE_LEN, fd); | 7016 vim_ignoredp = fgets(line, LINE_LEN, fd); |
| 7017 len = strlen(line); | 7017 len = strlen(line); |
| 7018 | 7018 |
| 7019 if (len <= 1 || line[len - 1] != '\n') | 7019 if (len <= 1 || line[len - 1] != '\n') |
| 7020 continue; | 7020 continue; |
| 7021 | 7021 |