From 1695f99d08076d77ed3015f1edf09a668a4d449a Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 24 Jan 2017 13:18:43 +0100
Subject: [PATCH] patch 8.0.0226: test for patch 8.0.0224 missing CR characters

Problem:    The test for patch 8.0.0224 misses the CR characters and passes
            even without the fix. (Christian Brabandt)
Solution:   Use double quotes and \<CR>.
---
 src/testdir/test_fileformat.vim | 24 +++++++++++++-----------
 src/version.c                   |  2 ++
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/testdir/test_fileformat.vim b/src/testdir/test_fileformat.vim
index 256a7d5b1..de505d3bd 100644
--- a/src/testdir/test_fileformat.vim
+++ b/src/testdir/test_fileformat.vim
@@ -17,15 +17,17 @@ func Test_fileformat_after_bw()
 endfunc
 
 func Test_fileformat_autocommand()
-	let filecnt=['', 'foobar', 'eins', '', 'zwei', 'drei', 'vier', 'fünf', '']
-	let ffs=&ffs
-	call writefile(filecnt, 'Xfile', 'b')
-	au BufReadPre Xfile set ffs=dos ff=dos
-	new Xfile
-	call assert_equal('dos', &l:ff)
-	call assert_equal('dos', &ffs)
-	" cleanup
-	let &ffs=ffs
-	au! BufReadPre Xfile
-	bw!
+  let filecnt = ["\<CR>", "foobar\<CR>", "eins\<CR>", "\<CR>", "zwei\<CR>", "drei", "vier", "fünf", ""]
+  let ffs = &ffs
+  call writefile(filecnt, 'Xfile', 'b')
+  au BufReadPre Xfile set ffs=dos ff=dos
+  new Xfile
+  call assert_equal('dos', &l:ff)
+  call assert_equal('dos', &ffs)
+
+  " cleanup
+  call delete('Xfile')
+  let &ffs = ffs
+  au! BufReadPre Xfile
+  bw!
 endfunc
diff --git a/src/version.c b/src/version.c
index 6020472e2..7087f6424 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    226,
 /**/
     225,
 /**/
-- 
2.50.1