To: vim_dev@googlegroups.com Subject: Patch 8.0.1577 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.0.1577 Problem: Virtual replace test fails on MS-Windows. Solution: Make adding a termcap entry work for a builtin terminal. Restore terminal keys in a better way. Files: src/term.c, src/testdir/test_visual.vim *** ../vim-8.0.1576/src/term.c 2018-03-05 22:43:05.523985559 +0100 --- src/term.c 2018-03-06 13:04:07.950568724 +0100 *************** *** 2278,2283 **** --- 2278,2284 ---- if (termp->bt_string != NULL) /* found it */ { key = TERMCAP2KEY(name[0], name[1]); + ++termp; while (termp->bt_entry != (int)KS_NAME) { if ((int)termp->bt_entry == key) *** ../vim-8.0.1576/src/testdir/test_visual.vim 2018-03-06 12:10:43.697795109 +0100 --- src/testdir/test_visual.vim 2018-03-06 13:15:43.366388840 +0100 *************** *** 157,162 **** --- 157,164 ---- " Test Virtual replace mode. func Test_virtual_replace() + let save_t_kD = &t_kD + let save_t_kb = &t_kb exe "set t_kD=\x7f t_kb=\x08" enew! exe "normal a\nabcdefghi\njk\tlmn\n opq rst\n\uvwxyz" *************** *** 186,192 **** call assert_equal(['AB......CDEFGHI.Jkl', \ 'AB IJKLMNO QRst'], getline(12, 13)) enew! ! set noai bs&vim t_kD&vim t_kb&vim endfunc " Test Virtual replace mode. --- 188,196 ---- call assert_equal(['AB......CDEFGHI.Jkl', \ 'AB IJKLMNO QRst'], getline(12, 13)) enew! ! set noai bs&vim ! let &t_kD = save_t_kD ! let &t_kb = save_t_kb endfunc " Test Virtual replace mode. *** ../vim-8.0.1576/src/version.c 2018-03-06 12:25:51.780385338 +0100 --- src/version.c 2018-03-06 13:16:51.905977166 +0100 *************** *** 768,769 **** --- 768,771 ---- { /* Add new patch number below this line */ + /**/ + 1577, /**/ -- BLACK KNIGHT: I'm invincible! ARTHUR: You're a looney. "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// 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 ///