summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2022-06-26 18:17:50 +0100
committerBram Moolenaar <Bram@vim.org>2022-06-26 18:17:50 +0100
commitf65cc665fa751bad3ffe75f58ce1251d6695949f (patch)
tree1d0e9290a723f14c2add28f27529d2ba63b80dd9
parent507618702e0b04d37028a5bdf7d0d1b09555e19a (diff)
downloadvim-git-f65cc665fa751bad3ffe75f58ce1251d6695949f.tar.gz
patch 8.2.5166: test for DiffUpdated failsv8.2.5166
Problem: Test for DiffUpdated fails. Solution: Also accept a count of two.
-rw-r--r--src/testdir/test_diffmode.vim3
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/testdir/test_diffmode.vim b/src/testdir/test_diffmode.vim
index 4c7aff5cc..dcacd5516 100644
--- a/src/testdir/test_diffmode.vim
+++ b/src/testdir/test_diffmode.vim
@@ -34,7 +34,8 @@ func Test_diff_fold_sync()
call win_gotoid(winone)
call assert_equal(23, getcurpos()[1])
- call assert_equal(1, g:update_count)
+ " depending on how redraw is done DiffUpdated may be triggered once or twice
+ call assert_inrange(1, 2, g:update_count)
au! DiffUpdated
windo diffoff
diff --git a/src/version.c b/src/version.c
index 8e396cd17..3422e7aaf 100644
--- a/src/version.c
+++ b/src/version.c
@@ -736,6 +736,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 5166,
+/**/
5165,
/**/
5164,