From 67a2207c4a4d9b848a4759a7f1e11b5ad1265648 Mon Sep 17 00:00:00 2001
From: ckelsel <ckelsel@hotmail.com>
Date: Fri, 10 Nov 2017 23:28:58 +0800
Subject: vim-patch:8.0.0226

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>.

https://github.com/vim/vim/commit/1695f99d08076d77ed3015f1edf09a668a4d449a
---
 src/nvim/testdir/test_fileformat.vim | 24 +++++++++++++-----------
 src/nvim/version.c                   |  2 +-
 2 files changed, 14 insertions(+), 12 deletions(-)

(limited to 'src')

diff --git a/src/nvim/testdir/test_fileformat.vim b/src/nvim/testdir/test_fileformat.vim
index 256a7d5b1c..de505d3bd0 100644
--- a/src/nvim/testdir/test_fileformat.vim
+++ b/src/nvim/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/nvim/version.c b/src/nvim/version.c
index c57ca1e815..ae1c85d8e2 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -878,7 +878,7 @@ static const int included_patches[] = {
   229,
   // 228,
   // 227,
-  // 226,
+  226,
   // 225,
   224,
   223,
-- 
cgit