0
0
mirror of https://github.com/vim/vim.git synced 2025-09-29 04:34:16 -04:00

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".
This commit is contained in:
Bram Moolenaar
2018-09-13 15:33:43 +02:00
parent c787539747
commit 42335f50bc
18 changed files with 64 additions and 56 deletions

View File

@@ -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