Merge branch 'master' of git://github.com/slavapestov/factor

diff --git a/basis/editors/vim/vim.factor b/basis/editors/vim/vim.factor
index a62ed9e0a5af6dc176085fcec20d50912f24c4fa..55c3889e009149b562550e70a073dd19c2548835 100644 (file)
--- a/basis/editors/vim/vim.factor
+++ b/basis/editors/vim/vim.factor
@@ -16,7 +16,7 @@ M: vim vim-command
     ] { } make ;
 
 : vim ( file line -- )
-    vim-command run-detached drop ;
+    vim-command run-process drop ;
 
 "vim" vim-path set-global
 [ vim ] edit-hook set-global

diff --git a/vm/Config.macosx b/vm/Config.macosx
index 5b9de7f5cf8fb5a45f372df1390b8c5530d9e9fc..693ee9341dfd30fadd3ee716fe52438d433960fc 100644 (file)
--- a/vm/Config.macosx
+++ b/vm/Config.macosx
@@ -14,7 +14,7 @@ else
        LIBS = -lm -framework Cocoa -framework AppKit
 endif
 
-LINKER = $(CPP) $(CFLAGS) -dynamiclib -single_module -std=gnu99 \
+LINKER = $(CPP) $(CFLAGS) -dynamiclib -single_module \
        -current_version $(VERSION) \
        -compatibility_version $(VERSION) \
        -fvisibility=hidden \