From 6395acc9358d5b52e0c88c4028cf649605b74a95 Mon Sep 17 00:00:00 2001 From: Anton Dyudin Date: Wed, 21 Dec 2016 15:32:38 -0800 Subject: [PATCH 1/3] fix ++sein not to hard-code ~zod (cherry picked from commit 92158ba5ce9c35a42ba725020007c8b992d16ca5) --- sys/zuse.hoon | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/zuse.hoon b/sys/zuse.hoon index a1efdc8f7a..b7b096861b 100644 --- a/sys/zuse.hoon +++ b/sys/zuse.hoon @@ -4332,7 +4332,7 @@ |= who/ship ^- ship =+ mir=(clan who) ?- mir - $czar ~zod + $czar who $king (end 3 1 who) $duke (end 4 1 who) $earl (end 5 1 who) From 5018e466b871d504b4c18cbea2190f5e2e981942 Mon Sep 17 00:00:00 2001 From: Anton Dyudin Date: Wed, 18 Oct 2017 15:06:03 -0700 Subject: [PATCH 2/3] fix frontend --- lib/down-jet/parse.hoon | 2 +- ren/tree/head.hoon | 2 +- ren/tree/json.hoon | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/down-jet/parse.hoon b/lib/down-jet/parse.hoon index d28b4c1bb1..52628bd0ec 100644 --- a/lib/down-jet/parse.hoon +++ b/lib/down-jet/parse.hoon @@ -616,7 +616,7 @@ :: ++ proc-inline :: parse inline kids |= pac/_pars:inli :: cache - |= a/elem + |= a/elem ^+ a ?^ -.a a(q (flop (turn q.a ..$))) ?+ -.a a $code diff --git a/ren/tree/head.hoon b/ren/tree/head.hoon index b18d350fed..2bd61fe372 100644 --- a/ren/tree/head.hoon +++ b/ren/tree/head.hoon @@ -48,7 +48,7 @@ ;script(type "text/javascript", src "{(cdnjs "react/0.14.6/react")}"); ;script(type "text/javascript", src "{(cdnjs "react/0.14.6/react-dom")}"); ;script(type "text/javascript", src "{(cdnjs "flux/2.1.1/Flux")}"); - ;* (turn (~(tap by extras)) |=({@ a/@t} ;script(type "text/javascript"):"{(trip a)}")) + ;* (turn ~(tap by extras) |=({@ a/@t} ;script(type "text/javascript"):"{(trip a)}")) :: ;script(type "text/javascript", src "//cdnjs.cloudflare.com/ajax/libs/codemirror/4.3.0/codemirror.js"); :: ;script(type "text/javascript", src "//cdnjs.cloudflare.com/ajax/libs/". :: "codemirror/4.3.0/mode/markdown/markdown.min.js"); diff --git a/ren/tree/json.hoon b/ren/tree/json.hoon index 8cb6efe909..c853f48a5d 100644 --- a/ren/tree/json.hoon +++ b/ren/tree/json.hoon @@ -19,11 +19,11 @@ ++ plist (list {term $@(mark plist)}) ++ query $% {$kids p/(list query)} - {$ktts $t} + {$name $t} {$path $t} {$spur $t} :: - {$dtls $t} + {$bump $t} {$beak $t} {$comt $j} {$plan $j} @@ -56,11 +56,11 @@ |= a/query :- -.a ?- -.a - $ktts (from-type +.a ?^(s.bem i.s.bem q.bem)) + $name (from-type +.a ?^(s.bem i.s.bem q.bem)) $beak (from-type +.a (crip (spud (en-beam bem(s /))))) $path (from-type +.a (crip (spud (flop s.bem)))) $spur (from-type +.a (crip (spud s.bem))) - $dtls (from-type +.a bump.dat) + $bump (from-type +.a bump.dat) $plan (from-type +.a plan.dat) $comt (from-type +.a comt.dat) $head (from-type +.a head.dat) From bc58a2c542eb703b3aaa0b6a79e734ed8fc8046f Mon Sep 17 00:00:00 2001 From: Anton Dyudin Date: Wed, 18 Oct 2017 15:47:41 -0700 Subject: [PATCH 3/3] RSS --- ren/rss-xml.hoon | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ren/rss-xml.hoon b/ren/rss-xml.hoon index fba4ac8006..e2c692ee22 100644 --- a/ren/rss-xml.hoon +++ b/ren/rss-xml.hoon @@ -19,7 +19,7 @@ :: urb:front attrs confuse RSS validators, readers =+ no-meta=|=(a/marl ^+(a ?~(a ~ ?.(?=($meta n.g.i.a) a $(a t.a))))) :: -%- crip %- print +%- crip %- en-xml ;rss(version "2.0") ;channel ;title: *{hed.sum}