Merge branch 'master' of https://github.com/urbit/urbit

Conflicts:
	urb/urbit.pill

arvo/dill.hoon

@@ -367,7 +367,8 @@
         ?(%rush %rust)                                  ::  XX  reset prompt
       ?>  ?=(%term-line +>-.sih)
       =.  +>.$
-        =-  (furl (zing (turn (flop r.q.sih) -)))
+        =+  lis=?-(-.+.sih %rust (scag 1.000 r.q.sih), %rush r.q.sih)
+        =-  (furl (zing (turn (flop lis) -)))
         |=  a=tark
         ^-  wall
         ?+  -.a  (~(win re a) 0 p.q.yar) 

main/app/chat/core.hook

@@ -381,7 +381,7 @@
         (welp mow (send /out %give %rush %tang (zong-to-tank | zog) ~))
       ==
     ?:  =(%zongs -.p.sih)
-      =+  zos=((hard (list zong)) p.p.sih)
+      =+  zos=(scag 200 ((hard (list zong)) p.p.sih))
       =<  +(mow (flop mow))
       |-  ^+  +.$
       ?:  =(~ zos)  +.$                                 ::  XX  tm freakin i

main/app/into/core.hook

@@ -3,7 +3,7 @@
 ++  poke-into-args
   |=  [ost=bone you=ship pax=path dat=@ ~]
   :_  +>.$
-  :*  [ost %pass /cp %c %info our.hid (foal pax dat)]
+  :*  [ost %pass /into %c %info our.hid (foal pax dat)]
       [ost %give %nice ~]
       %+  turn  (~(tap by sup.hid))
       |=  [ost=bone *]

main/app/label/core.hook

@@ -0,0 +1,9 @@
+!:
+|_  [hid=hide ~]
+++  poke-label-args
+  |=  [ost=bone you=ship syd=@tas lab=@tas ~]
+  :_  +>.$
+  :~  [ost %pass /label %c %info our.hid syd %| lab]
+  ==
+++  peer  |=(* `+>)
+--

main/app/ls/core.hook

@@ -4,8 +4,7 @@
   |=  [ost=bone you=ship arg=path ~]
   =+  lon=((hard arch) .^(%cy arg))
   :_  +>.$
-  :*  ::[ost %pass / %g %cide %$]
-      [ost %give %nice ~]
+  :*  [ost %give %nice ~]
       %+  turn  (~(tap by sup.hid))
       |=  [ost=bone *]
       :^  ost  %give  %rush

main/app/mv/core.hook

@@ -3,7 +3,7 @@
 ++  poke-mv-args
   |=  [ost=bone you=ship input=path output=path ~]
   :_  +>.$
-  :*  :^  ost  %pass  /cp
+  :*  :^  ost  %pass  /mv
       :^  %c  %info  our.hid
       (furl (foal output .^(%cx input)) (fray input))
       [ost %give %nice ~]

main/app/rm/core.hook

@@ -3,7 +3,7 @@
 ++  poke-rm-args
   |=  [ost=bone you=ship pax=path ~]
   :_  +>.$
-  :*  [ost %pass /cp %c %info our.hid (fray pax)]
+  :*  [ost %pass /rm %c %info our.hid (fray pax)]
       [ost %give %nice ~]
       %+  turn  (~(tap by sup.hid))
       |=  [ost=bone *]

main/app/shell/core.hook

@@ -299,8 +299,10 @@
   ++  exec
     |=  gen=twig
     %-  slap  :_  gen
-    =+  tym=!>(lat.hid)
-    %+  slop  [[%face %tym p.tym] q.tym]
+    %+  slop
+      %+  slop  [[%face %our p] q]:!>(our.hid)
+      %+  slop  [[%face %tym p] q]:!>(lat.hid)
+      [[%face %eny p] q]:!>(eny.hid)
     %+  roll  (~(tap by var))
     =<  .(q pit)
     |=  [[n=term v=vase] q=vase]