diff options
| author | Bram Moolenaar <Bram@vim.org> | 2021-08-10 21:39:20 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-08-10 21:39:20 +0200 |
| commit | 52eb372a04dfc5d5afef238c1b3c4a8e92020837 (patch) | |
| tree | 561992e6efc7e1f02d0add7b253b19bd9c11a5e0 | |
| parent | 917c46abe559f3d779ad87500e874376111ca1ef (diff) | |
| download | vim-git-52eb372a04dfc5d5afef238c1b3c4a8e92020837.tar.gz | |
patch 8.2.3325: digraph test fails when LC_ALL is set to "C"v8.2.3325
Problem: Digraph test fails when LC_ALL is set to "C".
Solution: When restoring 'encoding' set it to "utf-8". (closes #8742)
| -rw-r--r-- | src/testdir/test_digraph.vim | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/testdir/test_digraph.vim b/src/testdir/test_digraph.vim index 30dae9495..5f924aa0b 100644 --- a/src/testdir/test_digraph.vim +++ b/src/testdir/test_digraph.vim @@ -557,6 +557,7 @@ endfunc func Test_digraph_get_function_encode() CheckFeature iconv + let testcases = { \'00': '∞', \'aa': 'あ', @@ -565,7 +566,7 @@ func Test_digraph_get_function_encode() call digraph_set(key, ch) set encoding=japan call assert_equal(iconv(ch, 'utf-8', 'japan'), digraph_get(key)) - set encoding& + set encoding=utf-8 endfor endfunc @@ -592,4 +593,6 @@ func Test_digraph_getlist_function() call assert_equal(digraph_getlist()->len(), digraph_getlist(0)->len()) call assert_notequal((digraph_getlist()->len()), digraph_getlist(1)->len()) endfunc + + " vim: shiftwidth=2 sts=2 expandtab diff --git a/src/version.c b/src/version.c index 0255bf65d..04b5749bf 100644 --- a/src/version.c +++ b/src/version.c @@ -756,6 +756,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 3325, +/**/ 3324, /**/ 3323, |