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().
diff --git a/src/evalfunc.c b/src/evalfunc.c
index b67aeb8..eda18e5 100644
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -14675,7 +14675,6 @@
time_for_testing = (time_t)tv_get_number(&argvars[0]);
}
-#if defined(FEAT_JOB_CHANNEL) || defined(FEAT_TIMERS) || defined(PROTO)
/*
* Get a callback from "arg". It can be a Funcref or a function name.
* When "arg" is zero return an empty string.
@@ -14716,7 +14715,6 @@
vim_free(callback);
}
}
-#endif
#ifdef FEAT_TIMERS
/*
diff --git a/src/testdir/test_autocmd.vim b/src/testdir/test_autocmd.vim
index 48db3e2..b22718a 100644
--- a/src/testdir/test_autocmd.vim
+++ b/src/testdir/test_autocmd.vim
@@ -18,6 +18,7 @@
endfunc
if has('timers')
+
func ExitInsertMode(id)
call feedkeys("\<Esc>")
endfunc
@@ -70,7 +71,30 @@
au! CursorHoldI
set updatetime&
endfunc
-endif
+
+ func Test_OptionSet_modeline()
+ 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
@@ -673,28 +697,6 @@
"delfunc! AutoCommandOptionSet
endfunc
-func Test_OptionSet_modeline()
- 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
diff --git a/src/version.c b/src/version.c
index d489880..24f4bea 100644
--- a/src/version.c
+++ b/src/version.c
@@ -768,6 +768,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1325,
+/**/
1324,
/**/
1323,