diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-11-10 21:25:45 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-11-10 21:25:45 +0100 |
| commit | a9aa86ff951b7908b615a61a0e216901b96bc0eb (patch) | |
| tree | 08cd5d54423dd29aea6869d232bafacdee55c6c2 | |
| parent | c8234779790dd873acb88331c50988adf94cc383 (diff) | |
| download | vim-git-a9aa86ff951b7908b615a61a0e216901b96bc0eb.tar.gz | |
patch 8.1.2290: autocommand test failsv8.1.2290
Problem: Autocommand test fails.
Solution: Remove 'closeoff' from 'diffopt'.
| -rw-r--r-- | src/testdir/test_autocmd.vim | 1 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/testdir/test_autocmd.vim b/src/testdir/test_autocmd.vim index 13febb0a8..eba365e39 100644 --- a/src/testdir/test_autocmd.vim +++ b/src/testdir/test_autocmd.vim @@ -1157,6 +1157,7 @@ func Test_OptionSet_diffmode_close() call setline(1, ['buffer 2', 'line 2', 'line 3', 'line4']) call assert_fails(':diffthis', 'E788') call assert_equal(1, &diff) + set diffopt-=closeoff bw! call assert_fails(':diffoff!', 'E788') bw! diff --git a/src/version.c b/src/version.c index 205f2dc45..da05b0a6b 100644 --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2290, +/**/ 2289, /**/ 2288, |