summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-09-09 12:57:09 +0200
committerBram Moolenaar <Bram@vim.org>2016-09-09 12:57:09 +0200
commit9a27c7fde6d453d9892b6f6baa756bce4d6d419d (patch)
tree3d4e8ad6672b8f4883dda29adaaceb7dc3230838
parentc4a908e83690844b0d3a46124ba6af7d23485d69 (diff)
downloadvim-9a27c7fde6d453d9892b6f6baa756bce4d6d419d.zip
patch 7.4.2348
Problem: Crash on exit when EXITFREE is defined. (Dominique Pelle) Solution: Don't access curwin when exiting.
-rw-r--r--src/buffer.c6
-rw-r--r--src/version.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/src/buffer.c b/src/buffer.c
index 3bfd97522..55e200ab8 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -580,7 +580,11 @@ aucmd_abort:
/* When closing the current buffer stop Visual mode before freeing
* anything. */
- if (buf == curbuf)
+ if (buf == curbuf
+#if defined(EXITFREE)
+ && !entered_free_all_mem
+#endif
+ )
end_visual_mode();
/*
diff --git a/src/version.c b/src/version.c
index 8740a985e..b2b9334e8 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2348,
+/**/
2347,
/**/
2346,