summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-02-21 17:48:59 +0100
committerBram Moolenaar <Bram@vim.org>2019-02-21 17:48:59 +0100
commite86ecbd92271ad86b543c71ca50452528f704ffb (patch)
treebda9cb9f6184fa7b104eb1812a7f6df88474d451
parent353aca1215fad9c5413150a80df95ee3abb7e76a (diff)
downloadvim-git-e86ecbd92271ad86b543c71ca50452528f704ffb.tar.gz
patch 8.1.0965: search test failsv8.1.0965
Problem: Search test fails. Solution: Wait a bit longer for the 'ambiwidth' redraw.
-rw-r--r--src/testdir/dumps/Test_incsearch_change_01.dump2
-rw-r--r--src/testdir/test_search.vim2
-rw-r--r--src/version.c2
3 files changed, 4 insertions, 2 deletions
diff --git a/src/testdir/dumps/Test_incsearch_change_01.dump b/src/testdir/dumps/Test_incsearch_change_01.dump
index 96d86aae1..1c84faf43 100644
--- a/src/testdir/dumps/Test_incsearch_change_01.dump
+++ b/src/testdir/dumps/Test_incsearch_change_01.dump
@@ -1,5 +1,5 @@
|o+0&#ffffff0|n|e| @66
-|x+1&&| +0&&@68
+|x| @68
|t|h|r|e@1| @64
|~+0#4040ff13&| @68
|~| @68
diff --git a/src/testdir/test_search.vim b/src/testdir/test_search.vim
index 5c8c2a31e..972144aca 100644
--- a/src/testdir/test_search.vim
+++ b/src/testdir/test_search.vim
@@ -994,7 +994,7 @@ func Test_incsearch_with_change()
let buf = RunVimInTerminal('-S Xis_change_script', {'rows': 9, 'cols': 70})
" Give Vim a chance to redraw to get rid of the spaces in line 2 caused by
" the 'ambiwidth' check.
- sleep 100m
+ sleep 300m
" Highlight X, it will be deleted by the timer callback.
call term_sendkeys(buf, ':%s/X')
diff --git a/src/version.c b/src/version.c
index a278e20b4..328d65814 100644
--- a/src/version.c
+++ b/src/version.c
@@ -780,6 +780,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 965,
+/**/
964,
/**/
963,