Mercurial > vim

comparison src/ui.c @ 14730:193471015e1a v8.1.0377

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
14729:7cb784c3b08f 14730:193471015e1a
401 * This is useful to read input on channels. 401 * This is useful to read input on channels.
402 */ 402 */
403 void 403 void
404 ui_breakcheck_force(int force) 404 ui_breakcheck_force(int force)
405 { 405 {
406 int save_us = updating_screen; 406 int save_updating_screen = updating_screen;
407 407
408 /* We do not want gui_resize_shell() to redraw the screen here. */ 408 /* We do not want gui_resize_shell() to redraw the screen here. */
409 ++updating_screen; 409 ++updating_screen;
410 410
411 #ifdef FEAT_GUI 411 #ifdef FEAT_GUI
413 gui_mch_update(); 413 gui_mch_update();
414 else 414 else
415 #endif 415 #endif
416 mch_breakcheck(force); 416 mch_breakcheck(force);
417 417
418 if (save_us) 418 if (save_updating_screen)
419 updating_screen = save_us; 419 updating_screen = TRUE;
420 else 420 else
421 reset_updating_screen(FALSE); 421 reset_updating_screen(FALSE);
422 } 422 }
423 423
424 /***************************************************************************** 424 /*****************************************************************************
1883 * what it was. */ 1883 * what it was. */
1884 settmode(TMODE_COOK); 1884 settmode(TMODE_COOK);
1885 #ifdef HAVE_DUP 1885 #ifdef HAVE_DUP
1886 /* Use stderr for stdin, also works for shell commands. */ 1886 /* Use stderr for stdin, also works for shell commands. */
1887 close(0); 1887 close(0);
1888 ignored = dup(2); 1888 vim_ignored = dup(2);
1889 #else 1889 #else
1890 read_cmd_fd = 2; /* read from stderr instead of stdin */ 1890 read_cmd_fd = 2; /* read from stderr instead of stdin */
1891 #endif 1891 #endif
1892 settmode(m); 1892 settmode(m);
1893 } 1893 }