commit 8cf734e024af56707a1165bcdfee42364695ec8e
author Bram Moolenaar <Bram@vim.org> Wed Dec 26 01:09:00 2018 +0100
committer Bram Moolenaar <Bram@vim.org> Wed Dec 26 01:09:00 2018 +0100
tree 8cd94393863c2dbd03ebb77de7f3558d9a48eab7
parent 48f88ac85be8446a42a03cec45264eac21f9eba8

patch 8.1.0639: text properties test fails on MS-Windows

Problem:    text properties test fails on MS-Windows
Solution:   Set fileformat to "unix".

src/testdir/test_textprop.vim

diff --git a/src/testdir/test_textprop.vim b/src/testdir/test_textprop.vim
index 3ec6ea8..ccf7d28 100644
--- a/src/testdir/test_textprop.vim
+++ b/src/testdir/test_textprop.vim
@@ -230,6 +230,7 @@
   call prop_type_add('comment', {'highlight': 'Directory'})
   new
   call setline(1, ['line1', 'line2', ''])
+  set ff=unix
   call assert_equal(13, line2byte(3))
   call prop_add(1, 1, {'end_col': 3, 'type': 'comment'})
   call assert_equal(13, line2byte(3))

src/version.c

diff --git a/src/version.c b/src/version.c
index 5cffe09..30f2899 100644
--- a/src/version.c
+++ b/src/version.c
@@ -800,6 +800,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    639,
+/**/
     638,
 /**/
     637,