Mercurial > vim
diff src/ui.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 | 81e8e6181aeb |
| children | 27b9a84395b5 |
line wrap: on
line diff
--- a/src/ui.c +++ b/src/ui.c @@ -403,7 +403,7 @@ ui_breakcheck(void) void ui_breakcheck_force(int force) { - int save_us = updating_screen; + int save_updating_screen = updating_screen; /* We do not want gui_resize_shell() to redraw the screen here. */ ++updating_screen; @@ -415,8 +415,8 @@ ui_breakcheck_force(int force) #endif mch_breakcheck(force); - if (save_us) - updating_screen = save_us; + if (save_updating_screen) + updating_screen = TRUE; else reset_updating_screen(FALSE); } @@ -1885,7 +1885,7 @@ fill_input_buf(int exit_on_error UNUSED) #ifdef HAVE_DUP /* Use stderr for stdin, also works for shell commands. */ close(0); - ignored = dup(2); + vim_ignored = dup(2); #else read_cmd_fd = 2; /* read from stderr instead of stdin */ #endif