diff --git a/library/ui/models.factor b/library/ui/models.factor index f8c1c7c230..d69960f9ed 100644 --- a/library/ui/models.factor +++ b/library/ui/models.factor @@ -137,7 +137,7 @@ G: (add-history) ( history vector -- ) 1 standard-combination ; M: history (add-history) ( history vector -- ) - swap model-value dup [ 2drop ] [ swap push ] if ; + swap model-value dup [ swap push ] [ 2drop ] if ; : go-back/forward ( history to from -- ) dup empty? diff --git a/library/words.factor b/library/words.factor index 4df50d789d..6a266cd848 100644 --- a/library/words.factor +++ b/library/words.factor @@ -162,7 +162,7 @@ SYMBOL: bootstrapping? : bootstrap-word ( word -- word ) bootstrapping? get [ - dup word-name swap word-vocabulary + dup word-name swap word-vocabulary dup "syntax" = [ drop "!syntax" >r "!" swap append r> ] when lookup diff --git a/vm/Config.macosx b/vm/Config.macosx index e601adf652..446f3a4f13 100644 --- a/vm/Config.macosx +++ b/vm/Config.macosx @@ -1,3 +1,3 @@ include vm/Config.unix PLAF_OBJS += vm/os-macosx.o vm/mach_signal.o -LIBS= -lm -framework Cocoa -framework OpenGL -L/usr/X11R6/lib/ -lfreetype +LIBS= -lm -framework Cocoa -framework OpenGL -L./Factor.app/Contents/Frameworks/ -lfreetype