aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2019-05-12 09:03:59 -0400
committerJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2019-05-18 12:21:06 -0400
commita33010d1e1af3c61380285f1ecdcc0786674bf8d (patch)
treea180f84ed017da896e3dc4b3be324dfc74161c18
parent3574126b89b7162136e57a33fa5efccebefdaf37 (diff)
downloadrneovim-a33010d1e1af3c61380285f1ecdcc0786674bf8d.tar.gz
rneovim-a33010d1e1af3c61380285f1ecdcc0786674bf8d.tar.bz2
rneovim-a33010d1e1af3c61380285f1ecdcc0786674bf8d.zip
vim-patch:8.1.1325: cannot build with +eval but without +channel and +timers
Problem: Cannot build with +eval but without +channel and +timers. (John Marriott) Solution: Adjust #ifdef for get_callback(). https://github.com/vim/vim/commit/97b0075b0d733cc58c29247b09e7887b9991d7bf
-rw-r--r--src/nvim/testdir/test_autocmd.vim49
1 files changed, 25 insertions, 24 deletions
diff --git a/src/nvim/testdir/test_autocmd.vim b/src/nvim/testdir/test_autocmd.vim
index 1c1da0572b..8182c6973b 100644
--- a/src/nvim/testdir/test_autocmd.vim
+++ b/src/nvim/testdir/test_autocmd.vim
@@ -72,7 +72,31 @@ if has('timers')
au! CursorHoldI
set updatetime&
endfunc
-endif
+
+ func Test_OptionSet_modeline()
+ throw 'skipped: Nvim does not support test_override()'
+ call test_override('starting', 1)
+ au! OptionSet
+ augroup set_tabstop
+ au OptionSet tabstop call timer_start(1, {-> execute("echo 'Handler called'", "")})
+ augroup END
+ call writefile(['vim: set ts=7 sw=5 :', 'something'], 'XoptionsetModeline')
+ set modeline
+ let v:errmsg = ''
+ call assert_fails('split XoptionsetModeline', 'E12:')
+ call assert_equal(7, &ts)
+ call assert_equal('', v:errmsg)
+
+ augroup set_tabstop
+ au!
+ augroup END
+ bwipe!
+ set ts&
+ call delete('XoptionsetModeline')
+ call test_override('starting', 0)
+ endfunc
+
+endif "has('timers')
func Test_bufunload()
augroup test_bufunload_group
@@ -677,29 +701,6 @@ func Test_OptionSet_diffmode_close()
"delfunc! AutoCommandOptionSet
endfunc
-func Test_OptionSet_modeline()
- throw 'skipped: Nvim does not support test_override()'
- call test_override('starting', 1)
- au! OptionSet
- augroup set_tabstop
- au OptionSet tabstop call timer_start(1, {-> execute("echo 'Handler called'", "")})
- augroup END
- call writefile(['vim: set ts=7 sw=5 :', 'something'], 'XoptionsetModeline')
- set modeline
- let v:errmsg = ''
- call assert_fails('split XoptionsetModeline', 'E12:')
- call assert_equal(7, &ts)
- call assert_equal('', v:errmsg)
-
- augroup set_tabstop
- au!
- augroup END
- bwipe!
- set ts&
- call delete('XoptionsetModeline')
- call test_override('starting', 0)
-endfunc
-
" Test for Bufleave autocommand that deletes the buffer we are about to edit.
func Test_BufleaveWithDelete()
new | edit Xfile1