aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Ennen <mike.ennen@gmail.com>2016-12-21 16:09:54 -0700
committerMichael Ennen <mike.ennen@gmail.com>2016-12-31 14:38:27 -0700
commit137dfdcc4e132616412e7d80e2c5fd879ae85192 (patch)
tree5a724f7faf2f494d4aacbe82c7dc7513d6542fef
parente8ccaa7a527f93ba8e40e4b15baaab71bea85b4c (diff)
downloadrneovim-137dfdcc4e132616412e7d80e2c5fd879ae85192.tar.gz
rneovim-137dfdcc4e132616412e7d80e2c5fd879ae85192.tar.bz2
rneovim-137dfdcc4e132616412e7d80e2c5fd879ae85192.zip
vim-patch:7.4.1785
Problem: Regexp test fails on windows. Solution: set 'isprint' to the right value for testing. https://github.com/vim/vim/commit/490465bda6ab66f78041709cc02f48a25486a3e5
-rw-r--r--src/nvim/testdir/test_expr_utf8.vim1
-rw-r--r--src/nvim/version.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/nvim/testdir/test_expr_utf8.vim b/src/nvim/testdir/test_expr_utf8.vim
index 6ec3a00154..097d708329 100644
--- a/src/nvim/testdir/test_expr_utf8.vim
+++ b/src/nvim/testdir/test_expr_utf8.vim
@@ -37,6 +37,7 @@ func Test_strcharpart_utf8()
endfunc
func s:classes_test()
+ set isprint=@,161-255
call assert_equal('Motörhead', matchstr('Motörhead', '[[:print:]]\+'))
let alphachars = ''
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 27736d9e98..be17b6775a 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -655,7 +655,7 @@ static int included_patches[] = {
// 1788 NA
// 1787 NA
// 1786 NA
- // 1785,
+ 1785,
// 1784 NA
1783,
1782,