summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-12-23 22:40:11 +0100
committerBram Moolenaar <Bram@vim.org>2020-12-23 22:40:11 +0100
commit16204962c7ad7380a40f0855443303ad16114e2b (patch)
treefa18b294af6299e87fd5afe0a2ffba58d3768e2c
parentbd318559cf8dea210e943100536011473f25bf68 (diff)
patch 8.2.2202: write file test still fails on MS-Windowsv8.2.2202
Problem: Write file test still fails on MS-Windows. Solution: Set fileformat with the :edit command
-rw-r--r--src/testdir/test_writefile.vim4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/testdir/test_writefile.vim b/src/testdir/test_writefile.vim
index 92f19ce5ad..07beb64e64 100644
--- a/src/testdir/test_writefile.vim
+++ b/src/testdir/test_writefile.vim
@@ -682,8 +682,8 @@ func Test_read_write_bin()
call assert_equal(0z6E6F656F6C, readfile('XNoEolSetEol', 'B'))
" when file is read 'eol' is off
- set ff=unix nofixeol
- e! XNoEolSetEol
+ set nofixeol
+ e! ++ff=unix XNoEolSetEol
call assert_equal(0, &eol)
" writing with 'eol' set adds the newline
diff --git a/src/version.c b/src/version.c
index 5cb700254d..b6fb5930b2 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 */
/**/
+ 2202,
+/**/
2201,
/**/
2200,