diff options
| author | lonerover <pathfinder1644@yahoo.com> | 2017-03-23 22:54:30 +0800 |
|---|---|---|
| committer | lonerover <pathfinder1644@yahoo.com> | 2017-03-27 12:19:14 +0800 |
| commit | 85ba14af6ad19fa3c4ba1ade3819014254635b2f (patch) | |
| tree | 5263e84d88a3b005f66fad4c3849f5cc90c424cb /src | |
| parent | 20e7652b6980e0efed5db65e0f80c0d72ef8c68d (diff) | |
| download | rneovim-85ba14af6ad19fa3c4ba1ade3819014254635b2f.tar.gz rneovim-85ba14af6ad19fa3c4ba1ade3819014254635b2f.tar.bz2 rneovim-85ba14af6ad19fa3c4ba1ade3819014254635b2f.zip | |
vim-patch:7.4.2330
Problem: Coverity complains about not checking curwin to be NULL.
Solution: Use firstwin to avoid the warning.
https://github.com/vim/vim/commit/030cddc7ec0c3d2fe3969140cd1b92b2f18633c0
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/buffer.c | 7 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/nvim/buffer.c b/src/nvim/buffer.c index 3c416c157f..4a07884f98 100644 --- a/src/nvim/buffer.c +++ b/src/nvim/buffer.c @@ -627,10 +627,11 @@ void buf_freeall(buf_T *buf, int flags) */ if (buf == curbuf && !is_curbuf) return; - diff_buf_delete(buf); /* Can't use 'diff' for unloaded buffer. */ - /* Remove any ownsyntax, unless exiting. */ - if (firstwin != NULL && curwin->w_buffer == buf) + diff_buf_delete(buf); // Can't use 'diff' for unloaded buffer. + // Remove any ownsyntax, unless exiting. + if (curwin != NULL && curwin->w_buffer == buf) { reset_synblock(curwin); + } /* No folds in an empty buffer. */ FOR_ALL_TAB_WINDOWS(tp, win) { diff --git a/src/nvim/version.c b/src/nvim/version.c index ee66b00b4e..c18439c279 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -111,7 +111,7 @@ static int included_patches[] = { 2333, // 2332 NA 2331, - // 2330, + 2330, 2329, 2328, // 2327 NA |