From a9aa86ff951b7908b615a61a0e216901b96bc0eb Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Sun, 10 Nov 2019 21:25:45 +0100
Subject: [PATCH] patch 8.1.2290: autocommand test fails

Problem:    Autocommand test fails.
Solution:   Remove 'closeoff' from 'diffopt'.
---
 src/testdir/test_autocmd.vim | 1 +
 src/version.c                | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/src/testdir/test_autocmd.vim b/src/testdir/test_autocmd.vim
index 13febb0a85..eba365e399 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 205f2dc453..da05b0a6b9 100644
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2290,
 /**/
     2289,
 /**/