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
index 8b10e63001aa79e868cb823bc2b6fd45955d15a4..ec36deca914a2db8d1fc03d6f0f1d12cb4e37c47 100644 (file)
--- 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 755cf65391533fb73879c5426c3ebad2f358cf3a..07f1a0d63b855ac28ccead8efdff468869537794 100644 (file)
--- 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,
 /**/