diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-01-24 13:18:43 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-01-24 13:18:43 +0100 |
| commit | 1695f99d08076d77ed3015f1edf09a668a4d449a (patch) | |
| tree | c4b1ce5374c3dcee314d6c21610885d73da29f69 | |
| parent | 9957a10d0f0c34d8083af6ed66e198e4796038e0 (diff) | |
| download | vim-git-1695f99d08076d77ed3015f1edf09a668a4d449a.tar.gz | |
patch 8.0.0226: test for patch 8.0.0224 missing CR charactersv8.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>.
| -rw-r--r-- | src/testdir/test_fileformat.vim | 24 | ||||
| -rw-r--r-- | 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 @@ -765,6 +765,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 226, +/**/ 225, /**/ 224, |