From: Bram Moolenaar Date: Sun, 22 Mar 2020 12:44:28 +0000 (+0100) Subject: patch 8.2.0424: checking for wrong return value X-Git-Tag: v8.2.0424 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=97acfc781bdb7fa2838dc6e0e7f9952ea61bb2fd;p=vim patch 8.2.0424: checking for wrong return value Problem: Checking for wrong return value. (Tom) Solution: Invert the check and fix the test. --- diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim index c83012176..9157a1d49 100644 --- a/src/testdir/test_vim9_script.vim +++ b/src/testdir/test_vim9_script.vim @@ -943,13 +943,20 @@ def Test_while_loop() enddef def Test_interrupt_loop() + let caught = false let x = 0 - while 1 - x += 1 - if x == 100 - feedkeys("\", 'Lt') - endif - endwhile + try + while 1 + x += 1 + if x == 100 + feedkeys("\", 'Lt') + endif + endwhile + catch + caught = true + assert_equal(100, x) + endtry + assert_true(caught, 'should have caught an exception') enddef def Test_substitute_cmd() diff --git a/src/version.c b/src/version.c index 198c42adf..166c1d488 100644 --- a/src/version.c +++ b/src/version.c @@ -738,6 +738,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 424, /**/ 423, /**/ diff --git a/src/vim9execute.c b/src/vim9execute.c index 33b6430a5..9f829d69f 100644 --- a/src/vim9execute.c +++ b/src/vim9execute.c @@ -487,7 +487,7 @@ call_def_function( { // Turn CTRL-C into an exception. got_int = FALSE; - if (throw_exception("Vim:Interrupt", ET_INTERRUPT, NULL) != FAIL) + if (throw_exception("Vim:Interrupt", ET_INTERRUPT, NULL) == FAIL) goto failed; did_throw = TRUE; }