Mercurial > vim

changeset 18592:75c466dcf61c v8.1.2290

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.2290: autocommand test fails Commit: https://github.com/vim/vim/commit/a9aa86ff951b7908b615a61a0e216901b96bc0eb Author: Bram Moolenaar <Bram@vim.org> Date: Sun Nov 10 21:25:45 2019 +0100 patch 8.1.2290: autocommand test fails Problem: Autocommand test fails. Solution: Remove 'closeoff' from 'diffopt'.
author Bram Moolenaar <Bram@vim.org>
date Sun, 10 Nov 2019 21:30:03 +0100
parents 3ab7f00e79f3
children 89a359d7bcd2
files src/testdir/test_autocmd.vim src/version.c
diffstat 2 files changed, 3 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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!
--- 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,