diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-02-16 14:55:22 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-02-16 14:55:22 +0100 |
| commit | 50434bd74c7708e3e2a47449b6a3a8d9fa069f71 (patch) | |
| tree | 4fada6cd399aef0279507594059c7a95bea16d5d | |
| parent | f0cee1971f5258ce61f8a4e6a04d35c1e625bb01 (diff) | |
patch 8.2.0262: fileformat test fails on MS-Windowsv8.2.0262
Problem: Fileformat test fails on MS-Windows.
Solution: Set fileformat of buffer.
| -rw-r--r-- | src/testdir/test_fileformat.vim | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/testdir/test_fileformat.vim b/src/testdir/test_fileformat.vim index efc5a0dd17..9f90debd7f 100644 --- a/src/testdir/test_fileformat.vim +++ b/src/testdir/test_fileformat.vim @@ -281,10 +281,13 @@ endfunc func Test_fileformat_plusplus_read() new call setline(1, ['one', 'two', 'three']) + set ff=unix w ++ff=dos Xfile1 enew! + " A :read doesn't change the fileformat, but does apply to the read lines. r ++fileformat=unix Xfile1 call assert_equal('unix', &fileformat) + call assert_equal("three\r", getline('$')) 3r ++edit Xfile1 call assert_equal('dos', &fileformat) close! diff --git a/src/version.c b/src/version.c index ba8343dd9c..95d4cd8438 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 */ /**/ + 262, +/**/ 261, /**/ 260, |