5 files changed, 1 insertions, 20 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index 4d28996d55..944ec1829a 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -6708,7 +6708,6 @@ static struct fst {
   { "did_filetype",      0, 0, f_did_filetype },
   { "diff_filler",       1, 1, f_diff_filler },
   { "diff_hlID",         2, 2, f_diff_hlID },
-  { "disable_char_avail_for_testing", 1, 1, f_disable_char_avail_for_testing },
   { "empty",             1, 1, f_empty },
   { "escape",            2, 2, f_escape },
   { "eval",              1, 1, f_eval },
@@ -8604,15 +8603,6 @@ static void f_diff_hlID(typval_T *argvars, typval_T *rettv)
   rettv->vval.v_number = hlID == (hlf_T)0 ? 0 : (int)hlID;
 }
 
-//
-// "disable_char_avail_for_testing({expr})" function
-//
-static void f_disable_char_avail_for_testing(typval_T *argvars, typval_T *rettv)
-  FUNC_ATTR_NONNULL_ARG(1)
-{
-    disable_char_avail_for_testing = get_tv_number(&argvars[0]);
-}
-
 /*
  * "empty({expr})" function
  */
diff --git a/src/nvim/getchar.c b/src/nvim/getchar.c
index b5e1e586bd..cf4174f702 100644
--- a/src/nvim/getchar.c
+++ b/src/nvim/getchar.c
@@ -1562,11 +1562,6 @@ int char_avail(void)
 {
   int retval;
 
-  // When disable_char_avail_for_testing(1) was called pretend
-  // there is no typeahead
-  if (disable_char_avail_for_testing) {
-    return false;
-  }
   no_mapping++;
   retval = vpeekc();
   --no_mapping;
diff --git a/src/nvim/globals.h b/src/nvim/globals.h
index d8331d608c..49d1de21d9 100644
--- a/src/nvim/globals.h
+++ b/src/nvim/globals.h
@@ -1239,8 +1239,6 @@ EXTERN FILE *time_fd INIT(= NULL);  /* where to write startup timing */
 EXTERN int ignored;
 EXTERN char *ignoredp;
 
-EXTERN int  disable_char_avail_for_testing INIT(= 0);
-
 // If a msgpack-rpc channel should be started over stdin/stdout
 EXTERN bool embedded_mode INIT(= false);
 EXTERN Loop loop;
diff --git a/src/nvim/testdir/test_cursor_func.vim b/src/nvim/testdir/test_cursor_func.vim
index d3236e6e01..d819b7b092 100644
--- a/src/nvim/testdir/test_cursor_func.vim
+++ b/src/nvim/testdir/test_cursor_func.vim
@@ -44,9 +44,7 @@ func Test_curswant_with_autocommand()
   new
   call setline(1, ['func()', '{', '}', '----'])
   autocmd! CursorMovedI * call s:Highlight_Matching_Pair()
-  call disable_char_avail_for_testing(1)
   exe "normal! 3Ga\<Down>X\<Esc>"
-  call disable_char_avail_for_testing(0)
   call assert_equal('-X---', getline(4))
   autocmd! CursorMovedI *
   quit!
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 89aef16f07..553f45b91a 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -377,7 +377,7 @@ static int included_patches[] = {
   // 1303 NA
   // 1302 NA
   // 1301 NA
-  1300,
+  // 1300 NA
   // 1299 NA
   // 1298 NA
   // 1297 NA