[SCM] Vim packaging branch, master, updated. debian/7.2.000-3-14-ga98cef7

[James Vega]

The following commit has been merged in the master branch:
commit 4b7f75da5ca081a67e6365d63b9737f0bc8593eb
Author: Bram Moolenaar <Bram at moolenaar.net>
Date:   Mon Sep 1 13:38:49 2008 -0400

    [7.2.008] wrong window count when using :bunload in a BufHidden autocmd
    
    Patch 7.2.008
    Problem:    With a BufHidden autocommand that invokes ":bunload" the window
    	    count for a buffer can be wrong. (Bob Hiestand)
    Solution:   Don't call enter_buffer() when already in that buffer.

diff --git a/src/buffer.c b/src/buffer.c
index f1b4fd6..173a0f8 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 64370d0..16a0cee 100644
--- a/src/version.c
+++ b/src/version.c
@@ -677,6 +677,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    8,
+/**/
     7,
 /**/
     6,

-- 
Vim packaging