From b22bd46b9681d73d095f2eadff8163d3a6cf416b Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Thu, 14 Apr 2016 22:52:50 +0200 Subject: [PATCH] patch 7.4.1741 Problem: Not testing utf-8 characters. Solution: Move the right asserts to the test_expr_utf8 test. --- src/testdir/test_expr_utf8.vim | 11 +++++------ 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 8b10e6300..ec36deca9 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 755cf6539..07f1a0d63 100644 --- a/src/version.c +++ b/src/version.c @@ -748,6 +748,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1741, /**/ 1740, /**/ -- 2.40.0