Merge branch 'master' of git://factorcode.org/git/factor

db4
Slava Pestov 2008-03-27 17:21:41 -05:00
commit 65bb6371a6
3 changed files with 6 additions and 4 deletions

View File

@ -1,6 +1,7 @@
! Copyright (C) 2007, 2008 Slava Pestov. ! Copyright (C) 2007, 2008 Slava Pestov.
! See http://factorcode.org/license.txt for BSD license. ! See http://factorcode.org/license.txt for BSD license.
USING: init kernel system namespaces io io.encodings io.encodings.utf8 ; USING: init kernel system namespaces io io.encodings
io.encodings.utf8 init assocs ;
IN: io.backend IN: io.backend
SYMBOL: io-backend SYMBOL: io-backend
@ -22,7 +23,8 @@ HOOK: normalize-pathname io-backend ( str -- newstr )
M: object normalize-directory normalize-pathname ; M: object normalize-directory normalize-pathname ;
: set-io-backend ( io-backend -- ) : set-io-backend ( io-backend -- )
io-backend set-global init-io init-stdio ; io-backend set-global init-io init-stdio
"io.files" init-hooks get at call ;
[ init-io embedded? [ init-stdio ] unless ] [ init-io embedded? [ init-stdio ] unless ]
"io.backend" add-init-hook "io.backend" add-init-hook

View File

@ -170,7 +170,7 @@ SYMBOL: current-directory
M: object cwd ( -- path ) "." ; M: object cwd ( -- path ) "." ;
[ cwd current-directory set-global ] "current-directory" add-init-hook [ cwd current-directory set-global ] "io.files" add-init-hook
: with-directory ( path quot -- ) : with-directory ( path quot -- )
>r normalize-pathname r> >r normalize-pathname r>

2
extra/editors/jedit/jedit.factor Normal file → Executable file
View File

@ -8,7 +8,7 @@ io.encodings.utf8 ;
IN: editors.jedit IN: editors.jedit
: jedit-server-info ( -- port auth ) : jedit-server-info ( -- port auth )
home "/.jedit/server" append-path ascii [ home ".jedit/server" append-path ascii [
readln drop readln drop
readln string>number readln string>number
readln string>number readln string>number