diff options
| author | raichoo <raichoo@googlemail.com> | 2017-03-16 07:40:31 +0100 |
|---|---|---|
| committer | raichoo <raichoo@googlemail.com> | 2017-03-19 21:14:11 +0100 |
| commit | db128974fcbd5702ca724610590a5dafa2e87712 (patch) | |
| tree | 19ac0fc387684dcf336324ac8575b90896bac7ce | |
| parent | 99f2dc1341c8501290e3a0b297e1700f74fd17a3 (diff) | |
| download | rneovim-db128974fcbd5702ca724610590a5dafa2e87712.tar.gz rneovim-db128974fcbd5702ca724610590a5dafa2e87712.tar.bz2 rneovim-db128974fcbd5702ca724610590a5dafa2e87712.zip | |
vim-patch:7.4.2348
Problem: Crash on exit when EXITFREE is defined. (Dominique Pelle)
Solution: Don't access curwin when exiting.
https://github.com/vim/vim/commit/9a27c7fde6d453d9892b6f6baa756bce4d6d419d
| -rw-r--r-- | src/nvim/buffer.c | 6 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/nvim/buffer.c b/src/nvim/buffer.c index ab45008962..9e781f5dff 100644 --- a/src/nvim/buffer.c +++ b/src/nvim/buffer.c @@ -441,7 +441,11 @@ void close_buffer(win_T *win, buf_T *buf, int action, int abort_if_last) // When closing the current buffer stop Visual mode before freeing // anything. - if (is_curbuf && VIsual_active) { + if (is_curbuf && VIsual_active +#if defined(EXITFREE) + && !entered_free_all_mem +#endif + ) { end_visual_mode(); } diff --git a/src/nvim/version.c b/src/nvim/version.c index 7d44efb401..8fd0fce329 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -93,7 +93,7 @@ static int included_patches[] = { // 2351 NA // 2350, // 2349, - // 2348, + 2348, 2347, // 2346, // 2345 NA |