From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 29 Aug 2012 13:50:26 +0000 (+0200)
Subject: updated for version 7.3.642
X-Git-Tag: v7.3.642
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8f913993666b154b233ab9923845fa165d9b3260;p=thirdparty%2Fvim.git

updated for version 7.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)
---

diff --git a/src/version.c b/src/version.c
index 123d935769..767c4c0d3a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -719,6 +719,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    642,
 /**/
     641,
 /**/
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;