From abaabd1d03fd723630f6addeadee9928faa4cdde Mon Sep 17 00:00:00 2001
From: Jan Edmund Lazo <jan.lazo@mail.utoronto.ca>
Date: Wed, 1 Jan 2020 13:03:06 -0500
Subject: vim-patch:8.2.0074: Python 3 unicode test someitmes fails

Problem:    Python 3 unicode test someitmes fails.
Solution:   Make 'termencoding' empty.  Correct number of error message.
https://github.com/vim/vim/commit/4b7cdca23035eacf6cd0e30b90546cf32f7efe9e
---
 src/nvim/change.c                 | 2 +-
 src/nvim/options.lua              | 6 ------
 src/nvim/testdir/test_python3.vim | 9 ++++++++-
 3 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/nvim/change.c b/src/nvim/change.c
index 8a782c2b20..05cacaf2c2 100644
--- a/src/nvim/change.c
+++ b/src/nvim/change.c
@@ -757,7 +757,7 @@ int del_bytes(colnr_T count, bool fixpos_arg, bool use_delcombine)
   }
   // If "count" is negative the caller must be doing something wrong.
   if (count < 1) {
-    IEMSGN("E950: Invalid count for del_bytes(): %ld", count);
+    IEMSGN("E292: Invalid count for del_bytes(): %ld", count);
     return FAIL;
   }
 
diff --git a/src/nvim/options.lua b/src/nvim/options.lua
index 7d080b8d56..a5a14a1a25 100644
--- a/src/nvim/options.lua
+++ b/src/nvim/options.lua
@@ -2488,12 +2488,6 @@ return {
       varname='p_tbidi',
       defaults={if_true={vi=false}}
     },
-    {
-      full_name='termencoding', abbreviation='tenc',
-      type='string', scope={'global'},
-      vi_def=true,
-      defaults={if_true={vi=""}}
-    },
     {
       full_name='termguicolors', abbreviation='tgc',
       type='bool', scope={'global'},
diff --git a/src/nvim/testdir/test_python3.vim b/src/nvim/testdir/test_python3.vim
index edd24c7be5..9ffca12706 100644
--- a/src/nvim/testdir/test_python3.vim
+++ b/src/nvim/testdir/test_python3.vim
@@ -174,13 +174,20 @@ func Test_Catch_Exception_Message()
 endfunc
 
 func Test_unicode()
-  throw 'skipped: Nvim only supports "utf-8" for "encoding" option'
+  throw 'skipped: Nvim does not support "termencoding" option and only supports "utf-8" for "encoding" option'
   " this crashed Vim once
+  let save_tenc = &tenc
+  set tenc=
+
   set encoding=utf32
   py3 print('hello')
+
   set encoding=debug
   py3 print('hello')
+
   set encoding=euc-tw
   py3 print('hello')
+
   set encoding=utf8
+  let &tenc = save_tenc
 endfunc
-- 
cgit