From 9654376bddac22bed1280dd96cb523f779274241 Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Sat, 5 Aug 2017 16:56:39 -0300 Subject: [PATCH] Rename love.errhand to love.errorhandler (see issue #573). love.errhand will still be called if love.errorhandler doesn't exist, and love defines love.errhand by default rather than love.errorhandler, to prevent hard-to-diagnose problems with existing code that defines love.errhand. --HG-- branch : minor --- src/scripts/boot.lua | 2 +- src/scripts/boot.lua.h | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/scripts/boot.lua b/src/scripts/boot.lua index 6dc03f195..a1c0ede46 100644 --- a/src/scripts/boot.lua +++ b/src/scripts/boot.lua @@ -716,7 +716,7 @@ function love.errhand(msg) end local function deferErrhand(...) - local handler = love.errhand or error_printer + local handler = love.errorhandler or love.errhand or error_printer return handler(...) end diff --git a/src/scripts/boot.lua.h b/src/scripts/boot.lua.h index 15e18b6e5..805ee9762 100644 --- a/src/scripts/boot.lua.h +++ b/src/scripts/boot.lua.h @@ -1295,8 +1295,9 @@ const unsigned char boot_lua[] = 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x64, 0x65, 0x66, 0x65, 0x72, 0x45, 0x72, 0x72, 0x68, 0x61, 0x6e, 0x64, 0x28, 0x2e, 0x2e, 0x2e, 0x29, 0x0a, 0x09, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x20, 0x3d, 0x20, 0x6c, - 0x6f, 0x76, 0x65, 0x2e, 0x65, 0x72, 0x72, 0x68, 0x61, 0x6e, 0x64, 0x20, 0x6f, 0x72, 0x20, 0x65, 0x72, 0x72, - 0x6f, 0x72, 0x5f, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x0a, + 0x6f, 0x76, 0x65, 0x2e, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x20, 0x6f, + 0x72, 0x20, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x65, 0x72, 0x72, 0x68, 0x61, 0x6e, 0x64, 0x20, 0x6f, 0x72, 0x20, + 0x65, 0x72, 0x72, 0x6f, 0x72, 0x5f, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x0a, 0x09, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x28, 0x2e, 0x2e, 0x2e, 0x29, 0x0a, 0x65, 0x6e, 0x64, 0x0a,