From: Bram Moolenaar Date: Tue, 5 Dec 2017 11:30:03 +0000 (+0100) Subject: patch 8.0.1367: terminal test hangs, executing abcde X-Git-Tag: v8.0.1368~1 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=461fe50fea245b2b199d92ebce4d9875d856bd27;p=vim patch 8.0.1367: terminal test hangs, executing abcde Problem: terminal test hangs, executing abcde. (Stucki) Solution: Rename abcde to abxde. --- diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim index cdff5c3d4..cb04edfb7 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 4a82af9de..c2445cef1 100644 --- a/src/version.c +++ b/src/version.c @@ -771,6 +771,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1367, /**/ 1366, /**/