From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 23 Dec 2020 19:55:15 +0000 (+0100)
Subject: patch 8.2.2201: write file test fails on MS-Windows
X-Git-Tag: v8.2.2201
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bd318559cf8dea210e943100536011473f25bf68;p=thirdparty%2Fvim.git

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'.
---

diff --git a/src/testdir/test_writefile.vim b/src/testdir/test_writefile.vim
index f42ec14bb1..92f19ce5ad 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 e3fd6c1fe7..5cb700254d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2201,
 /**/
     2200,
 /**/