Merge #11647 from janlazo/vim-8.2.0070

vim-patch:8.2.{70,74,75,76}

3 files changed, 17 insertions, 9 deletions

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
@@ -2489,12 +2489,6 @@ return {
       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'},
       vi_def=false,
diff --git a/src/nvim/testdir/test_python3.vim b/src/nvim/testdir/test_python3.vim
index 5268dc9d1e..948ef0a07f 100644
--- a/src/nvim/testdir/test_python3.vim
+++ b/src/nvim/testdir/test_python3.vim
@@ -174,8 +174,22 @@ func Test_Catch_Exception_Message()
 endfunc
 
 func Test_unicode()
+  throw 'skipped: Nvim does not support "termencoding" option and only supports "utf-8" for "encoding" option'
   " this crashed Vim once
-  " set encoding=utf32
+  if &tenc != ''
+    throw "Skipped: 'termencoding' is not empty"
+  endif
+
+  set encoding=utf32
   py3 print('hello')
-  " set encoding=utf8
+
+  if !has('win32')
+    set encoding=debug
+    py3 print('hello')
+  endif
+
+  set encoding=euc-tw
+  py3 print('hello')
+
+  set encoding=utf8
 endfunc