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.

diff --git a/src/term.c b/src/term.c
index 5e7aeecae679cb2d848c0fc2ac837e51e6801f47..622491fb075844b60a0ddaab0e99435424bf23a5 100644 (file)
--- 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 9d0458cd2d85788d73af2937ce0398ae904d6c89..e08883df2f65fb8f3ad542c714eaee09a540cb1c 100644 (file)
--- 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=\<C-V>x7f t_kb=\<C-V>x08"
   enew!
   exe "normal a\nabcdefghi\njk\tlmn\n    opq   rst\n\<C-D>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 65b5d2dad176700823df8448a84273975e586709..8cc867fe97b99a48f8305aadff7729996e89d278 100644 (file)
--- 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,
 /**/