diff --git a/src/testdir/test_diffmode.vim b/src/testdir/test_diffmode.vim index b10f96d42d..57115de852 100644 --- a/src/testdir/test_diffmode.vim +++ b/src/testdir/test_diffmode.vim @@ -1212,7 +1212,9 @@ func Test_diff_maintains_change_mark() call DiffMaintainsChangeMark() set diffopt+=internal call DiffMaintainsChangeMark() + set diffopt& + delfunc DiffMaintainsChangeMark endfunc " Test for 'patchexpr' diff --git a/src/version.c b/src/version.c index ec1ba92d14..44691def89 100644 --- a/src/version.c +++ b/src/version.c @@ -750,6 +750,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 4112, /**/ 4111, /**/