diff options
| author | Bram Moolenaar <Bram@vim.org> | 2022-06-26 18:01:00 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-06-26 18:01:00 +0100 |
| commit | 507618702e0b04d37028a5bdf7d0d1b09555e19a (patch) | |
| tree | 9e41b8564119e83141cd37701875bde6cfe37cbe | |
| parent | c101abff4c6756db4f5e740fde289decb9452efa (diff) | |
| download | vim-git-507618702e0b04d37028a5bdf7d0d1b09555e19a.tar.gz | |
patch 8.2.5165: import test fails because 'diffexpr' isn't resetv8.2.5165
Problem: Import test fails because 'diffexpr' isn't reset.
Solution: Reset 'diffexpr'.
| -rw-r--r-- | src/testdir/test_vim9_import.vim | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/testdir/test_vim9_import.vim b/src/testdir/test_vim9_import.vim index 415a7a99a..f28b4adef 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 d7f0a83f3..8e396cd17 100644 --- 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, |