To: vim_dev@googlegroups.com Subject: Patch 8.0.1367 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.0.1367 Problem: terminal test hangs, executing abcde. (Stucki) Solution: Rename abcde to abxde. Files: src/testdir/test_terminal.vim *** ../vim-8.0.1366/src/testdir/test_terminal.vim 2017-11-21 18:11:23.657015881 +0100 --- src/testdir/test_terminal.vim 2017-12-05 12:26:56.315477897 +0100 *************** *** 673,687 **** else tnoremap 123 456 endif ! tmap 456 abcde call assert_equal('456', maparg('123', 't')) ! call assert_equal('abcde', maparg('456', 't')) call feedkeys("123", 'tx') let g:buf = buf ! call WaitFor("term_getline(g:buf,term_getcursor(g:buf)[0]) =~ 'abcde\\|456'") let lnum = term_getcursor(buf)[0] if a:remap ! call assert_match('abcde', term_getline(buf, lnum)) else call assert_match('456', term_getline(buf, lnum)) endif --- 673,688 ---- else tnoremap 123 456 endif ! " don't use abcde, it's an existing command ! tmap 456 abxde call assert_equal('456', maparg('123', '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]) =~ 'abxde\\|456'") let lnum = term_getcursor(buf)[0] if a:remap ! call assert_match('abxde', term_getline(buf, lnum)) else call assert_match('456', term_getline(buf, lnum)) endif *** ../vim-8.0.1366/src/version.c 2017-12-04 20:19:03.203497560 +0100 --- src/version.c 2017-12-05 12:28:02.859179037 +0100 *************** *** 773,774 **** --- 773,776 ---- { /* Add new patch number below this line */ + /**/ + 1367, /**/ -- hundred-and-one symptoms of being an internet addict: 79. All of your most erotic dreams have a scrollbar at the right side. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///