diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-10-27 01:35:00 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-10-27 01:35:00 +0200 |
| commit | 2a45d64d0a7ab28d77eee277244e76dbbf8c2db8 (patch) | |
| tree | 221caa93ee894b89d8792f16759a4a636a4a875c | |
| parent | ee03b941241eae1d36bc29b84eec09116cefe7cd (diff) | |
| download | vim-git-2a45d64d0a7ab28d77eee277244e76dbbf8c2db8.tar.gz | |
patch 8.0.1226: edit and popup tests failingv8.0.1226
Problem: Edit and popup tests failing.
Solution: Make the tests pass.
| -rw-r--r-- | src/testdir/test_edit.vim | 4 | ||||
| -rw-r--r-- | src/testdir/test_popup.vim | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/src/testdir/test_edit.vim b/src/testdir/test_edit.vim index bb3af2710..f857516e8 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\<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 ac8f62e8a..1be4e6fd3 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\<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 6ab4e7546..71569b34d 100644 --- a/src/version.c +++ b/src/version.c @@ -762,6 +762,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1226, +/**/ 1225, /**/ 1224, |