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)

diff --git a/src/testdir/test_digraph.vim b/src/testdir/test_digraph.vim
index 30dae9495abe2d516886925c28a177629b1ccb22..5f924aa0b853cfafb82b5835c175b3dd58eb24d5 100644 (file)
--- 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 0255bf65d054a7f46924f97566f27262a453fd3b..04b5749bf191cd60804794c8e3a9bc875eca143e 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    3325,
 /**/
     3324,
 /**/