From 25859dd74cd5befe964627dc03b8369dfaebe837 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sun, 30 Aug 2020 12:54:53 +0200 Subject: patch 8.2.1543: Vim9: test with invalid SID is skipped in the GUI Problem: Vim9: test with invalid SID is skipped in the GUI. Solution: Read the CTRL-C that feedkeys() put in typeahead. --- src/testdir/test_vim9_script.vim | 8 ++++---- src/version.c | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim index 6d520a33ef..8ebcc28772 100644 --- a/src/testdir/test_vim9_script.vim +++ b/src/testdir/test_vim9_script.vim @@ -2364,6 +2364,8 @@ def Test_interrupt_loop() assert_equal(100, x) endtry assert_true(caught, 'should have caught an exception') + # consume the CTRL-C + getchar(0) enddef def Test_automatic_line_continuation() @@ -3177,7 +3179,7 @@ func Test_vim9script_not_global() " caught endtry - call delete('Xvim9script.vium') + call delete('Xvim9script.vim') endfunc def Test_vim9_copen() @@ -3261,10 +3263,8 @@ def Test_cmdline_win() enddef def Test_invalid_sid() - # TODO: why does this not work in the GUI? - CheckNotGui - assert_fails('func 1234_func', 'E123:') + if RunVim([], ['wq Xdidit'], '+"func 1_func"') call assert_equal([], readfile('Xdidit')) endif diff --git a/src/version.c b/src/version.c index 1a66eb6a31..8eaf484477 100644 --- a/src/version.c +++ b/src/version.c @@ -754,6 +754,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1543, /**/ 1542, /**/ -- cgit v1.2.3