Mercurial > vim
changeset 13064:dc160dbdcfe2 v8.0.1407
patch 8.0.1407: GUI: CursorHold may trigger before 'updatetime'
commit https://github.com/vim/vim/commit/4af031dbc8d62f89c94072a406f6d2ec0e5200be
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Dec 19 10:02:43 2017 +0100
patch 8.0.1407: GUI: CursorHold may trigger before 'updatetime'
Problem: GUI: CursorHold may trigger before 'updatetime' when using timers.
Solution: Check that 'updatetime' has passed.
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Tue, 19 Dec 2017 10:15:05 +0100 |
parents | c1e813afafdd |
children | c576bdd0edfa |
files | src/gui.c src/version.c |
diffstat | 2 files changed, 14 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/gui.c +++ b/src/gui.c @@ -2923,6 +2923,9 @@ gui_wait_for_chars_or_timer(long wtime) gui_wait_for_chars(long wtime, int tb_change_cnt) { int retval; +#if defined(ELAPSED_FUNC) && defined(FEAT_AUTOCMD) + ELAPSED_TYPE start_tv; +#endif #ifdef FEAT_MENU /* @@ -2952,6 +2955,10 @@ gui_wait_for_chars(long wtime, int tb_ch return retval; } +#if defined(ELAPSED_FUNC) && defined(FEAT_AUTOCMD) + ELAPSED_INIT(start_tv); +#endif + /* * While we are waiting indefinitely for a character, blink the cursor. */ @@ -2966,7 +2973,11 @@ gui_wait_for_chars(long wtime, int tb_ch if (gui_wait_for_chars_or_timer(p_ut) == OK) retval = OK; #ifdef FEAT_AUTOCMD - else if (trigger_cursorhold() && typebuf.tb_change_cnt == tb_change_cnt) + else if (trigger_cursorhold() +# ifdef ELAPSED_FUNC + && ELAPSED_FUNC(start_tv) >= p_ut +# endif + && typebuf.tb_change_cnt == tb_change_cnt) { char_u buf[3];