From: Bram Moolenaar <Bram@vim.org>
Date: Sun, 26 Jun 2022 17:01:00 +0000 (+0100)
Subject: patch 8.2.5165: import test fails because 'diffexpr' isn't reset
X-Git-Tag: v8.2.5165
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=507618702e0b04d37028a5bdf7d0d1b09555e19a;p=thirdparty%2Fvim.git

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 415a7a99a4..f28b4adef3 100644
--- 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 d7f0a83f3e..8e396cd17c 100644
--- 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,
 /**/