Merge branch 'test' of https://github.com/urbit/urbit into test

2024-12-15 01:52:42 +03:00 · 2015-01-26 14:31:06 -08:00 · 2015-01-26 14:31:06 -08:00 · 0e6434f3ee
commit 0e6434f3ee
parent 353ff78e34 c1c4b3b75a
4 changed files with 6 additions and 9 deletions
--- a/arvo/dill.hoon
+++ b/arvo/dill.hoon
@ -66,15 +66,9 @@
          $%  [%logo p=@]                               ::
              [%mean p=ares]                            ::
              [%nice ~]                                 ::
-              $:  %rush                                 ::  XX
+              $:  %rush                                 ::
              $%  [%term-line q=term-line]              ::
                  [%hymn q=manx]                        ::
-                  [%json q=json]                        ::
-              ==  ==                                    ::
-              $:  %rust                                 ::
-              $%  [%term-line q=term-line]              ::
-                  [%hymn q=manx]                        ::
-                  [%json q=json]                        ::
              ==  ==                                    ::
              [%verb ~]                                 ::
              [%sage p=path q=*]                        ::
@ -335,6 +329,8 @@
          ?:  =(q.s.yar p.a)  ~
          ~[(welp ~(ram re q.a) ~(ram re r.a))]
        ==
+      ?.  (levy r.q.sih |=(a=tark ?=(%stem -.a)))
+        +>.$                          ::  XX separate prompt/history messages
      %-  edit
      =|  bed=bein
      =+  ^=  hyt  ^-  hist
--- a/arvo/gall.hoon
+++ b/arvo/gall.hoon
@ -1225,6 +1225,7 @@
          [%call (harm cog (conf (core u.huv.sat))) (cove %$ sam)]
        ::
            %show
+          ::  ~&  showing/[app.sat imp q.kon]
          ?:  (warm %peer)
            =+  sam=!>([ost p.kon q.kon])
            ?>  ?=(^ huv.sat)
--- a/main/app/reload/core.hook
+++ b/main/app/reload/core.hook
@ -21,7 +21,7 @@
    ?.  =(1 (met 3 nam))
      nam
    =+  ^-  zaz=(list ,[p=span ~])
-        (murn van (flit |=([a=term ~] =(nam (end 3 1 a)))))
+        (skim van |=([a=term ~] =(nam (end 3 1 a))))
    ?>  ?=([[@ ~] ~] zaz)
    `term`p.i.zaz
  =+  tip=(end 3 1 nam)
--- a/main/app/twit/core.hook
+++ b/main/app/twit/core.hook
@ -59,7 +59,7 @@
 ++  cull                                                ::  remove seen tweets
  |=  [pax=path rep=(list stat)]  ^+  rep
  =+  pev=(sa (turn (~(get ja fed) pax) |=(stat id)))
-  (murn rep (flit |=(stat !(~(has in pev) id))))
+  (skip rep |=(stat (~(has in pev) id)))
 ::
 ++  dely                                                ::  next polling timeout
  |=  pax=path