diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-02-16 15:08:28 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-02-16 15:08:28 +0100 |
| commit | a36c830a32f439b862ffb85d4c4b4799ee5ea2f9 (patch) | |
| tree | 366ba8b3d983b714e86b9f6343d75755f3b5b4a2 | |
| parent | df2ecddf9d0acc325c8290fbcff44de25b0c1e75 (diff) | |
patch 8.2.0264: fileformat test still fails on MS-Windowsv8.2.0264
Problem: Fileformat test still fails on MS-Windows.
Solution: Set fileformat of buffer in the right place.
| -rw-r--r-- | src/testdir/test_fileformat.vim | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/testdir/test_fileformat.vim b/src/testdir/test_fileformat.vim index 9f90debd7f..efc3b2252e 100644 --- a/src/testdir/test_fileformat.vim +++ b/src/testdir/test_fileformat.vim @@ -281,9 +281,9 @@ endfunc func Test_fileformat_plusplus_read() new call setline(1, ['one', 'two', 'three']) - set ff=unix w ++ff=dos Xfile1 enew! + set ff=unix " A :read doesn't change the fileformat, but does apply to the read lines. r ++fileformat=unix Xfile1 call assert_equal('unix', &fileformat) diff --git a/src/version.c b/src/version.c index 780330ca27..dc849eb45e 100644 --- a/src/version.c +++ b/src/version.c @@ -743,6 +743,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 264, +/**/ 263, /**/ 262, |