# HG changeset patch # User Christian Brabandt # Date 1460667606 -7200 # Node ID 6393ac6d70602f00fb6f3b835e3f56f20b13bc2a # Parent d827c96db69b4e650be5059788295661b8bbebb2 commit https://github.com/vim/vim/commit/b22bd46b9681d73d095f2eadff8163d3a6cf416b Author: Bram Moolenaar Date: Thu Apr 14 22:52:50 2016 +0200 patch 7.4.1741 Problem: Not testing utf-8 characters. Solution: Move the right asserts to the test_expr_utf8 test. diff --git a/src/testdir/test_expr_utf8.vim b/src/testdir/test_expr_utf8.vim --- 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 --- 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,