# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1606163987 0
# Node ID 1151140fc7579eb9df9107dddc50b59647288daf
# Parent  f6661fac7e9a61d6afd598c2204442a105c845f9# Parent  75636bf13bf03c024a34446ab0a46f3d3afe374c
Merge 0.11->trunk

diff -r f6661fac7e9a -r 1151140fc757 util/promise.lua
--- a/util/promise.lua	Sun Nov 22 00:52:49 2020 +0100
+++ b/util/promise.lua	Mon Nov 23 20:39:47 2020 +0000
@@ -81,7 +81,7 @@
 	local p = setmetatable({ _state = "pending", _next = next_pending, _pending_on_fulfilled = {}, _pending_on_rejected = {} }, promise_mt);
 	if f then
 		local resolve, reject = new_resolve_functions(p);
-		local ok, ret = pcall(f, resolve, reject);
+		local ok, ret = xpcall(f, debug.traceback, resolve, reject);
 		if not ok and p._state == "pending" then
 			reject(ret);
 		end