diff --git a/src/testdir/test_timers.vim b/src/testdir/test_timers.vim
index 0b88d8a..2cea3e4 100644
--- a/src/testdir/test_timers.vim
+++ b/src/testdir/test_timers.vim
@@ -251,13 +251,20 @@
 endfunc
 
 func Test_getchar_zero()
-  call timer_start(20, {id -> feedkeys('x', 'L')})
+  if has('win32')
+    " Console: no low-level input
+    " GUI: somehow doesn't work
+    return
+  endif
+
+  let id = timer_start(20, {id -> feedkeys('x', 'L')})
   let c = 0
   while c == 0
     let c = getchar(0)
     sleep 10m
   endwhile
   call assert_equal('x', nr2char(c))
+  call timer_stop(id)
 endfunc
 
 func Test_ex_mode()
@@ -265,7 +272,7 @@
   func Foo(...)
 
   endfunc
-  let timer =  timer_start(40, function('g:Foo'), {'repeat':-1})
+  let timer = timer_start(40, function('g:Foo'), {'repeat':-1})
   " This used to throw error E749.
   exe "normal Qsleep 100m\rvi\r"
   call timer_stop(timer)
diff --git a/src/version.c b/src/version.c
index a90d52e..c8bb2f7 100644
--- a/src/version.c
+++ b/src/version.c
@@ -784,6 +784,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    842,
+/**/
     841,
 /**/
     840,