From 52eb372a04dfc5d5afef238c1b3c4a8e92020837 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 10 Aug 2021 21:39:20 +0200
Subject: 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)
---
 src/testdir/test_digraph.vim | 5 ++++-
 src/version.c                | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

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
@@ -755,6 +755,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    3325,
 /**/
     3324,
 /**/
-- 
cgit v1.2.1