# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1511314570 -3600
# Node ID 0ea1e95b3a11e61eee53828691f53da3ee1adcf5
# Parent  54ff1f91e4dbb327f4a8994b82f17e00a275dc59# Parent  a9e8523a5e7380ff83138ab81fe728a6f2335428
Merge 0.10->trunk

diff -r 54ff1f91e4db -r 0ea1e95b3a11 util/helpers.lua
--- a/util/helpers.lua	Tue Nov 21 23:16:16 2017 +0100
+++ b/util/helpers.lua	Wed Nov 22 02:36:10 2017 +0100
@@ -50,7 +50,7 @@
 			local handler_strings = {};
 			for i, handler in ipairs(handlers) do
 				local upvals = debug.string_from_var_table(debug.get_upvalues_table(handler));
-				handler_strings[i] = "  "..priorities[handler]..": "..tostring(handler)..(upvals and ("\n        "..upvals) or "");
+				handler_strings[i] = "  "..(priorities[handler] or "?")..": "..tostring(handler)..(upvals and ("\n        "..upvals) or "");
 			end
 			event_handler_arrays[event] = handler_strings;
 		end