Merge branch 'master' into unicode

Conflicts:

	core/io/streams/c/c-tests.factor
	extra/benchmark/mandel/mandel.factor
	extra/benchmark/raytracer/raytracer.factor
	extra/http/client/client.factor

diff --cc core/io/files/files.factor
index 4a04be3bfe41695ce6a88f3558c988e4dc9f3318,7dbe8c229e33b287816ccdfb01ae1a320923f4b8..f41e04d72d82033723069b14d7b95bed08f8aba6
--- 1/core/io/files/files.factor
--- 2/core/io/files/files.factor
+++ b/core/io/files/files.factor
@@@ -162,5 -152,13 +162,13 @@@ M: pathname <=> [ pathname-string ] com
  : with-file-writer ( path quot -- )
      >r <file-writer> r> with-stream ; inline
  
 -: with-file-appender ( path quot -- )
 +: with-file-appender ( path encoding quot -- )
      >r <file-appender> r> with-stream ; inline
+ 
+ : temp-directory ( -- path )
+     "temp" resource-path
+     dup exists? not
+       [ dup make-directory ]
+     when ;
+ 
+ : temp-file ( name -- path ) temp-directory swap path+ ;

diff --cc core/io/streams/c/c-tests.factor
index cc2aa9dde0f03c1b42a32e35eaded913cb5e1c83,16b78c2192c629ff29caa8792772be320b482043..db2a476b4066a60414f897e0bad186f8a1471daa
--- 1/core/io/streams/c/c-tests.factor
--- 2/core/io/streams/c/c-tests.factor
+++ b/core/io/streams/c/c-tests.factor
@@@ -2,7 -2,7 +2,7 @@@ USING: tools.test io.files io io.stream
  IN: temporary
  
  [ "hello world" ] [
-     "test.txt" resource-path ascii [
 -    "test.txt" temp-file [
++    "test.txt" temp-file ascii [
          "hello world" write
      ] with-file-writer
  

diff --cc core/io/streams/c/c.factor
index 164d0d5f584b3cd604def26f415059bca5b3610f,48d6e6e43075d2d98bc8911ac57eeddb9af30251..de49e0dfe63e96f01ede8bfbd799e78d922b2850
--- 1/core/io/streams/c/c.factor
--- 2/core/io/streams/c/c.factor
+++ b/core/io/streams/c/c.factor
@@@ -55,21 -60,20 +55,21 @@@ M: object init-io 
  : stdout-handle 12 getenv ;
  : stderr-handle 38 getenv ;
  
 -M: object init-stdio
 -    stdin-handle stdout-handle <duplex-c-stream> stdio set-global
 -    stderr-handle <c-writer> <plain-writer> stderr set-global ;
 +M: object (init-stdio)
 +    stdin-handle <c-reader>
 +    stdout-handle <c-writer>
 +    stderr-handle <c-writer> ;
  
- M: object io-multiplex (sleep) ;
+ M: object io-multiplex 60 60 * 1000 * or (sleep) ;
  
 -M: object <file-reader>
 -    "rb" fopen <c-reader> <line-reader> ;
 +M: object (file-reader)
 +    "rb" fopen <c-reader> ;
  
 -M: object <file-writer>
 -    "wb" fopen <c-writer> <plain-writer> ;
 +M: object (file-writer)
 +    "wb" fopen <c-writer> ;
  
 -M: object <file-appender>
 -    "ab" fopen <c-writer> <plain-writer> ;
 +M: object (file-appender)
 +    "ab" fopen <c-writer> ;
  
  : show ( msg -- )
      #! A word which directly calls primitives. It is used to

diff --cc core/parser/parser.factor
Simple merge

diff --cc core/source-files/source-files.factor
Simple merge

diff --cc extra/benchmark/mandel/mandel.factor
index a60fdbf6c7f672f87cb1bd4e352e1557acd526bb,0da47857853cf6d8b5d8eb605a02d0a2c766fc1e..05eda2ad81d04f6267599092c3f7f6b6d47f4277
--- 1/extra/benchmark/mandel/mandel.factor
--- 2/extra/benchmark/mandel/mandel.factor
+++ b/extra/benchmark/mandel/mandel.factor
@@@ -65,7 -65,7 +65,7 @@@ SYMBOL: col
      ] with-scope ;
  
  : mandel-main ( -- )
-     "mandel.ppm" resource-path
+     "mandel.ppm" temp-file
 -    [ mandel write ] with-file-writer ;
 +    binary [ mandel write ] with-file-writer ;
  
  MAIN: mandel-main

diff --cc extra/benchmark/raytracer/raytracer.factor
index 9783389e80dfe38c97401bb6a11a077210296a89,ddfd0ed6dd5173f9a50defc3534f36dfcd1a6261..232842a51e669d24adec4168c9617da31c5d938f
--- 1/extra/benchmark/raytracer/raytracer.factor
--- 2/extra/benchmark/raytracer/raytracer.factor
+++ b/extra/benchmark/raytracer/raytracer.factor
@@@ -170,7 -170,7 +170,7 @@@ DEFER: create ( level c r -- scene 
      ] "" make ;
  
  : raytracer-main
-     "raytracer.pnm" resource-path
+     "raytracer.pnm" temp-file
 -    [ run write ] with-file-writer ;
 +    binary [ run write ] with-file-writer ;
  
  MAIN: raytracer-main

diff --cc extra/benchmark/reverse-complement/reverse-complement.factor
Simple merge

diff --cc extra/furnace/furnace.factor
Simple merge

diff --cc extra/http/client/client.factor
index 251015a30d8c90655e5ae149d3457c9ba8693d81,99ba0450196f5794fe8c6e0a3e37188e64c416a9..8d4512a0a598f0c418429edfec340d8c31e3780c
--- 1/extra/http/client/client.factor
--- 2/extra/http/client/client.factor
+++ b/extra/http/client/client.factor
@@@ -2,7 -2,7 +2,7 @@@
  ! See http://factorcode.org/license.txt for BSD license.
  USING: assocs http kernel math math.parser namespaces sequences
  io io.sockets io.streams.string io.files io.timeouts strings
- splitting continuations assocs.lib io.encodings.binary ;
 -splitting continuations assocs.lib calendar ;
++splitting calendar continuations assocs.lib io.encodings.binary ;
  IN: http.client
  
  : parse-host ( url -- host port )

diff --cc extra/io/launcher/launcher-docs.factor
Simple merge

diff --cc extra/io/launcher/launcher.factor
Simple merge

diff --cc extra/io/nonblocking/nonblocking.factor
Simple merge

diff --cc extra/io/unix/backend/backend.factor
index 4d6e839989f30ab858ac74abfbd26240a26a055c,fe2f63e99a62cbc6d5a040d799f180d4218a5c66..93691c63e2d01263fe867e7e5cbdb2df20734f70
--- 1/extra/io/unix/backend/backend.factor
--- 2/extra/io/unix/backend/backend.factor
+++ b/extra/io/unix/backend/backend.factor
@@@ -178,13 -178,12 +178,13 @@@ M: write-task do-io-tas
  M: port port-flush ( port -- )
      dup buffer-empty? [ drop ] [ (wait-to-write) ] if ;
  
- M: unix-io io-multiplex ( ms -- )
+ M: unix-io io-multiplex ( ms/f -- )
      mx get-global wait-for-events ;
  
 -M: unix-io init-stdio ( -- )
 -    0 1 handle>duplex-stream io:stdio set-global
 -    2 <writer> io:stderr set-global ;
 +M: unix-io (init-stdio) ( -- )
 +    0 <reader>
 +    1 <writer>
 +    2 <writer> ;
  
  ! mx io-task for embedding an fd-based mx inside another mx
  TUPLE: mx-port mx ;

diff --cc extra/io/unix/unix-tests.factor
Simple merge

diff --cc extra/io/windows/ce/backend/backend.factor
Simple merge

diff --cc extra/ogg/player/player.factor
index 94a45c90e3615d762b2e0a1357b3214ae0423604,dae96dc0ea39ae50d917b75c4b4dc8780eddd974..dab8474d922192e77710b90966e26b21630ad185
mode 100644,100755..100755
--- 1/extra/ogg/player/player.factor
--- 2/extra/ogg/player/player.factor
+++ b/extra/ogg/player/player.factor

diff --cc extra/smtp/smtp.factor
Simple merge