diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-12-23 20:55:15 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-12-23 20:55:15 +0100 |
| commit | bd318559cf8dea210e943100536011473f25bf68 (patch) | |
| tree | c20bd2702f546bdd9b141dd20470449d8f15da4c | |
| parent | 27bf7af9d042b396c412fcad7bac59849a4a420f (diff) | |
| download | vim-git-bd318559cf8dea210e943100536011473f25bf68.tar.gz | |
patch 8.2.2201: write file test fails on MS-Windowsv8.2.2201
Problem: Write file test fails on MS-Windows.
Solution: Force edit after setting 'fileformat'.
| -rw-r--r-- | src/testdir/test_writefile.vim | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/testdir/test_writefile.vim b/src/testdir/test_writefile.vim index f42ec14bb..92f19ce5a 100644 --- a/src/testdir/test_writefile.vim +++ b/src/testdir/test_writefile.vim @@ -683,7 +683,7 @@ func Test_read_write_bin() " when file is read 'eol' is off set ff=unix nofixeol - e XNoEolSetEol + e! XNoEolSetEol call assert_equal(0, &eol) " writing with 'eol' set adds the newline @@ -692,6 +692,8 @@ func Test_read_write_bin() call assert_equal(0z6E6F656F6C0A, readfile('XNoEolSetEol', 'B')) call delete('XNoEolSetEol') + set ff& + bwipe! XNoEolSetEol endfunc " vim: shiftwidth=2 sts=2 expandtab diff --git a/src/version.c b/src/version.c index e3fd6c1fe..5cb700254 100644 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2201, +/**/ 2200, /**/ 2199, |