From: Bram Moolenaar <Bram@vim.org>
Date: Mon, 1 Sep 2008 15:33:17 +0000 (+0000)
Subject: updated for version 7.2-008
X-Git-Tag: v7.2.008
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5bd266c96d6e945d6c52c34e7265a680720a9e68;p=vim

updated for version 7.2-008
---

diff --git a/src/buffer.c b/src/buffer.c
index f1b4fd691..173a0f80c 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -1351,11 +1351,12 @@ set_curbuf(buf, action)
 	}
     }
 #ifdef FEAT_AUTOCMD
+    /* An autocommand may have deleted "buf", already entered it (e.g., when
+     * it did ":bunload") or aborted the script processing! */
 # ifdef FEAT_EVAL
-    /* An autocommand may have deleted buf or aborted the script processing! */
-    if (buf_valid(buf) && !aborting())
+    if (buf_valid(buf) && buf != curbuf && !aborting())
 # else
-    if (buf_valid(buf))	    /* an autocommand may have deleted buf! */
+    if (buf_valid(buf) && buf != curbuf)
 # endif
 #endif
 	enter_buffer(buf);
diff --git a/src/version.c b/src/version.c
index 64370d0fa..16a0cee28 100644
--- a/src/version.c
+++ b/src/version.c
@@ -676,6 +676,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    8,
 /**/
     7,
 /**/