]> gitweb.factorcode.org Git - factor.git/commitdiff
projects / factor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 1: da44f19)
Merge branch 'master' into new_ui
authorSlava Pestov <slava@slava-pestovs-macbook-pro.local>
Sun, 1 Feb 2009 08:07:21 +0000 (02:07 -0600)
committerSlava Pestov <slava@slava-pestovs-macbook-pro.local>
Sun, 1 Feb 2009 08:07:21 +0000 (02:07 -0600)
basis/http/http-tests.factor patch | blob | history
extra/lint/lint.factor patch | blob | history

diff --git a/basis/http/http-tests.factor b/basis/http/http-tests.factor
index c4ea23ea0aed9cfc5a77cc625f241b27a2a57929..f593980467b8321b18414762cd7955c0348f85e2 100644 (file)
--- a/basis/http/http-tests.factor
+++ b/basis/http/http-tests.factor
@@ -308,7 +308,7 @@ SYMBOL: a
     <dispatcher>
         <action>
             [ a get-global "a" set-value ] >>init
-            [ [ "a" <field> render ] "text/html" <content> ] >>display
+            [ [ "<html>" write "a" <field> render "</html>" write ] "text/html" <content> ] >>display
             [ { { "a" [ v-integer ] } } validate-params ] >>validate
             [ "a" value a set-global URL" " <redirect> ] >>submit
         <conversations>
diff --git a/extra/lint/lint.factor b/extra/lint/lint.factor
index 60e3332ee4f34b97eddd13693741c7586526fca3..849cc540a361c26da8b68d7b080f4e5ad32b1832 100755 (executable)
--- a/extra/lint/lint.factor
+++ b/extra/lint/lint.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2007, 2008 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors alien alien.accessors arrays assocs
-combinators.short-circuit fry hashtables html io
+combinators.short-circuit fry hashtables io
 kernel math namespaces prettyprint quotations sequences
 sequences.deep sets slots.private vectors vocabs words
 kernel.private ;
@@ -54,7 +54,7 @@ SYMBOL: def-hash-keys
         [ drop f ]
         [ "cdecl" ]
         [ first ] [ second ] [ third ] [ fourth ]
-        [ ">" write-html ] [ "/>" write-html ]
+        [ ">" write ] [ "/>" write ]
     } ;
 
 ! ! Add definitions
Factor programming language