From: ShadowNinja <shadowninja@minetest.net>
Date: Thu, 24 Apr 2014 02:37:27 +0000 (-0400)
Subject: Revert "Add backtrace to error function"
X-Git-Url: http://81.2.79.47:8989/gitweb/?a=commitdiff_plain;h=e3bdd7b2ed6362c0d84d2e30e48089271695b667;p=zefram%2Fminetest%2Fminetest_engine.git

Revert "Add backtrace to error function"

This reverts commit 5b518ed2feff28c9bf21ad940c1b211b72d71bd1.

This caused duplicate tracebacks and tracebacks when unwanted.
It also ignored the level argument to error() and didn't pass the message (or level) to debug.traceback().
Use xpcall() or lua_pcall()'s errorhandler argument instead.
---

diff --git a/builtin/builtin.lua b/builtin/builtin.lua
index dc428220..a5126461 100644
--- a/builtin/builtin.lua
+++ b/builtin/builtin.lua
@@ -10,12 +10,6 @@ print = minetest.debug
 math.randomseed(os.time())
 os.setlocale("C", "numeric")
 
-local errorfct = error
-error = function(text)
-	print(debug.traceback(""))
-	errorfct(text)
-end
-
 -- Load other files
 local modpath = minetest.get_modpath("__builtin")
 dofile(modpath.."/serialize.lua")
diff --git a/builtin/mainmenu.lua b/builtin/mainmenu.lua
index 4cd1503d..67e0113b 100644
--- a/builtin/mainmenu.lua
+++ b/builtin/mainmenu.lua
@@ -2,12 +2,6 @@ print = engine.debug
 math.randomseed(os.time())
 os.setlocale("C", "numeric")
 
-local errorfct = error
-error = function(text)
-	print(debug.traceback(""))
-	errorfct(text)
-end
-
 local scriptpath = engine.get_scriptdir()
 
 mt_color_grey  = "#AAAAAA"