changeset 29297:8890460143c9 v8.2.5165

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'.
author Bram Moolenaar <Bram@vim.org>
date Sun, 26 Jun 2022 19:15:03 +0200
parents 2878c0a6ff4f
children ff3b0bd11b49
files src/testdir/test_vim9_import.vim src/version.c
diffstat 2 files changed, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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')
--- 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,