Merge branch 'master' into v2.1

This commit is contained in:
Mike Pall 2020-07-12 14:33:01 +02:00
commit 6097795367

View File

@ -581,6 +581,7 @@ static ptrdiff_t finderrfunc(lua_State *L)
if (cframe_canyield(cf)) return 0;
if (cframe_errfunc(cf) >= 0)
return cframe_errfunc(cf);
cf = cframe_prev(cf);
frame = frame_prevd(frame);
break;
case FRAME_PCALL: