To: vim_dev@googlegroups.com Subject: Patch 8.2.0805 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.0805 Problem: Terminal key codes test fails on some systems. Solution: Skip keypad 3 and 9. (Yegappan Lakshmanan, closes #6070) Files: src/testdir/test_terminal.vim *** ../vim-8.2.0804/src/testdir/test_terminal.vim 2020-05-18 19:46:00.074602945 +0200 --- src/testdir/test_terminal.vim 2020-05-21 20:36:56.528125201 +0200 *************** *** 2683,2704 **** \ '', '', '', '', '', '', '', \ '', '', '', '', '', '', \ '', '', '', '', '', ! \ '', '', '', '', '', ! \ '0123456789', "\t\t.+-*/"] ! for k in keys ! call term_sendkeys(buf, "i\" .. k .. "\\\") endfor - call term_sendkeys(buf, "i\\\\\\\\") - call term_sendkeys(buf, "\\\\\") - call term_sendkeys(buf, "\\\\\") - call term_sendkeys(buf, "\\\\\\") ! call term_sendkeys(buf, ":write Xkeycodes\") call term_wait(buf) call StopVimInTerminal(buf) - call assert_equal(output, readfile('Xkeycodes')) - call delete('Xkeycodes') endfunc " Test for using the mouse in a terminal --- 2683,2727 ---- \ '', '', '', '', '', '', '', \ '', '', '', '', '', '', \ '', '', '', '', '', ! \ '', '', '', '', ''] ! call term_sendkeys(buf, "i") ! for i in range(len(keys)) ! call term_sendkeys(buf, "\\" .. keys[i]) ! call term_wait(buf) ! call assert_equal(output[i], term_getline(buf, 1)) endfor ! "call term_sendkeys(buf, "\\\\\\\\\\") ! "call term_sendkeys(buf, "\\\") ! "call term_sendkeys(buf, "\\\") ! "call term_sendkeys(buf, "\") ! "call term_sendkeys(buf, "\\\\") ! "call term_sendkeys(buf, "\") ! ! "call term_sendkeys(buf, ":write Xkeycodes\") ! ! let keypad_keys = ["\", "\", "\", "\", "\", "\", ! \ "\", "\", "\", "\", "\", "\", ! \ "\", "\", "\"] ! let keypad_output = ['0', '1', '2', '3', '4', '5', ! \ '6', '7', '8', '9', '.', '+', ! \ '-', '*', '/'] ! for i in range(len(keypad_keys)) ! " TODO: Mysteriously keypad 3 and 9 do not work on some systems. ! if keypad_output[i] == '3' || keypad_output[i] == '9' ! continue ! endif ! call term_sendkeys(buf, "\" .. keypad_keys[i]) ! call term_wait(buf) ! call assert_equal(keypad_output[i], term_getline(buf, 1)) ! endfor ! ! call feedkeys("\\\one\.two", 'xt') call term_wait(buf) + call assert_equal('two', term_getline(buf, 1)) + call StopVimInTerminal(buf) endfunc " Test for using the mouse in a terminal *** ../vim-8.2.0804/src/version.c 2020-05-21 20:10:00.289336748 +0200 --- src/version.c 2020-05-21 20:28:48.085294840 +0200 *************** *** 748,749 **** --- 748,751 ---- { /* Add new patch number below this line */ + /**/ + 805, /**/ -- hundred-and-one symptoms of being an internet addict: 150. You find yourself counting emoticons to get to sleep. /// 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 ///