Mercurial > vim
changeset 17282:6f1679e1082d v8.1.1640
patch 8.1.1640: the CursorHold autocommand takes down a balloon
commit https://github.com/vim/vim/commit/c2f5054be9301c8a47b92a4584338cb2de24b96c
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri Jul 5 23:24:56 2019 +0200
patch 8.1.1640: the CursorHold autocommand takes down a balloon
Problem: The CursorHold autocommand takes down a balloon. (Paul Jolly)
Solution: Ignore the CursorHold pseudo-key.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Fri, 05 Jul 2019 23:30:06 +0200 |
| parents | 0f11ef19b3d3 |
| children | 6ea5e2c14ea4 |
| files | src/getchar.c src/testdir/dumps/Test_balloon_eval_term_01.dump src/testdir/dumps/Test_balloon_eval_term_01a.dump src/testdir/test_balloon.vim src/version.c |
| diffstat | 5 files changed, 31 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/getchar.c +++ b/src/getchar.c @@ -1794,7 +1794,7 @@ vgetc(void) may_garbage_collect = FALSE; #endif #ifdef FEAT_BEVAL_TERM - if (c != K_MOUSEMOVE && c != K_IGNORE) + if (c != K_MOUSEMOVE && c != K_IGNORE && c != K_CURSORHOLD) { /* Don't trigger 'balloonexpr' unless only the mouse was moved. */ bevalexpr_due_set = FALSE;
--- a/src/testdir/dumps/Test_balloon_eval_term_01.dump +++ b/src/testdir/dumps/Test_balloon_eval_term_01.dump @@ -1,4 +1,4 @@ ->o+0&#ffffff0|n|e| |o|n|e| |o|n|e| @38 +|o+0&#ffffff0|n>e| |o|n|e| |o|n|e| @38 @2|o| |t|X|o| |t|w|o| @38 |t|h|r|e| +0#0000001#ffd7ff255@21| +0#0000000#ffffff0@23 |~+0#4040ff13&| @2| +0#0000001#ffd7ff255|l|i|n|e| |2| |c|o|l|u|m|n| |6|:| |t|X|o| | +0#4040ff13#ffffff0@23 @@ -7,4 +7,4 @@ |~| @48 |~| @48 |~| @48 -| +0#0000000&@31|1|,|1| @10|A|l@1| +|:+0#0000000&|c|a|l@1| |T|r|i|g@1|e|r|(|)| @16|1|,|3| @10|A|l@1|
new file mode 100644 --- /dev/null +++ b/src/testdir/dumps/Test_balloon_eval_term_01a.dump @@ -0,0 +1,10 @@ +|o+0&#ffffff0|n>e| |o|n|e| |o|n|e| @38 +@2|o| |t|X|o| |t|w|o| @38 +|t|h|r|e| +0#0000001#ffd7ff255@21| +0#0000000#ffffff0@23 +|~+0#4040ff13&| @2| +0#0000001#ffd7ff255|l|i|n|e| |2| |c|o|l|u|m|n| |6|:| |t|X|o| | +0#4040ff13#ffffff0@23 +|~| @2| +0#0000001#ffd7ff255@21| +0#4040ff13#ffffff0@23 +|~| @48 +|~| @48 +|~| @48 +|~| @48 +|h+0#0000000&|o|l|d| |f|i|r|e|d| @39
--- a/src/testdir/test_balloon.vim +++ b/src/testdir/test_balloon.vim @@ -25,16 +25,28 @@ let s:common_script =<< trim [CODE] func Test_balloon_eval_term() " Use <Ignore> after <MouseMove> to return from vgetc() without removing " the balloon. - call writefile(s:common_script + [ - \ 'call test_setmouse(2, 6)', - \ 'call feedkeys("\<MouseMove>\<Ignore>", "xt")', - \ ], 'XTest_beval') + let xtra_lines =<< trim [CODE] + set updatetime=300 + au CursorHold * echo 'hold fired' + func Trigger() + call test_setmouse(2, 6) + call feedkeys("\<MouseMove>\<Ignore>", "xt") + endfunc + [CODE] + call writefile(s:common_script + xtra_lines, 'XTest_beval') " Check that the balloon shows up after a mouse move let buf = RunVimInTerminal('-S XTest_beval', {'rows': 10, 'cols': 50}) call term_wait(buf, 100) + call term_sendkeys(buf, 'll') + call term_sendkeys(buf, ":call Trigger()\<CR>") call VerifyScreenDump(buf, 'Test_balloon_eval_term_01', {}) + " Make sure the balloon still shows after 'updatetime' passed and CursorHold + " was triggered. + call term_wait(buf, 300) + call VerifyScreenDump(buf, 'Test_balloon_eval_term_01a', {}) + " clean up call StopVimInTerminal(buf) call delete('XTest_beval')