# HG changeset patch # User Bram Moolenaar # Date 1628624704 -7200 # Node ID 6b711b01f2caf712ed4707d3ead65cce02c3a026 # Parent 432231e720aaed4c9c3be054f77215b84445a36b patch 8.2.3325: digraph test fails when LC_ALL is set to "C" Commit: https://github.com/vim/vim/commit/52eb372a04dfc5d5afef238c1b3c4a8e92020837 Author: Bram Moolenaar Date: Tue Aug 10 21:39:20 2021 +0200 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 https://github.com/vim/vim/issues/8742) diff --git a/src/testdir/test_digraph.vim b/src/testdir/test_digraph.vim --- 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 --- 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,