patch 7.4.2149

Problem:    If a test leaves a window open a following test may fail.
Solution:   Always close extra windows after running a test.

Author: brammool

src/testdir/runtest.vim

@@ -103,6 +103,12 @@ function RunTheTest(test)
   if exists("*TearDown")
     call TearDown()
   endif
+
+  " Close any extra windows and make the current one not modified.
+  while winnr('$') > 1
+    bwipe!
+  endwhile
+  set nomodified
 endfunc
 
 " Source the test script.  First grab the file name, in case the script

src/testdir/test_popup.vim

@@ -203,7 +203,6 @@ func! Test_popup_complete()
   call feedkeys("aM\<f5>\<enter>\<esc>", 'tx')
   call assert_equal(["March", "M", "March"], getline(1,4))
   %d
-  bwipe!
 endfu
 
 
@@ -233,7 +232,6 @@ func! Test_popup_completion_insertmode()
   call feedkeys("a\<f5>\<c-p>\<c-p>\<enter>\<esc>", 'tx')
   call assert_equal('December', getline(1))
 
-  bwipe!
   iunmap <F5>
 endfunc
 

src/version.c

@@ -763,6 +763,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2149,
 /**/
     2148,
 /**/