diff options
| author | Michael Ennen <mike.ennen@gmail.com> | 2016-10-23 17:04:26 -0700 |
|---|---|---|
| committer | Michael Ennen <mike.ennen@gmail.com> | 2016-10-23 18:04:46 -0700 |
| commit | 9e5dca84902eb620d856b1e9bd994218f4423708 (patch) | |
| tree | 70f35c1af2b4a0fe17f888e6a6b5a6ba163d88ea | |
| parent | 763422b0365cd9270dc495f31e75e75913516088 (diff) | |
| download | rneovim-9e5dca84902eb620d856b1e9bd994218f4423708.tar.gz rneovim-9e5dca84902eb620d856b1e9bd994218f4423708.tar.bz2 rneovim-9e5dca84902eb620d856b1e9bd994218f4423708.zip | |
vim-patch:7.4.1741
Problem: Not testing utf-8 characters.
Solution: Move the right asserts to the test_expr_utf8 test.
https://github.com/vim/vim/commit/b22bd46b9681d73d095f2eadff8163d3a6cf416b
| -rw-r--r-- | src/nvim/testdir/test_expr_utf8.vim | 5 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/nvim/testdir/test_expr_utf8.vim b/src/nvim/testdir/test_expr_utf8.vim index 85cddbb13a..00d5d9a63a 100644 --- a/src/nvim/testdir/test_expr_utf8.vim +++ b/src/nvim/testdir/test_expr_utf8.vim @@ -5,9 +5,8 @@ endif scriptencoding utf-8 func Test_strgetchar() - call assert_equal(char2nr('a'), strgetchar('axb', 0)) - call assert_equal(char2nr('x'), strgetchar('axb', 1)) - call assert_equal(char2nr('b'), strgetchar('axb', 2)) + call assert_equal(char2nr('á'), strgetchar('áxb', 0)) + call assert_equal(char2nr('x'), strgetchar('áxb', 1)) call assert_equal(-1, strgetchar('axb', -1)) call assert_equal(-1, strgetchar('axb', 3)) diff --git a/src/nvim/version.c b/src/nvim/version.c index cdbc0a34fe..2b6dffd38d 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -702,7 +702,7 @@ static int included_patches[] = { // 1744 NA // 1743 NA // 1742, - // 1741, + 1741, 1740, // 1739, // 1738, |