patch 7.4.1734
Problem: Test fails when not using utf-8.
Solution: Split test in regularand utf-8 part.
diff --git a/src/testdir/test_alot_utf8.vim b/src/testdir/test_alot_utf8.vim
index 20d919c..e55555e 100644
--- a/src/testdir/test_alot_utf8.vim
+++ b/src/testdir/test_alot_utf8.vim
@@ -4,4 +4,5 @@
" These tests use utf8 'encoding'. Setting 'encoding' is in the individual
" files, so that they can be run by themselves.
+source test_expr_utf8.vim
source test_regexp_utf8.vim
diff --git a/src/testdir/test_expr.vim b/src/testdir/test_expr.vim
index cdaf45e..c8c8e2c 100644
--- a/src/testdir/test_expr.vim
+++ b/src/testdir/test_expr.vim
@@ -59,17 +59,6 @@
call assert_equal(-1, strgetchar('axb', -1))
call assert_equal(-1, strgetchar('axb', 3))
call assert_equal(-1, strgetchar('', 0))
-
- if !has('multi_byte')
- return
- endif
-
- call assert_equal(char2nr('á'), strgetchar('áxb', 0))
- call assert_equal(char2nr('x'), strgetchar('áxb', 1))
-
- 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()
@@ -84,16 +73,4 @@
call assert_equal('', strcharpart('axb', -2, 2))
call assert_equal('a', strcharpart('axb', -1, 2))
-
- if !has('multi_byte')
- return
- endif
-
- call assert_equal('áxb', strcharpart('áxb', 0))
- call assert_equal('á', strcharpart('áxb', 0, 1))
- call assert_equal('x', strcharpart('áxb', 1, 1))
-
- call assert_equal('a', strcharpart('àxb', 0, 1))
- call assert_equal('̀', strcharpart('àxb', 1, 1))
- call assert_equal('x', strcharpart('àxb', 2, 1))
endfunc
diff --git a/src/testdir/test_expr_utf8.vim b/src/testdir/test_expr_utf8.vim
new file mode 100644
index 0000000..8b10e63
--- /dev/null
+++ b/src/testdir/test_expr_utf8.vim
@@ -0,0 +1,26 @@
+" Tests for expressions using utf-8.
+if !has('multi_byte')
+ finish
+endif
+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(-1, strgetchar('axb', -1))
+ call assert_equal(-1, strgetchar('axb', 3))
+ call assert_equal(-1, strgetchar('', 0))
+endfunc
+
+func Test_strcharpart()
+ call assert_equal('áxb', strcharpart('áxb', 0))
+ call assert_equal('á', strcharpart('áxb', 0, 1))
+ call assert_equal('x', strcharpart('áxb', 1, 1))
+
+ call assert_equal('a', strcharpart('àxb', 0, 1))
+ call assert_equal('̀', strcharpart('àxb', 1, 1))
+ call assert_equal('x', strcharpart('àxb', 2, 1))
+endfunc
diff --git a/src/version.c b/src/version.c
index 873f21c..a013661 100644
--- a/src/version.c
+++ b/src/version.c
@@ -749,6 +749,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1734,
+/**/
1733,
/**/
1732,