changeset 12983:7a9c4a8b1ceb

patch 8.0.1367: terminal test hangs, executing abcde commit https://github.com/vim/vim/commit/461fe50fea245b2b199d92ebce4d9875d856bd27 Author: Bram Moolenaar <Bram@vim.org> Date: Tue Dec 5 12:30:03 2017 +0100 patch 8.0.1367: terminal test hangs, executing abcde Problem: terminal test hangs, executing abcde. (Stucki) Solution: Rename abcde to abxde.
author Christian Brabandt <cb@256bit.org>
date Tue, 05 Dec 2017 12:45:04 +0100
parents b257a7834e7e
children fc0d4a036654
files src/testdir/test_terminal.vim src/version.c
diffstat 2 files changed, 7 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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,