steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote branch 'origin/master'

db4
Doug Coleman 2010-04-25 14:59:39 -05:00
parent 6023070fec 4022ceda8d
commit ac9b29ccf3
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
basis/tools/deploy/shaker/shaker.factor
View File

@ -6,7 +6,7 @@ parser.notes lexer strings.parser vocabs sequences sequences.deep
sequences.private words memory kernel.private continuations io sequences.private words memory kernel.private continuations io
vocabs.loader system strings sets vectors quotations byte-arrays vocabs.loader system strings sets vectors quotations byte-arrays
sorting compiler.units definitions generic generic.standard sorting compiler.units definitions generic generic.standard
generic.single tools.deploy.config combinators classes generic.single tools.deploy.config combinators classes vocabs.loader.private
classes.builtin slots.private grouping command-line io.pathnames ; classes.builtin slots.private grouping command-line io.pathnames ;
QUALIFIED: bootstrap.stage2 QUALIFIED: bootstrap.stage2
QUALIFIED: classes.private QUALIFIED: classes.private
@ -349,6 +349,8 @@ IN: tools.deploy.shaker
lexer-factory lexer-factory
print-use-hook print-use-hook
root-cache root-cache
require-when-vocabs
require-when-table
source-files.errors:error-types source-files.errors:error-types
source-files.errors:error-observers source-files.errors:error-observers
vocabs:dictionary vocabs:dictionary

2
basis/ui/backend/x11/x11.factor
View File

@ -332,7 +332,7 @@ M: x11-ui-backend beep ( -- )
[ dup CHAR: ' = [ drop "'\\''" ] [ 1string ] if ] { } map-as concat ; [ dup CHAR: ' = [ drop "'\\''" ] [ 1string ] if ] { } map-as concat ;
: xmessage ( string -- ) : xmessage ( string -- )
escape-' "/usr/X11R6/bin/xmessage '" "'" surround system drop ; escape-' "/usr/bin/env xmessage '" "'" surround system drop ;
PRIVATE> PRIVATE>
M: x11-ui-backend system-alert M: x11-ui-backend system-alert