Skip to content

Commit 52eb372

Browse files
committed
patch 8.2.3325: digraph test fails when LC_ALL is set to "C"
Problem: Digraph test fails when LC_ALL is set to "C". Solution: When restoring 'encoding' set it to "utf-8". (closes #8742)
1 parent 917c46a commit 52eb372

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

src/testdir/test_digraph.vim

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -557,6 +557,7 @@ endfunc
557557

558558
func Test_digraph_get_function_encode()
559559
CheckFeature iconv
560+
560561
let testcases = {
561562
\'00': '∞',
562563
\'aa': 'あ',
@@ -565,7 +566,7 @@ func Test_digraph_get_function_encode()
565566
call digraph_set(key, ch)
566567
set encoding=japan
567568
call assert_equal(iconv(ch, 'utf-8', 'japan'), digraph_get(key))
568-
set encoding&
569+
set encoding=utf-8
569570
endfor
570571
endfunc
571572

@@ -592,4 +593,6 @@ func Test_digraph_getlist_function()
592593
call assert_equal(digraph_getlist()->len(), digraph_getlist(0)->len())
593594
call assert_notequal((digraph_getlist()->len()), digraph_getlist(1)->len())
594595
endfunc
596+
597+
595598
" vim: shiftwidth=2 sts=2 expandtab

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -755,6 +755,8 @@ static char *(features[]) =
755755

756756
static int included_patches[] =
757757
{ /* Add new patch number below this line */
758+
/**/
759+
3325,
758760
/**/
759761
3324,
760762
/**/

0 commit comments

Comments
 (0)