summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-08-02 22:51:42 +0200
committerBram Moolenaar <Bram@vim.org>2016-08-02 22:51:42 +0200
commitabb71fbd399772d467aaa7b34b958b0f975c7e65 (patch)
treef50f59815cc4945674871a04acd53051017b1af1
parent472472898ab71ac80a86fedc37f8eb91461788dd (diff)
downloadvim-git-abb71fbd399772d467aaa7b34b958b0f975c7e65.tar.gz
patch 7.4.2147v7.4.2147
Problem: test_alot fails. Solution: Close window.
-rw-r--r--src/testdir/test_popup.vim1
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/src/testdir/test_popup.vim b/src/testdir/test_popup.vim
index ca482c0f0..d5f50ca88 100644
--- a/src/testdir/test_popup.vim
+++ b/src/testdir/test_popup.vim
@@ -203,6 +203,7 @@ func! Test_popup_complete()
call feedkeys("aM\<f5>\<enter>\<esc>", 'tx')
call assert_equal(["March", "M", "March"], getline(1,4))
%d
+ bwipe!
endfu
diff --git a/src/version.c b/src/version.c
index dbd9f171b..9402bb548 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 */
/**/
+ 2147,
+/**/
2146,
/**/
2145,