Merge pull request #11736 from bfredl/tenc

restore old 'termencoding' behavior

src/nvim/option.c

@@ -4742,13 +4742,6 @@ bool get_tty_option(char *name, char **value)
     return true;
   }
 
-  if (strequal(name, "tenc") || strequal(name, "termencoding")) {
-    if (value) {
-      *value = xstrdup("utf-8");
-    }
-    return true;
-  }
-
   if (strequal(name, "ttytype")) {
     if (value) {
       *value = p_ttytype ? xstrdup(p_ttytype) : xstrdup("nvim");

src/nvim/options.lua

@@ -2488,6 +2488,12 @@ 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'},

src/nvim/testdir/test_python3.vim

@@ -175,9 +175,7 @@ endfunc
 
 func Test_unicode()
   " this crashed Vim once
-  if &tenc != ''
-    throw "Skipped: 'termencoding' is not empty"
-  endif
+  throw "Skipped: nvim does not support changing 'encoding'"
 
   set encoding=utf32
   py3 print('hello')