This commit is contained in:
Jan Edmund Lazo 2018-10-09 21:55:35 -04:00
parent c2e7f39528
commit 0394cb23e9

View File

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