patch 8.0.0862: file size test fails on MS-Windows

Problem:    File size test fails on MS-Windows.
Solution:   Set fileformat after opening new buffer.  Strip CR.

diff --git a/src/testdir/test_file_size.vim b/src/testdir/test_file_size.vim
index f9d453ba8412726971189c9b9688f1461c04e408..624d49359b756039254041538b2ee40e281db556 100644 (file)
--- a/src/testdir/test_file_size.vim
+++ b/src/testdir/test_file_size.vim
@@ -11,17 +11,18 @@ func Test_File_Size()
   if !executable('cksum')
       return
   endif
-  set belloff=all fileformat=unix undolevels=-1
 
   new
+  set belloff=all fileformat=unix undolevels=-1
   for i in range(1, 2000000, 100)
       call append(i, range(i, i + 99))
   endfor
 
   1delete
   w! Xtest
-  let l = systemlist('cksum Xtest')
-  call assert_equal('3678979763 14888896 Xtest', l[0])
+  let res = systemlist('cksum Xtest')[0]
+  let res = substitute(res, "\r", "", "")
+  call assert_equal('3678979763 14888896 Xtest', res)
 
   enew!
   call delete('Xtest')

diff --git a/src/version.c b/src/version.c
index 5a77e0ab901ca1ec2ce6f3c42f11b04b69858a04..c15a6b33fa820d6b9aa62be6b269b5023bb83bb8 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -769,6 +769,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    862,
 /**/
     861,
 /**/