aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/nvim/buffer.c6
-rw-r--r--src/nvim/version.c2
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