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

diff --git a/src/testdir/test_fileformat.vim b/src/testdir/test_fileformat.vim
index 256a7d5b1cdcffffe9d7eb90c97eec218a13dfad..de505d3bd0d2de90d9c99477c67f1b721b276142 100644 (file)
--- 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 6020472e25a22c274c27e43cf5cdb2c53f7bf1b7..7087f6424d2e6b80e6f10d17ed92893c469b9e38 100644 (file)
--- 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,
 /**/