Merge pull request #2905 from bfredl/utf8

Only allow encoding=utf-8 and simplify multibyte code

1 files changed, 11 insertions, 12 deletions

diff --git a/test/functional/ex_cmds/encoding_spec.lua b/test/functional/ex_cmds/encoding_spec.lua
index e2b3e7e31d..87ed7a2d0a 100644
--- a/test/functional/ex_cmds/encoding_spec.lua
+++ b/test/functional/ex_cmds/encoding_spec.lua
@@ -15,27 +15,26 @@ describe('&encoding', function()
     execute('set encoding=latin1')
     -- error message expected
     feed('<cr>')
-    neq(nil, string.find(eval('v:errmsg'), '^E905:'))
+    neq(nil, string.find(eval('v:errmsg'), '^E474:'))
     eq('utf-8', eval('&encoding'))
     -- check nvim is still in utf-8 mode
     eq(3, eval('strwidth("Bär")'))
   end)
 
-  it('can be changed before startup', function()
+  it('cannot be changed before startup', function()
     clear('--cmd', 'set enc=latin1')
-    execute('set encoding=utf-8')
     -- error message expected
     feed('<cr>')
-    eq('latin1', eval('&encoding'))
-    eq(4, eval('strwidth("Bär")'))
+    neq(nil, string.find(eval('v:errmsg'), '^E474:'))
+    eq('utf-8', eval('&encoding'))
+    eq(3, eval('strwidth("Bär")'))
   end)
 
-  it('is not changed by `set all&`', function()
-    -- we need to set &encoding to something non-default. Use 'latin1'
-    clear('--cmd', 'set enc=latin1')
-    execute('set all&')
-    eq('latin1', eval('&encoding'))
-    eq(4, eval('strwidth("Bär")'))
-  end)
+  it('can be set to utf-8 without error', function()
+    execute('set encoding=utf-8')
+    eq("", eval('v:errmsg'))
 
+    clear('--cmd', 'set enc=utf-8')
+    eq("", eval('v:errmsg'))
+  end)
 end)