From eabfde64e92544e9d8fc32bec3262cade9378824 Mon Sep 17 00:00:00 2001
From: "kepler155c@gmail.com" <kepler155c@gmail.com>
Date: Sun, 13 Jan 2019 13:24:37 -0500
Subject: [PATCH] safe digging

---
 sys/apps/Files.lua       |  4 ++++
 sys/extensions/6.tl3.lua | 36 +++++++++++++++++++++++++++++-------
 2 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/sys/apps/Files.lua b/sys/apps/Files.lua
index 24f8c78..e40f538 100644
--- a/sys/apps/Files.lua
+++ b/sys/apps/Files.lua
@@ -135,6 +135,7 @@ local Browser = UI.Page {
   },
   accelerators = {
     q               = 'quit',
+    c               = 'cedit',
     e               = 'edit',
     s               = 'shell',
     r               = 'refresh',
@@ -341,6 +342,9 @@ function Browser:eventHandler(event)
   elseif event.type == 'edit' and file then
     self:run('edit', file.name)
 
+  elseif event.type == 'cedit' and file then
+    self:run('cedit', file.name)
+
   elseif event.type == 'shell' then
     self:run('sys/apps/shell')
 
diff --git a/sys/extensions/6.tl3.lua b/sys/extensions/6.tl3.lua
index fea55e2..dd8f522 100644
--- a/sys/extensions/6.tl3.lua
+++ b/sys/extensions/6.tl3.lua
@@ -71,10 +71,32 @@ end
 
 turtle.reset()
 
+local function _dig(name, inspect, dig)
+	if name then
+		local s, b = inspect()
+		if not s or b.name ~= name then
+			return false
+		end
+	end
+	return dig()
+end
+
+function turtle.dig(s)
+	return _dig(s, turtle.inspect, turtle.native.dig)
+end
+
+function turtle.digUp(s)
+	return _dig(s, turtle.inspectUp, turtle.native.digUp)
+end
+
+function turtle.digDown(s)
+	return _dig(s, turtle.inspectDown, turtle.native.digDown)
+end
+
 local actions = {
 	up = {
 		detect = turtle.native.detectUp,
-		dig = turtle.native.digUp,
+		dig = turtle.digUp,
 		move = turtle.native.up,
 		attack = turtle.native.attackUp,
 		place = turtle.native.placeUp,
@@ -86,7 +108,7 @@ local actions = {
 	},
 	down = {
 		detect = turtle.native.detectDown,
-		dig = turtle.native.digDown,
+		dig = turtle.digDown,
 		move = turtle.native.down,
 		attack = turtle.native.attackDown,
 		place = turtle.native.placeDown,
@@ -98,7 +120,7 @@ local actions = {
 	},
 	forward = {
 		detect = turtle.native.detect,
-		dig = turtle.native.dig,
+		dig = turtle.dig,
 		move = turtle.native.forward,
 		attack = turtle.native.attack,
 		place = turtle.native.place,
@@ -1164,10 +1186,10 @@ function turtle.detectDownAt(pt)         return _actionDownAt(actionsAt.detect,
 function turtle.detectForwardAt(pt)      return _actionForwardAt(actionsAt.detect, pt) end
 function turtle.detectUpAt(pt)           return _actionUpAt(actionsAt.detect, pt) end
 
-function turtle.digAt(pt)                return _actionAt(actionsAt.dig, pt) end
-function turtle.digDownAt(pt)            return _actionDownAt(actionsAt.dig, pt) end
-function turtle.digForwardAt(pt)         return _actionForwardAt(actionsAt.dig, pt) end
-function turtle.digUpAt(pt)              return _actionUpAt(actionsAt.dig, pt) end
+function turtle.digAt(pt, ...)           return _actionAt(actionsAt.dig, pt, ...) end
+function turtle.digDownAt(pt, ...)       return _actionDownAt(actionsAt.dig, pt, ...) end
+function turtle.digForwardAt(pt, ...)    return _actionForwardAt(actionsAt.dig, pt, ...) end
+function turtle.digUpAt(pt, ...)         return _actionUpAt(actionsAt.dig, pt, ...) end
 
 function turtle.attackAt(pt)             return _actionAt(actionsAt.attack, pt) end
 function turtle.attackDownAt(pt)         return _actionDownAt(actionsAt.attack, pt) end