ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-12-12 15:01:38 +03:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	urb/urbit.pill
This commit is contained in:
C. Guy Yarvin 2014-07-09 00:40:19 -07:00
commit 2d9e4e4a29
3 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arvo/ames.hoon
View File

@ -1660,7 +1660,6 @@
==
::
%ouzo
:: ~& [%send now p.bon `@p`(mug (shaf %flap q.bon))]
:_ fox
[[hen [%give %send p.bon q.bon]] ~]
::

21
arvo/gall.hoon
View File

@ -1,4 +1,4 @@
:: :: %gall, user-level applications
!: :: %gall, user-level applications
!? 164
::::
|= pit=vase
@ -18,6 +18,7 @@
[%mean p=(list tank)] :: message failure
[%meta p=vase] :: meta-gift
[%nice ~] :: message success
[%send p=lane q=@] :: transmit packet
== ::
++ hasp ,[p=ship q=term] :: app identity
++ kiss :: in request ->$
@ -107,7 +108,11 @@
zam=scar :: opaque ducts
== ::
++ sign :: in result $<-
$? [?(%a %b %c %d %e) @tas *] ::
$? [?(%b %c %d %e) @tas *] ::
$: %a :: by %ames
$% [%send p=lane q=@] ::
[%went p=ship q=cape] ::
== == ::
$: %g :: by %gall
$% [%dumb ~] ::
[%lean ~] :: cancel subscription
@ -311,7 +316,11 @@
++ gasp :: %x take
|= [hen=duct pax=path sih=sign]
^- [(list move) _..^$]
?. ?=(%f -.sih) ?>(?=(%a -.sih) [~ ..^$])
?: ?=(%a -.sih)
:_ ..^$
?. ?=(%send -.+.sih) ~
[hen %give +.sih]~
?> ?=(%f -.sih)
:_ ..^$
:_ ~
:- hen
@ -339,7 +348,9 @@
:_ ..^$
=+ rod=|=(ron=roon `note`[%a %want [our you] /q/gh/[app] num ron])
?+ -.pax !!
%m ?: ?=(%a -.sih) ~
%m ?: ?=(%a -.sih)
?. ?=(%send +<.sih) ~
[hen %give +.sih]~
:_ ~ :- hen
:+ %pass [%r pax]
^- note
@ -361,7 +372,7 @@
==
==
%s ?+ -.sih !!
%a ~
%a ?. ?=(%send +<.sih) ~ [hen %give +.sih]~
%g
:_ ~ :- hen
:+ %pass [%r pax]

2
main/doc/chat/help.txt
View File

@ -21,7 +21,7 @@ command-line parameters:
%monitor display entrance and exit notices
%quiet do not display entrance and exit notices
%leet only display ship names
%nub display ship and textual names
%noob display ship and textual names
only one of %monitor and %quiet may be specfied. default behavior is %quiet.
only one of %leet and %noob may be specified. default behavior is %leet.