summaryrefslogtreecommitdiff
path: root/src/edit.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-04-20 17:37:41 +0200
committerBram Moolenaar <Bram@vim.org>2016-04-20 17:37:41 +0200
commit245c41070c7f37d52be43cce0cb140bd3ade6c7e (patch)
treef666ae9cc35f8c7745aa0e33e885de3fcf20083c /src/edit.c
parent8e42ae5069d4985869e46eaa56900ed19e30f504 (diff)
downloadvim-git-245c41070c7f37d52be43cce0cb140bd3ade6c7e.tar.gz
patch 7.4.1758v7.4.1758
Problem: Triggering CursorHoldI when in CTRL-X mode causes problems. Solution: Do not trigger CursorHoldI in CTRL-X mode. Add "!" flag to feedkeys() (test with that didn't work though).
Diffstat (limited to 'src/edit.c')
-rw-r--r--src/edit.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/edit.c b/src/edit.c
index c813d1f89..73ed472d7 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -1526,7 +1526,12 @@ normalchar:
#ifdef FEAT_AUTOCMD
/* If typed something may trigger CursorHoldI again. */
- if (c != K_CURSORHOLD)
+ if (c != K_CURSORHOLD
+# ifdef FEAT_COMPL_FUNC
+ /* but not in CTRL-X mode, a script can't restore the state */
+ && ctrl_x_mode == 0
+# endif
+ )
did_cursorhold = FALSE;
#endif