summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-06-01 17:06:25 +0200
committerBram Moolenaar <Bram@vim.org>2019-06-01 17:06:25 +0200
commit2d247849ce612050ba1085df806746b23be1f0a3 (patch)
tree6bcd95836916f829401adc0d0878139fe3ae766d
parentc47ed44be76a520ded90913099771999c8a79eeb (diff)
downloadvim-git-2d247849ce612050ba1085df806746b23be1f0a3.tar.gz
patch 8.1.1440: win_execute() test failsv8.1.1440
Problem: Win_execute() test fails. Solution: Adjust the expected error number. Move to popup test.
-rw-r--r--src/testdir/test_execute_func.vim2
-rw-r--r--src/testdir/test_popupwin.vim1
-rw-r--r--src/version.c2
3 files changed, 3 insertions, 2 deletions
diff --git a/src/testdir/test_execute_func.vim b/src/testdir/test_execute_func.vim
index 78561b3a9..81a67c035 100644
--- a/src/testdir/test_execute_func.vim
+++ b/src/testdir/test_execute_func.vim
@@ -94,8 +94,6 @@ func Test_win_execute()
let line = win_execute(popupwin, 'echo getline(1)')
call assert_match('the popup win', line)
- call assert_fails('call win_execute(popupwin, "bwipe!")', 'E937:')
-
call popup_close(popupwin)
endif
diff --git a/src/testdir/test_popupwin.vim b/src/testdir/test_popupwin.vim
index 7c3cd94f0..1c8f7ef6c 100644
--- a/src/testdir/test_popupwin.vim
+++ b/src/testdir/test_popupwin.vim
@@ -118,6 +118,7 @@ func Test_win_execute_not_allowed()
call assert_fails('call win_execute(winid, "vsplit")', 'E994:')
call assert_fails('call win_execute(winid, "close")', 'E994:')
call assert_fails('call win_execute(winid, "bdelete")', 'E994:')
+ call assert_fails('call win_execute(winid, "bwipe!")', 'E994:')
call assert_fails('call win_execute(winid, "tabnew")', 'E994:')
call assert_fails('call win_execute(winid, "tabnext")', 'E994:')
call assert_fails('call win_execute(winid, "next")', 'E994:')
diff --git a/src/version.c b/src/version.c
index 30c083107..96571af02 100644
--- a/src/version.c
+++ b/src/version.c
@@ -768,6 +768,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1440,
+/**/
1439,
/**/
1438,