diff --git a/ape/dojo.hoon b/ape/dojo.hoon index a6a0665fa..d8c6f2fa1 100644 --- a/ape/dojo.hoon +++ b/ape/dojo.hoon @@ -119,6 +119,7 @@ ?~(b [%brev a] [[%verb a] u.b]) :: ++ dp-command :: ++dojo-command + :: =< ;~(less |-(;~(pose (jest '|*') ;~(pfix next (knee ** |.(^$))))) .) %+ knee *dojo-command |. ~+ ;~ pose ;~ pfix bar @@ -253,9 +254,10 @@ :: ++ dy-stop :: stop work ^+ +> + =. poy ~ ?~ pux +> %. [%txt "! cancel {}"] - he-diff:(he-card(poy ~) %exec u.pux our.hid ~) + he-diff:(he-card %exec u.pux our.hid ~) :: ++ dy-slam :: call by ford |= [way=wire gat=vase sam=vase] @@ -543,6 +545,7 @@ ?- -.act %det (dy-edit +.act) %ret (dy-done (tufa buf.say)) + %clr dy-stop == :: ++ dy-cage |=(num=@ud (~(got by rez) num)) :: known cage @@ -710,7 +713,6 @@ dy-make(cud `[nex (~(got by job) nex)]) -- :: - ++ he-baxp |=(~ he-pine:he-stop) :: exit out of project ++ he-dope :: sole user of ++dp |= txt=tape :: ^- (each (unit (each dojo-command tape)) hair) :: prefix/result @@ -762,7 +764,6 @@ :: ++ he-stop :: abort work ^+ . - =. buf "" ?~(poy . ~(dy-stop dy u.poy)) :: ++ he-peer :: subscribe to @@ -885,6 +886,7 @@ ?- -.act %det (he-stir +.act) %ret (he-done (tufa buf.say)) + %clr he-pine(buf "") == :: ++ he-lame :: handle error @@ -939,8 +941,6 @@ ++ poke-sole-action |= act=sole-action ~| poke/act %. act (wrap he-type):arm -:: -++ poke-sole-back (wrap he-baxp):arm ++ made (wrap he-made):arm ++ sigh-httr (wrap he-sigh):arm ++ sigh-tang |=([a=wire b=tang] ~|(`term`(cat 3 'sigh-' -.a) (mean b))) diff --git a/ape/talk.hoon b/ape/talk.hoon index bd3b1870f..baa48aada 100644 --- a/ape/talk.hoon +++ b/ape/talk.hoon @@ -1049,12 +1049,12 @@ [%txt (weld "----------------| " (tufa buf))] == :: - ++ sh-baxp (sh-pact ~) :: clear target ++ sh-sole :: apply edit |= act=sole-action ^+ +> ?- -.act %det (sh-stir +.act) + %clr (sh-pact ~) %ret sh-done == :: @@ -1117,14 +1117,6 @@ +>.$ sh-abet:(~(sh-sole sh ~ u.shu) act) :: - ++ ra-baxp - ^+ ..ra-baxp - =+ shu=(~(get by shells) ost.hid) - ?~ shu - ~& [%ra-console-broken ost.hid] - ..ra-baxp - sh-abet:~(sh-baxp sh ~ u.shu) - :: ++ ra-emil :: ra-emit move list |= mol=(list move) %_(+> moves (welp (flop mol) moves)) @@ -1916,7 +1908,6 @@ |= [act=sole-action] ra-abet:(ra-sole:ra act) :: -++ poke-sole-back |=(~ ra-abet:ra-baxp:ra) :: SOL backspace ++ diff-talk-report :: |= [way=wire rad=report] ^- (quip move +>) diff --git a/lib/drum.hoon b/lib/drum.hoon index f4c527e89..544109f6c 100644 --- a/lib/drum.hoon +++ b/lib/drum.hoon @@ -130,7 +130,6 @@ => |% :: arvo structures ++ pear :: request $% [%sole-action p=sole-action] :: - [%sole-back ~] :: back out of dialog [%talk-command command:talk] :: == :: ++ lime :: update @@ -544,7 +543,7 @@ ta-bel .(str.u.ris (scag (dec (lent str.u.ris)) str.u.ris)) ?: =(0 pos.inp) - (ta-poke %sole-back ~) + (ta-act %clr ~) :: .(+> (se-blit %bel ~)) =+ pre=(dec pos.inp) (ta-hom(pos.inp pre) %del pre) diff --git a/mar/sole/back.hoon b/mar/sole/back.hoon deleted file mode 100644 index 23b2f6c34..000000000 --- a/mar/sole/back.hoon +++ /dev/null @@ -1,10 +0,0 @@ -:: -:::: /hoon/back/sole/mar - :: -!: -|_ ~ -++ grab - |% ++ noun ,~ - -- --- - diff --git a/sur/sole.hoon b/sur/sole.hoon index 1ebeb960c..45bd17c88 100644 --- a/sur/sole.hoon +++ b/sur/sole.hoon @@ -6,6 +6,7 @@ $% :: [%abo ~] :: reset interaction [%det sole-change] :: command line edit [%ret ~] :: submit and clear + [%clr ~] :: exit context == :: ++ sole-buffer (list ,@c) :: command state ++ sole-change :: network change