diff options
author | Bram Moolenaar <Bram@vim.org> | 2018-12-26 01:09:00 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2018-12-26 01:09:00 +0100 |
commit | 8cf734e024af56707a1165bcdfee42364695ec8e (patch) | |
tree | 8cd94393863c2dbd03ebb77de7f3558d9a48eab7 | |
parent | 48f88ac85be8446a42a03cec45264eac21f9eba8 (diff) | |
download | vim-git-8cf734e024af56707a1165bcdfee42364695ec8e.tar.gz |
patch 8.1.0639: text properties test fails on MS-Windowsv8.1.0639
Problem: text properties test fails on MS-Windows
Solution: Set fileformat to "unix".
-rw-r--r-- | src/testdir/test_textprop.vim | 1 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/testdir/test_textprop.vim b/src/testdir/test_textprop.vim index 3ec6ea81d..ccf7d2846 100644 --- a/src/testdir/test_textprop.vim +++ b/src/testdir/test_textprop.vim @@ -230,6 +230,7 @@ func Test_prop_byteoff() 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)) diff --git a/src/version.c b/src/version.c index 5cffe09c8..30f289962 100644 --- a/src/version.c +++ b/src/version.c @@ -800,6 +800,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 639, +/**/ 638, /**/ 637, |