]> granicus.if.org Git - vim/commitdiff
patch 8.2.0424: checking for wrong return value v8.2.0424
authorBram Moolenaar <Bram@vim.org>
Sun, 22 Mar 2020 12:44:28 +0000 (13:44 +0100)
committerBram Moolenaar <Bram@vim.org>
Sun, 22 Mar 2020 12:44:28 +0000 (13:44 +0100)
Problem:    Checking for wrong return value. (Tom)
Solution:   Invert the check and fix the test.

src/testdir/test_vim9_script.vim
src/version.c
src/vim9execute.c

index c83012176394ce52dc5f7c1a6ff3ce87733c2857..9157a1d492e27df8f7ebe0af9ab1da9282be3d88 100644 (file)
@@ -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("\<C-C>", 'Lt')
-    endif
-  endwhile
+  try
+    while 1
+      x += 1
+      if x == 100
+        feedkeys("\<C-C>", 'Lt')
+      endif
+    endwhile
+  catch
+    caught = true
+    assert_equal(100, x)
+  endtry
+  assert_true(caught, 'should have caught an exception')
 enddef
 
 def Test_substitute_cmd()
index 198c42adfaaed232c256cc90b82a9c5d59011acf..166c1d48874838b8160094a8fd8469740899ccd2 100644 (file)
@@ -738,6 +738,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    424,
 /**/
     423,
 /**/
index 33b6430a54cfcbb74ad36c268dbd40bdcfe0b5a0..9f829d69fbfa0cad3a8f31984c4aea18a8e59041 100644 (file)
@@ -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;
        }