From b007e5d8820c613606bdc3afcb49d7eecc14ea0b Mon Sep 17 00:00:00 2001
From: Jan Edmund Lazo <jan.lazo@mail.utoronto.ca>
Date: Sat, 5 Oct 2019 22:59:31 -0400
Subject: vim-patch:8.1.0059: displayed digraph for "ga" wrong with 'encoding'
 "cp1251"

Problem:    Displayed digraph for "ga" wrong with 'encoding' "cp1251".
Solution:   Convert from 'encoding' to "utf-8" if needed. (closes vim/vim#3015)
https://github.com/vim/vim/commit/bc5020aa4d7ef4aea88395eff858f74fc881eab9
---
 src/nvim/digraph.c                |  3 ++-
 src/nvim/testdir/test_digraph.vim | 13 +++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/nvim/digraph.c b/src/nvim/digraph.c
index f6ec350488..427b5537f3 100644
--- a/src/nvim/digraph.c
+++ b/src/nvim/digraph.c
@@ -1450,8 +1450,9 @@ int do_digraph(int c)
 
 /// Find a digraph for "val".  If found return the string to display it.
 /// If not found return NULL.
-char_u *get_digraph_for_char(int val)
+char_u *get_digraph_for_char(int val_arg)
 {
+  const int val = val_arg;
   digr_T *dp;
   static char_u r[3];
 
diff --git a/src/nvim/testdir/test_digraph.vim b/src/nvim/testdir/test_digraph.vim
index 62a5da33df..5da05e85b5 100644
--- a/src/nvim/testdir/test_digraph.vim
+++ b/src/nvim/testdir/test_digraph.vim
@@ -465,4 +465,17 @@ func Test_show_digraph()
   bwipe!
 endfunc
 
+func Test_show_digraph_cp1251()
+  throw 'skipped: Nvim supports ''utf8'' encoding only'
+  if !has('multi_byte')
+    return
+  endif
+  new
+  set encoding=cp1251
+  call Put_Dig("='")
+  call assert_equal("\n<\xfa>  <|z>  <M-z>  250,  Hex fa,  Oct 372, Digr ='", execute('ascii'))
+  set encoding=utf-8
+  bwipe!
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab
-- 
cgit