Mercurial > vim
changeset 8945:a3060addc328 v7.4.1758
commit https://github.com/vim/vim/commit/245c41070c7f37d52be43cce0cb140bd3ade6c7e
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed Apr 20 17:37:41 2016 +0200
patch 7.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).
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Wed, 20 Apr 2016 17:45:06 +0200 |
parents | 929a23de381c |
children | 0f9988d6fa49 |
files | src/edit.c src/eval.c src/version.c |
diffstat | 3 files changed, 14 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- a/src/eval.c +++ b/src/eval.c @@ -11547,6 +11547,7 @@ f_feedkeys(typval_T *argvars, typval_T * char_u nbuf[NUMBUFLEN]; int typed = FALSE; int execute = FALSE; + int dangerous = FALSE; char_u *keys_esc; /* This is not allowed in the sandbox. If the commands would still be @@ -11569,6 +11570,7 @@ f_feedkeys(typval_T *argvars, typval_T * case 't': typed = TRUE; break; case 'i': insert = TRUE; break; case 'x': execute = TRUE; break; + case '!': dangerous = TRUE; break; } } } @@ -11592,9 +11594,11 @@ f_feedkeys(typval_T *argvars, typval_T * /* Avoid a 1 second delay when the keys start Insert mode. */ msg_scroll = FALSE; - ++ex_normal_busy; + if (!dangerous) + ++ex_normal_busy; exec_normal(TRUE); - --ex_normal_busy; + if (!dangerous) + --ex_normal_busy; msg_scroll |= save_msg_scroll; } }