commit bd318559cf8dea210e943100536011473f25bf68
author Bram Moolenaar <Bram@vim.org> Wed Dec 23 20:55:15 2020 +0100
committer Bram Moolenaar <Bram@vim.org> Wed Dec 23 20:55:15 2020 +0100
tree c20bd2702f546bdd9b141dd20470449d8f15da4c
parent 27bf7af9d042b396c412fcad7bac59849a4a420f

patch 8.2.2201: write file test fails on MS-Windows

Problem:    Write file test fails on MS-Windows.
Solution:   Force edit after setting 'fileformat'.

src/testdir/test_writefile.vim

diff --git a/src/testdir/test_writefile.vim b/src/testdir/test_writefile.vim
index f42ec14..92f19ce 100644
--- a/src/testdir/test_writefile.vim
+++ b/src/testdir/test_writefile.vim
@@ -683,7 +683,7 @@
 
   " 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 @@
   call assert_equal(0z6E6F656F6C0A, readfile('XNoEolSetEol', 'B'))
 
   call delete('XNoEolSetEol')
+  set ff&
+  bwipe! XNoEolSetEol
 endfunc
 
 " vim: shiftwidth=2 sts=2 expandtab

src/version.c

diff --git a/src/version.c b/src/version.c
index e3fd6c1..5cb7002 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2201,
+/**/
     2200,
 /**/
     2199,