3 files changed, 54 insertions, 3 deletions
diff --git a/test/functional/eval/writefile_spec.lua b/test/functional/eval/writefile_spec.lua
index 3052c616e0..2f84114b9b 100644
--- a/test/functional/eval/writefile_spec.lua
+++ b/test/functional/eval/writefile_spec.lua
@@ -80,6 +80,13 @@ describe('writefile()', function()
     eq('a\0\0\0b', read_file(fname))
   end)
 
+  it('writes with s and S', function()
+    eq(0, funcs.writefile({'\na\nb\n'}, fname, 'bs'))
+    eq('\0a\0b\0', read_file(fname))
+    eq(0, funcs.writefile({'a\n\n\nb'}, fname, 'bS'))
+    eq('a\0\0\0b', read_file(fname))
+  end)
+
   it('correctly overwrites file', function()
     eq(0, funcs.writefile({'\na\nb\n'}, fname, 'b'))
     eq('\0a\0b\0', read_file(fname))
@@ -115,6 +122,8 @@ describe('writefile()', function()
       eq('\nE729: using Funcref as a String',
          redir_exec(('call writefile(%s)'):format(args:format('function("tr")'))))
     end
+    eq('\nE5060: Unknown flag: «»',
+       redir_exec(('call writefile([], "%s", "bs«»")'):format(fname)))
     eq('TEST', read_file(fname))
   end)
 
diff --git a/test/functional/ex_cmds/write_spec.lua b/test/functional/ex_cmds/write_spec.lua
index 4ac9f312ef..9c2687971e 100644
--- a/test/functional/ex_cmds/write_spec.lua
+++ b/test/functional/ex_cmds/write_spec.lua
@@ -1,15 +1,28 @@
 local helpers = require('test.functional.helpers')(after_each)
+local lfs = require('lfs')
 local eq, eval, clear, write_file, execute, source, insert =
   helpers.eq, helpers.eval, helpers.clear, helpers.write_file,
   helpers.execute, helpers.source, helpers.insert
+local redir_exec = helpers.redir_exec
+local exc_exec = helpers.exc_exec
+local command = helpers.command
+local funcs = helpers.funcs
+local meths = helpers.meths
 
 if helpers.pending_win32(pending) then return end
 
+local fname = 'Xtest-functional-ex_cmds-write'
+local fname_bak = fname .. '~'
+local fname_broken = fname_bak .. 'broken'
+
 describe(':write', function()
   local function cleanup()
     os.remove('test_bkc_file.txt')
     os.remove('test_bkc_link.txt')
     os.remove('test_fifo')
+    os.remove(fname)
+    os.remove(fname_bak)
+    os.remove(fname_broken)
   end
   before_each(function()
     clear()
@@ -63,4 +76,34 @@ describe(':write', function()
     eq(text.."\n", fifo:read("*all"))
     fifo:close()
   end)
+
+  it('errors out correctly', function()
+    command('let $HOME=""')
+    eq(funcs.fnamemodify('.', ':p:h'), funcs.fnamemodify('.', ':p:h:~'))
+    -- Message from check_overwrite
+    eq(('\nE17: "'..funcs.fnamemodify('.', ':p:h')..'" is a directory'),
+       redir_exec('write .'))
+    meths.set_option('writeany', true)
+    -- Message from buf_write
+    eq(('\nE502: "." is a directory'),
+       redir_exec('write .'))
+    funcs.mkdir(fname_bak)
+    meths.set_option('backupdir', '.')
+    meths.set_option('backup', true)
+    write_file(fname, 'content0')
+    eq(0, exc_exec('edit ' .. fname))
+    funcs.setline(1, 'TTY')
+    eq('Vim(write):E510: Can\'t make backup file (add ! to override)',
+       exc_exec('write'))
+    meths.set_option('backup', false)
+    funcs.setfperm(fname, 'r--------')
+    eq('Vim(write):E505: "Xtest-functional-ex_cmds-write" is read-only (add ! to override)',
+       exc_exec('write'))
+    os.remove(fname)
+    os.remove(fname_bak)
+    write_file(fname_bak, 'TTYX')
+    lfs.link(fname_bak .. ('/xxxxx'):rep(20), fname, true)
+    eq('Vim(write):E166: Can\'t open linked file for writing',
+       exc_exec('write!'))
+  end)
 end)
diff --git a/test/functional/ui/cursor_spec.lua b/test/functional/ui/cursor_spec.lua
index 8b42c193ab..56f02e4e7f 100644
--- a/test/functional/ui/cursor_spec.lua
+++ b/test/functional/ui/cursor_spec.lua
@@ -1,8 +1,7 @@
 local helpers = require('test.functional.helpers')(after_each)
 local Screen = require('test.functional.ui.screen')
-local clear, feed, meths = helpers.clear, helpers.feed, helpers.meths
-local insert, execute = helpers.insert, helpers.execute
-local eq, funcs = helpers.eq, helpers.funcs
+local clear, meths = helpers.clear, helpers.meths
+local eq = helpers.eq
 local command = helpers.command
 
 describe('ui/cursor', function()