summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-08-03 21:04:53 +0200
committerBram Moolenaar <Bram@vim.org>2016-08-03 21:04:53 +0200
commitcf25fdb8f10a92b3bf9e295c466c1b69812b7886 (patch)
treef9d9ccd55a971da18d154d67bb5a16250bf196bb
parent4c38d66d25e4ba433fe87283a4664425a3dbd529 (diff)
patch 7.4.2151v7.4.2151
Problem: Quickfix test fails on MS-Windows. Solution: Close the help window. (Christian Brabandt)
-rw-r--r--src/testdir/test_quickfix.vim1
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/src/testdir/test_quickfix.vim b/src/testdir/test_quickfix.vim
index e79315b969..9f0b5106e9 100644
--- a/src/testdir/test_quickfix.vim
+++ b/src/testdir/test_quickfix.vim
@@ -407,6 +407,7 @@ endfunction
function Test_helpgrep()
call s:test_xhelpgrep('c')
+ helpclose
call s:test_xhelpgrep('l')
endfunc
diff --git a/src/version.c b/src/version.c
index c50088e32f..9af79c6b7e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2151,
+/**/
2150,
/**/
2149,