5 files changed, 45 insertions, 4 deletions
diff --git a/src/nvim/api/vim.c b/src/nvim/api/vim.c
index 491375bd73..e59e955aed 100644
--- a/src/nvim/api/vim.c
+++ b/src/nvim/api/vim.c
@@ -61,6 +61,7 @@ void nvim_feedkeys(String keys, String mode, Boolean escape_csi)
   bool insert = false;
   bool typed = false;
   bool execute = false;
+  bool dangerous = false;
 
   for (size_t i = 0; i < mode.size; ++i) {
     switch (mode.data[i]) {
@@ -69,6 +70,7 @@ void nvim_feedkeys(String keys, String mode, Boolean escape_csi)
     case 't': typed = true; break;
     case 'i': insert = true; break;
     case 'x': execute = true; break;
+    case '!': dangerous = true; break;
     }
   }
 
@@ -99,7 +101,13 @@ void nvim_feedkeys(String keys, String mode, Boolean escape_csi)
 
     /* Avoid a 1 second delay when the keys start Insert mode. */
     msg_scroll = false;
+    if (!dangerous) {
+      ex_normal_busy++;
+    }
     exec_normal(true);
+    if (!dangerous) {
+      ex_normal_busy--;
+    }
     msg_scroll |= save_msg_scroll;
   }
 }
diff --git a/src/nvim/edit.c b/src/nvim/edit.c
index 9d07878f24..164194f5a7 100644
--- a/src/nvim/edit.c
+++ b/src/nvim/edit.c
@@ -474,7 +474,9 @@ static int insert_check(VimState *state)
   InsertState *s = (InsertState *)state;
 
   // If typed something may trigger CursorHoldI again.
-  if (s->c != K_EVENT) {
+  if (s->c != K_EVENT
+      // but not in CTRL-X mode, a script can't restore the state
+      && ctrl_x_mode == 0) {
     did_cursorhold = false;
   }
 
diff --git a/src/nvim/testdir/test_autocmd.vim b/src/nvim/testdir/test_autocmd.vim
index 12c984888e..d3e0981025 100644
--- a/src/nvim/testdir/test_autocmd.vim
+++ b/src/nvim/testdir/test_autocmd.vim
@@ -6,3 +6,30 @@ func Test_vim_did_enter()
   " This script will never reach the main loop, can't check if v:vim_did_enter
   " becomes one.
 endfunc
+
+if !has('timers')
+  finish
+endif
+
+func ExitInsertMode(id)
+  call feedkeys("\<Esc>")
+endfunc
+
+func Test_cursorhold_insert()
+  let g:triggered = 0
+  au CursorHoldI * let g:triggered += 1
+  set updatetime=20
+  call timer_start(100, 'ExitInsertMode')
+  call feedkeys('a', 'x!')
+  call assert_equal(1, g:triggered)
+endfunc
+
+func Test_cursorhold_insert_ctrl_x()
+  let g:triggered = 0
+  au CursorHoldI * let g:triggered += 1
+  set updatetime=20
+  call timer_start(100, 'ExitInsertMode')
+  " CursorHoldI does not trigger after CTRL-X
+  call feedkeys("a\<C-X>", 'x!')
+  call assert_equal(0, g:triggered)
+endfunc
diff --git a/src/nvim/testdir/test_feedkeys.vim b/src/nvim/testdir/test_feedkeys.vim
index 33cd58949d..70500f2bb5 100644
--- a/src/nvim/testdir/test_feedkeys.vim
+++ b/src/nvim/testdir/test_feedkeys.vim
@@ -6,5 +6,9 @@ func Test_feedkeys_x_with_empty_string()
   call assert_equal('', getline('.'))
   call feedkeys('', 'x')
   call assert_equal('foo', getline('.'))
+
+  " check it goes back to normal mode immediately.
+  call feedkeys('i', 'x')
+  call assert_equal('foo', getline('.'))
   quit!
 endfunc
diff --git a/src/nvim/version.c b/src/nvim/version.c
index f78ae00dad..c48b26c9ce 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -684,8 +684,8 @@ static int included_patches[] = {
   // 1762,
   // 1761,
   // 1760 NA
-  // 1759,
-  // 1758,
+  1759,
+  1758,
   1757,
   // 1756 NA
   1755,
@@ -752,7 +752,7 @@ static int included_patches[] = {
   1695,
   // 1694 NA
   // 1693 NA
-  // 1692,
+  1692,
   1691,
   // 1690 NA
   // 1689 NA