aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/testdir
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2020-03-08 13:36:52 -0700
committerGitHub <noreply@github.com>2020-03-08 13:36:52 -0700
commit2b00d1d09c0ff7ee6cc2de7ba70d9e84167540e5 (patch)
treee436abc7dab365b52a2385af6fabe5516907c773 /src/nvim/testdir
parentf8f41d088b2b7b503f638ce8930bedb32c0d32c5 (diff)
parentb00650cfe909313e58aa8181474d7f016d9df94a (diff)
downloadrneovim-2b00d1d09c0ff7ee6cc2de7ba70d9e84167540e5.tar.gz
rneovim-2b00d1d09c0ff7ee6cc2de7ba70d9e84167540e5.tar.bz2
rneovim-2b00d1d09c0ff7ee6cc2de7ba70d9e84167540e5.zip
Merge #11977 from janlazo/vim-8.1.1279
vim-patch:8.1.1279,8.2.{360,361}
Diffstat (limited to 'src/nvim/testdir')
-rw-r--r--src/nvim/testdir/test_filetype.vim1
-rw-r--r--src/nvim/testdir/test_timers.vim4
2 files changed, 5 insertions, 0 deletions
diff --git a/src/nvim/testdir/test_filetype.vim b/src/nvim/testdir/test_filetype.vim
index 7290cceb0b..9605348389 100644
--- a/src/nvim/testdir/test_filetype.vim
+++ b/src/nvim/testdir/test_filetype.vim
@@ -600,6 +600,7 @@ let s:script_checks = {
\ 'haskell': [['#!/path/haskell']],
\ 'cpp': [['// Standard iostream objects -*- C++ -*-'],
\ ['// -*- C++ -*-']],
+ \ 'yaml': [['%YAML 1.2']],
\ }
func Test_script_detection()
diff --git a/src/nvim/testdir/test_timers.vim b/src/nvim/testdir/test_timers.vim
index 3043103270..40376a877e 100644
--- a/src/nvim/testdir/test_timers.vim
+++ b/src/nvim/testdir/test_timers.vim
@@ -339,4 +339,8 @@ func Test_nocatch_garbage_collect()
delfunc FeedChar
endfunc
+func Test_timer_invalid_callback()
+ call assert_fails('call timer_start(0, "0")', 'E921')
+endfunc
+
" vim: shiftwidth=2 sts=2 expandtab