Merge #8954 from janlazo/vim-8.0.1423

src/nvim/eval.c

@@ -21797,15 +21797,15 @@ void ex_return(exarg_T *eap)
     } else {
       tv_clear(&rettv);
     }
-  }
+  } else if (!eap->skip) {  // It's safer to return also on error.
-  /* It's safer to return also on error. */
+    // In return statement, cause_abort should be force_abort.
-  else if (!eap->skip) {
+    update_force_abort();
-    /*
+
-     * Return unless the expression evaluation has been cancelled due to an
+    // Return unless the expression evaluation has been cancelled due to an
-     * aborting error, an interrupt, or an exception.
+    // aborting error, an interrupt, or an exception.
-     */
+    if (!aborting()) {
-    if (!aborting())
+      returning = do_return(eap, false, true, NULL);
-      returning = do_return(eap, FALSE, TRUE, NULL);
+    }
   }
 
   /* When skipping or the return gets pending, advance to the next command

src/nvim/testdir/test_eval_stuff.vim

@@ -0,0 +1,13 @@
+" Tests for various eval things.
+
+function s:foo() abort
+  try
+    return [] == 0
+  catch
+    return 1
+  endtry
+endfunction
+
+func Test_catch_return_with_error()
+  call assert_equal(1, s:foo())
+endfunc