summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2012-08-29 15:50:26 +0200
committerBram Moolenaar <Bram@vim.org>2012-08-29 15:50:26 +0200
commit8f913993666b154b233ab9923845fa165d9b3260 (patch)
tree9e11635cc29e0e2ce8620efd5dba1a043518a924
parent002a4edc5b66c90245ca3eebc564635ed0af1ff1 (diff)
updated for version 7.3.642v7.3.642
Problem: Segfault with specific autocommands. Was OK after 7.3.449 and before 7.3.545. (Richard Brown) Solution: Pass TRUE for abort_if_last in the call to close_buffer(). (Christian Brabandt)
-rw-r--r--src/version.c2
-rw-r--r--src/window.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/version.c b/src/version.c
index 123d935769..767c4c0d3a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -720,6 +720,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 642,
+/**/
641,
/**/
640,
diff --git a/src/window.c b/src/window.c
index e1dc940398..e37450d98e 100644
--- a/src/window.c
+++ b/src/window.c
@@ -2269,7 +2269,7 @@ win_close(win, free_buf)
#ifdef FEAT_AUTOCMD
win->w_closing = TRUE;
#endif
- close_buffer(win, win->w_buffer, free_buf ? DOBUF_UNLOAD : 0, FALSE);
+ close_buffer(win, win->w_buffer, free_buf ? DOBUF_UNLOAD : 0, TRUE);
#ifdef FEAT_AUTOCMD
if (win_valid(win))
win->w_closing = FALSE;