diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-09-13 15:33:43 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-09-13 15:33:43 +0200 |
| commit | 42335f50bc6fac444a8af74c81df8369d722a6fb (patch) | |
| tree | fc6596503a515a25a7c2a046321108642848b935 /src/netbeans.c | |
| parent | c787539747f6bb2510a56aa14dbf6808aff5681a (diff) | |
| download | vim-git-42335f50bc6fac444a8af74c81df8369d722a6fb.tar.gz | |
patch 8.1.0377: xdiff doesn't use the Vim memory allocation functionsv8.1.0377
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".
Diffstat (limited to 'src/netbeans.c')
| -rw-r--r-- | src/netbeans.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/netbeans.c b/src/netbeans.c index a753a4f97..1c916b5bf 100644 --- 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")); } |