# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1656263703 -7200
# Node ID 8890460143c9ed26f28215a6e7e5f73e30a94084
# Parent  2878c0a6ff4f1f5f3f21c439cf97377e5f2065d4
patch 8.2.5165: import test fails because 'diffexpr' isn't reset

Commit: https://github.com/vim/vim/commit/507618702e0b04d37028a5bdf7d0d1b09555e19a
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sun Jun 26 18:01:00 2022 +0100

    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
--- 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
--- 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 */
 /**/
+    5165,
+/**/
     5164,
 /**/
     5163,