Mercurial > vim
diff src/netbeans.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 | 69517d67421f |
children | 27b9a84395b5 |
line wrap: on
line diff
--- a/src/netbeans.c +++ b/src/netbeans.c @@ -1988,10 +1988,10 @@ nb_do_cmd( pos = get_off_or_lnum(buf->bufp, &args); cp = (char *)args; - ignored = (int)strtol(cp, &cp, 10); + vim_ignored = (int)strtol(cp, &cp, 10); args = (char_u *)cp; # ifdef NBDEBUG - if (ignored != -1) + if (vim_ignored != -1) { nbdebug((" partial line annotation -- Not Yet Implemented!\n")); }