commit 507618702e0b04d37028a5bdf7d0d1b09555e19a
author Bram Moolenaar <Bram@vim.org> Sun Jun 26 18:01:00 2022 +0100
committer Bram Moolenaar <Bram@vim.org> Sun Jun 26 18:01:00 2022 +0100
tree 9e41b8564119e83141cd37701875bde6cfe37cbe
parent c101abff4c6756db4f5e740fde289decb9452efa

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

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

src/testdir/test_vim9_import.vim

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

src/version.c

diff --git a/src/version.c b/src/version.c
index d7f0a83..8e396cd 100644
--- a/src/version.c
+++ b/src/version.c
@@ -736,6 +736,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    5165,
+/**/
     5164,
 /**/
     5163,