diff options
| -rw-r--r-- | src/testdir/test_quickfix.vim | 2 | ||||
| -rw-r--r-- | src/testdir/test_terminal.vim | 18 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 13 insertions, 9 deletions
diff --git a/src/testdir/test_quickfix.vim b/src/testdir/test_quickfix.vim index 71a0f15ba..11bdfbefa 100644 --- a/src/testdir/test_quickfix.vim +++ b/src/testdir/test_quickfix.vim @@ -1708,7 +1708,6 @@ func s:create_test_file(filename) endfunc func Test_switchbuf() - CheckNotBSD call s:create_test_file('Xqftestfile1') call s:create_test_file('Xqftestfile2') call s:create_test_file('Xqftestfile3') @@ -1834,6 +1833,7 @@ func Test_switchbuf() " If opening a file changes 'switchbuf', then the new value should be " retained. + set modeline&vim call writefile(["vim: switchbuf=split"], 'Xqftestfile1') enew | only set switchbuf&vim diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim index 49bce7375..f7b12e376 100644 --- a/src/testdir/test_terminal.vim +++ b/src/testdir/test_terminal.vim @@ -894,7 +894,6 @@ func Test_terminal_wqall() endfunc func Test_terminal_composing_unicode() - CheckNotBSD let save_enc = &encoding set encoding=utf-8 @@ -909,7 +908,7 @@ func Test_terminal_composing_unicode() enew let buf = term_start(cmd, {'curwin': bufnr('')}) let g:job = term_getjob(buf) - call TermWait(buf, 25) + call WaitFor({-> term_getline(buf, 1) !=# ''}, 1000) if has('win32') call assert_equal('cmd', job_info(g:job).cmd[0]) @@ -919,10 +918,11 @@ func Test_terminal_composing_unicode() " ascii + composing let txt = "a\u0308bc" - call term_sendkeys(buf, "echo " . txt . "\r") + call term_sendkeys(buf, "echo " . txt) call TermWait(buf, 25) call assert_match("echo " . txt, term_getline(buf, lnum[0])) - call assert_equal(txt, term_getline(buf, lnum[0] + 1)) + call term_sendkeys(buf, "\<cr>") + call WaitForAssert({-> assert_equal(txt, term_getline(buf, lnum[0] + 1))}, 1000) let l = term_scrape(buf, lnum[0] + 1) call assert_equal("a\u0308", l[0].chars) call assert_equal("b", l[1].chars) @@ -930,10 +930,11 @@ func Test_terminal_composing_unicode() " multibyte + composing let txt = "\u304b\u3099\u304e\u304f\u3099\u3052\u3053\u3099" - call term_sendkeys(buf, "echo " . txt . "\r") + call term_sendkeys(buf, "echo " . txt) call TermWait(buf, 25) call assert_match("echo " . txt, term_getline(buf, lnum[1])) - call assert_equal(txt, term_getline(buf, lnum[1] + 1)) + call term_sendkeys(buf, "\<cr>") + call WaitForAssert({-> assert_equal(txt, term_getline(buf, lnum[1] + 1))}, 1000) let l = term_scrape(buf, lnum[1] + 1) call assert_equal("\u304b\u3099", l[0].chars) call assert_equal("\u304e", l[1].chars) @@ -943,10 +944,11 @@ func Test_terminal_composing_unicode() " \u00a0 + composing let txt = "abc\u00a0\u0308" - call term_sendkeys(buf, "echo " . txt . "\r") + call term_sendkeys(buf, "echo " . txt) call TermWait(buf, 25) call assert_match("echo " . txt, term_getline(buf, lnum[2])) - call assert_equal(txt, term_getline(buf, lnum[2] + 1)) + call term_sendkeys(buf, "\<cr>") + call WaitForAssert({-> assert_equal(txt, term_getline(buf, lnum[2] + 1))}, 1000) let l = term_scrape(buf, lnum[2] + 1) call assert_equal("\u00a0\u0308", l[3].chars) diff --git a/src/version.c b/src/version.c index d35cbab3a..74fabce67 100644 --- a/src/version.c +++ b/src/version.c @@ -747,6 +747,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 687, +/**/ 686, /**/ 685, |