diff --git a/src/testdir/test_edit.vim b/src/testdir/test_edit.vim index bb3af27102..f857516e88 100644 --- a/src/testdir/test_edit.vim +++ b/src/testdir/test_edit.vim @@ -215,14 +215,16 @@ endfunc 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\ZZZ\=setbufvar(1,'&im', 0)\",'tnix') + call feedkeys(":set im\ZZZ\=setbufvar(g:bufnr,'&im', 0)\",'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 ac8f62e8ab..1be4e6fd33 100644 --- a/src/testdir/test_popup.vim +++ b/src/testdir/test_popup.vim @@ -681,7 +681,8 @@ func Test_popup_and_preview_autocommand() call setline(2, ' os.') $ call feedkeys("A\\\\\\\", '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 6ab4e75468..71569b34db 100644 --- a/src/version.c +++ b/src/version.c @@ -761,6 +761,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1226, /**/ 1225, /**/