Merge remote-tracking branch 'upstream/master' into usermarksusermarks

1 files changed, 18 insertions, 2 deletions

diff --git a/test/functional/terminal/buffer_spec.lua b/test/functional/terminal/buffer_spec.lua
index 23430a620b..9c8b983ff7 100644
--- a/test/functional/terminal/buffer_spec.lua
+++ b/test/functional/terminal/buffer_spec.lua
@@ -4,6 +4,7 @@ local assert_alive = helpers.assert_alive
 local feed, clear, nvim = helpers.feed, helpers.clear, helpers.nvim
 local poke_eventloop = helpers.poke_eventloop
 local eval, feed_command, source = helpers.eval, helpers.feed_command, helpers.source
+local pcall_err = helpers.pcall_err
 local eq, neq = helpers.eq, helpers.neq
 local meths = helpers.meths
 local retry = helpers.retry
@@ -14,6 +15,8 @@ local matches = helpers.matches
 local exec_lua = helpers.exec_lua
 local sleep = helpers.sleep
 local funcs = helpers.funcs
+local is_os = helpers.is_os
+local skip = helpers.skip
 
 describe(':terminal buffer', function()
   local screen
@@ -199,7 +202,7 @@ describe(':terminal buffer', function()
 
     -- Save the buffer number of the terminal for later testing.
     local tbuf = eval('bufnr("%")')
-    local exitcmd = helpers.iswin()
+    local exitcmd = helpers.is_os('win')
       and "['cmd', '/c', 'exit']"
       or "['sh', '-c', 'exit']"
     source([[
@@ -261,7 +264,7 @@ describe(':terminal buffer', function()
   end)
 
   it('it works with set rightleft #11438', function()
-    if helpers.pending_win32(pending) then return end
+    skip(is_os('win'))
     local columns = eval('&columns')
     feed(string.rep('a', columns))
     command('set rightleft')
@@ -339,6 +342,11 @@ describe(':terminal buffer', function()
     ]]}
     eq('t', funcs.mode(1))
   end)
+
+  it('writing to an existing file with :w fails #13549', function()
+    eq('Vim(write):E13: File exists (add ! to override)',
+       pcall_err(command, 'write test/functional/fixtures/tty-test.c'))
+  end)
 end)
 
 describe('No heap-buffer-overflow when using', function()
@@ -404,6 +412,14 @@ describe('on_lines does not emit out-of-bounds line indexes when', function()
     feed_command('bdelete!')
     eq('', exec_lua([[return _G.cb_error]]))
   end)
+
+  it('runs TextChangedT event', function()
+    meths.set_var('called', 0)
+    command('autocmd TextChangedT * ++once let g:called = 1')
+    feed_command('terminal')
+    feed('iaa')
+    eq(1, meths.get_var('called'))
+  end)
 end)
 
 it('terminal truncates number of composing characters to 5', function()