summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2018-03-06 14:22:58 +0100
committerBram Moolenaar <Bram@vim.org>2018-03-06 14:22:58 +0100
commitdf0d24b62742edd3ea73795b96a771501e642970 (patch)
tree24ada28965bc26eca01a4ca03e42a20e0b3c77d2
parent69f5a3011d5a93e0d54837e97d625bd6c253d897 (diff)
patch 8.0.1579: virtual replace test fails in GUIv8.0.1579
Problem: Virtual replace test fails in GUI. Solution: Don't save key options if they were not set.
-rw-r--r--src/testdir/test_visual.vim16
-rw-r--r--src/version.c2
2 files changed, 14 insertions, 4 deletions
diff --git a/src/testdir/test_visual.vim b/src/testdir/test_visual.vim
index e08883df2f..3a7d273c4d 100644
--- a/src/testdir/test_visual.vim
+++ b/src/testdir/test_visual.vim
@@ -157,8 +157,12 @@ endfunc
" Test Virtual replace mode.
func Test_virtual_replace()
- let save_t_kD = &t_kD
- let save_t_kb = &t_kb
+ if exists('&t_kD')
+ let save_t_kD = &t_kD
+ endif
+ if exists('&t_kb')
+ let save_t_kb = &t_kb
+ endif
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"
@@ -189,8 +193,12 @@ func Test_virtual_replace()
\ 'AB IJKLMNO QRst'], getline(12, 13))
enew!
set noai bs&vim
- let &t_kD = save_t_kD
- let &t_kb = save_t_kb
+ if exists('save_t_kD')
+ let &t_kD = save_t_kD
+ endif
+ if exists('save_t_kb')
+ let &t_kb = save_t_kb
+ endif
endfunc
" Test Virtual replace mode.
diff --git a/src/version.c b/src/version.c
index a6f9abd4a2..5850cbaa77 100644
--- a/src/version.c
+++ b/src/version.c
@@ -767,6 +767,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1579,
+/**/
1578,
/**/
1577,