patch 8.0.1226: edit and popup tests failing
Problem: Edit and popup tests failing.
Solution: Make the tests pass.
diff --git a/src/testdir/test_edit.vim b/src/testdir/test_edit.vim
index bb3af27..f857516 100644
--- a/src/testdir/test_edit.vim
+++ b/src/testdir/test_edit.vim
@@ -215,14 +215,16 @@
func! Test_edit_08()
" reset insertmode from i_ctrl-r_=
+ let g:bufnr = bufnr('%')
new
call setline(1, ['abc'])
call cursor(1, 4)
- call feedkeys(":set im\<cr>ZZZ\<c-r>=setbufvar(1,'&im', 0)\<cr>",'tnix')
+ call feedkeys(":set im\<cr>ZZZ\<c-r>=setbufvar(g:bufnr,'&im', 0)\<cr>",'tnix')
call assert_equal(['abZZZc'], getline(1,'$'))
call assert_equal([0, 1, 1, 0], getpos('.'))
call assert_false(0, '&im')
bw!
+ unlet g:bufnr
endfunc
func! Test_edit_09()
diff --git a/src/testdir/test_popup.vim b/src/testdir/test_popup.vim
index ac8f62e..1be4e6f 100644
--- a/src/testdir/test_popup.vim
+++ b/src/testdir/test_popup.vim
@@ -681,7 +681,8 @@
call setline(2, ' os.')
$
call feedkeys("A\<C-X>\<C-O>\<C-N>\<C-N>\<C-N>\<enter>\<esc>", 'tx')
- call assert_equal(["import os", " os.EX_IOERR", ''], getline(1,'$'))
+ call assert_equal("import os", getline(1))
+ call assert_match(' os.\(EX_IOERR\|O_CREAT\)$', getline(2))
call assert_equal(1, winnr('$'))
" previewwindow option is not set
call assert_equal(0, &previewwindow)
diff --git a/src/version.c b/src/version.c
index 6ab4e75..71569b3 100644
--- a/src/version.c
+++ b/src/version.c
@@ -762,6 +762,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1226,
+/**/
1225,
/**/
1224,