summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/testdir/test_timers.vim7
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 3 deletions
diff --git a/src/testdir/test_timers.vim b/src/testdir/test_timers.vim
index 84fe05e557..7a5cc29f5a 100644
--- a/src/testdir/test_timers.vim
+++ b/src/testdir/test_timers.vim
@@ -298,8 +298,9 @@ func Interrupt(timer)
endfunc
func Test_timer_peek_and_get_char()
- CheckUnix
- CheckGui
+ if !has('unix') && !has('gui_running')
+ throw 'Skipped: cannot feed low-level input'
+ endif
call timer_start(0, 'FeedAndPeek')
let intr = timer_start(100, 'Interrupt')
@@ -310,7 +311,7 @@ endfunc
func Test_timer_getchar_zero()
if has('win32') && !has('gui_running')
- throw 'Skipped: cannot get low-level input'
+ throw 'Skipped: cannot feed low-level input'
endif
CheckFunction reltimefloat
diff --git a/src/version.c b/src/version.c
index 6415b59caf..42e9135e1f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -736,6 +736,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 19,
+/**/
18,
/**/
17,