diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-12-05 12:30:03 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-12-05 12:30:03 +0100 |
| commit | 461fe50fea245b2b199d92ebce4d9875d856bd27 (patch) | |
| tree | 0884b85e3affddec4134c65542d85eb3e7120a47 | |
| parent | 1ad022a9b81d7829d5dc98cf5b8d0ee410558040 (diff) | |
patch 8.0.1367: terminal test hangs, executing abcdev8.0.1367
Problem: terminal test hangs, executing abcde. (Stucki)
Solution: Rename abcde to abxde.
| -rw-r--r-- | src/testdir/test_terminal.vim | 9 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim index cdff5c3d4f..cb04edfb7d 100644 --- a/src/testdir/test_terminal.vim +++ b/src/testdir/test_terminal.vim @@ -673,15 +673,16 @@ func TerminalTmap(remap) else tnoremap 123 456 endif - tmap 456 abcde + " don't use abcde, it's an existing command + tmap 456 abxde call assert_equal('456', maparg('123', 't')) - call assert_equal('abcde', maparg('456', 't')) + call assert_equal('abxde', maparg('456', 't')) call feedkeys("123", 'tx') let g:buf = buf - call WaitFor("term_getline(g:buf,term_getcursor(g:buf)[0]) =~ 'abcde\\|456'") + call WaitFor("term_getline(g:buf,term_getcursor(g:buf)[0]) =~ 'abxde\\|456'") let lnum = term_getcursor(buf)[0] if a:remap - call assert_match('abcde', term_getline(buf, lnum)) + call assert_match('abxde', term_getline(buf, lnum)) else call assert_match('456', term_getline(buf, lnum)) endif diff --git a/src/version.c b/src/version.c index 4a82af9de3..c2445cef14 100644 --- a/src/version.c +++ b/src/version.c @@ -772,6 +772,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1367, +/**/ 1366, /**/ 1365, |