Merge branch 'master' of github.com:JuliaLang/julia

Conflicts: j/client.j
JuliaLang · Feb 6, 2012 · 4bfc311 · 4bfc311
2 parents d42e36a + 6e3e703
commit 4bfc311
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/j/client.j b/j/client.j
@@ -161,7 +161,7 @@ function process_options(args::Array{Any,1})
             # remove julia's arguments
             ARGS = ARGS[i:end]
             include(args[i])
-            exit(0)
+            break
         else
             error("unknown option: ", args[i])
         end
@@ -210,4 +210,5 @@ function _start()
         println()
         exit(1)
     end
+    flush(stdout_stream)
 end