summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2021-08-15 15:04:41 +0200
committerBram Moolenaar <Bram@vim.org>2021-08-15 15:04:41 +0200
commita401bba0805856e295c213aa504648084dae7e24 (patch)
tree09deee395dda0a5dff8e2f5adf5dfbef15ca8ef8
parent5cebca27b831880fb6e191e5271ee614625e1f8a (diff)
downloadvim-git-a401bba0805856e295c213aa504648084dae7e24.tar.gz
patch 8.2.3350: text properties test fails on MS-Windowsv8.2.3350
Problem: Text properties test fails on MS-Windows. Solution: Set fileformat to unix.
-rw-r--r--src/testdir/test_textprop.vim1
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/src/testdir/test_textprop.vim b/src/testdir/test_textprop.vim
index 847968c07..6af47e36d 100644
--- a/src/testdir/test_textprop.vim
+++ b/src/testdir/test_textprop.vim
@@ -812,6 +812,7 @@ func Test_prop_line2byte()
bwipe!
new
+ setlocal ff=unix
call setline(1, range(500))
call assert_equal(1491, line2byte(401))
call prop_add(2, 1, {'type': 'comment'})
diff --git a/src/version.c b/src/version.c
index e177a0508..f7e16365d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -756,6 +756,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 3350,
+/**/
3349,
/**/
3348,