From e7808481507b9e11ae73c8f865e95eb2d20f6cc8 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Tue, 6 Mar 2018 13:17:23 +0100 Subject: patch 8.0.1577: virtual replace test fails on MS-Windows 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. --- src/term.c | 1 + src/testdir/test_visual.vim | 6 +++++- src/version.c | 2 ++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/term.c b/src/term.c index 5e7aeecae6..622491fb07 100644 --- a/src/term.c +++ b/src/term.c @@ -2278,6 +2278,7 @@ add_termcap_entry(char_u *name, int force) 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) diff --git a/src/testdir/test_visual.vim b/src/testdir/test_visual.vim index 9d0458cd2d..e08883df2f 100644 --- a/src/testdir/test_visual.vim +++ b/src/testdir/test_visual.vim @@ -157,6 +157,8 @@ endfunc " 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,7 +188,9 @@ func Test_virtual_replace() call assert_equal(['AB......CDEFGHI.Jkl', \ 'AB IJKLMNO QRst'], getline(12, 13)) enew! - set noai bs&vim t_kD&vim t_kb&vim + set noai bs&vim + let &t_kD = save_t_kD + let &t_kb = save_t_kb endfunc " Test Virtual replace mode. diff --git a/src/version.c b/src/version.c index 65b5d2dad1..8cc867fe97 100644 --- a/src/version.c +++ b/src/version.c @@ -766,6 +766,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1577, /**/ 1576, /**/ -- cgit v1.2.3