From 95c206465cb3564c3e0866c92b0f705776c63b4f Mon Sep 17 00:00:00 2001
From: Philip C Monk <philip.monk@tlon.io>
Date: Fri, 23 Jan 2015 14:36:36 -0500
Subject: [PATCH] optimizations

---
 arvo/clay.hoon         | 12 +++++++-----
 arvo/ford.hoon         |  2 ++
 main/mar/txt/door.hook |  2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/arvo/clay.hoon b/arvo/clay.hoon
index b58c980ab..2d04ebed4 100644
--- a/arvo/clay.hoon
+++ b/arvo/clay.hoon
@@ -311,7 +311,7 @@
         =+  `[l=@da d=dome r=rang]`+<.axe
         ?~  hat
           +>.$(dom d, ran r)
-        (checkout-ankh(dom d, ran r) u.hat)
+        (echo:(checkout-ankh(dom d, ran r) u.hat) wen lem)
       ?.  =(~ dok)
         ~&  %already-applying-changes  !!
       =+  ^=  sop
@@ -383,8 +383,8 @@
       =+  [hat axe]=(~(edit ze lim dom ran) wen %& *cart sot.u.dok)
       =+  `[l=@da d=dome r=rang]`+<.axe
       ?~  hat
-        +>.$(dom d, ran r, dok ~)
-      (checkout-ankh(dom d, ran r, dok ~) u.hat)
+        (echo(dom d, ran r, dok ~) wen %& *cart sot.u.dok)
+      (echo:(checkout-ankh(dom d, ran r, dok ~) u.hat) wen %& *cart sot.u.dok)
     ::
     ++  apply-patches
       ^+  .
@@ -446,7 +446,9 @@
           [[hen %note '!' %rose [" " "" ""] leaf/"clay diff failed" p.res] yel]
         ==
       =:  lon.u.dok  (skip lon.u.dok |=(path =(+< pax)))
-          sot.u.dok  [[pax %dif q.p.res] sot.u.dok]
+          sot.u.dok  ?:  =(%null p.q.p.res)
+                       sot.u.dok
+                     [[pax %dif q.p.res] sot.u.dok]
       ==
       ?~  lon.u.dok
         (apply-edit wen)
@@ -532,7 +534,7 @@
     ++  exec                                            ::  change and update
       |=  [wen=@da lem=nori]
       ^+  +>
-      (echo:wake:(edit wen lem) wen lem)
+      wake:(edit wen lem)
     ::
     ++  exem                                            ::  execute merge
       |=  [wen=@da mer=mizu]                   ::  aka direct change
diff --git a/arvo/ford.hoon b/arvo/ford.hoon
index b005ae474..e2221e7a2 100644
--- a/arvo/ford.hoon
+++ b/arvo/ford.hoon
@@ -398,6 +398,8 @@
         ?.  =(p.cay p.coy)
           %+  flaw  cof  :_  ~
           leaf/"diff on data of different marks: {(trip p.cay)} {(trip p.coy)}"
+        ?:  =(q.q.cay q.q.coy)
+          (fine cof %null [%atom %n] ~)
         %+  cope  (fang cof p.cay [our %main %da now])
         |=  [cof=cafe pro=vase]
         ?.  (slab %grad p.pro)
diff --git a/main/mar/txt/door.hook b/main/mar/txt/door.hook
index 7deb77c64..d34475f6d 100644
--- a/main/mar/txt/door.hook
+++ b/main/mar/txt/door.hook
@@ -1,4 +1,4 @@
-::  maybe
+::  maybze
 ::::  /hook/door/term-line/mar
   ::
 /?  314