updated for version 7.2-008

diff --git a/src/buffer.c b/src/buffer.c
index f1b4fd6916d25da6f351c647ea7c7a01e071d7df..173a0f80c1d2153a63ccc2b37214c3454bb3dd72 100644 (file)
--- 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 64370d0fa91c402d7458b211c0452edeb9b2c190..16a0cee28bd16be43b7386a28942e84ab49ac5e9 100644 (file)
--- 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,
 /**/