diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-04-14 22:52:50 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-04-14 22:52:50 +0200 |
| commit | b22bd46b9681d73d095f2eadff8163d3a6cf416b (patch) | |
| tree | 65fb764f799ec51a4d1903468fe64c434f0e5bac /src | |
| parent | 4d585022023b96f6507e8cae5ed8fc8d926f5140 (diff) | |
patch 7.4.1741v7.4.1741
Problem: Not testing utf-8 characters.
Solution: Move the right asserts to the test_expr_utf8 test.
Diffstat (limited to 'src')
| -rw-r--r-- | src/testdir/test_expr_utf8.vim | 11 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/testdir/test_expr_utf8.vim b/src/testdir/test_expr_utf8.vim index 8b10e63001..ec36deca91 100644 --- a/src/testdir/test_expr_utf8.vim +++ b/src/testdir/test_expr_utf8.vim @@ -6,13 +6,12 @@ set encoding=utf-8 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)) - call assert_equal(-1, strgetchar('', 0)) + call assert_equal(char2nr('a'), strgetchar('àxb', 0)) + call assert_equal(char2nr('̀'), strgetchar('àxb', 1)) + call assert_equal(char2nr('x'), strgetchar('àxb', 2)) endfunc func Test_strcharpart() diff --git a/src/version.c b/src/version.c index 755cf65391..07f1a0d63b 100644 --- a/src/version.c +++ b/src/version.c @@ -749,6 +749,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1741, +/**/ 1740, /**/ 1739, |