patch 8.2.5165: import test fails because 'diffexpr' isn't reset

Problem:    Import test fails because 'diffexpr' isn't reset.
Solution:   Reset 'diffexpr'.

diff --git a/src/testdir/test_vim9_import.vim b/src/testdir/test_vim9_import.vim
index 415a7a99a45f13eab821d13488f4226041cbfe37..f28b4adef30b0572220dc5adcf1d1f54d811e311 100644 (file)
--- a/src/testdir/test_vim9_import.vim
+++ b/src/testdir/test_vim9_import.vim
@@ -1234,6 +1234,8 @@ def Run_Test_import_in_diffexpr()
   redraw
 
   diffoff!
+  set diffexpr=
+  set diffopt&
   bwipe!
   bwipe!
   delete('Xdiffexpr')

diff --git a/src/version.c b/src/version.c
index d7f0a83f3e42eb14241f39327b7922f7aec68155..8e396cd17cc3e71512f043191ef1804a3bf628f2 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    5165,
 /**/
     5164,
 /**/