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

* 'master' of github.com:JuliaLang/julia: now we have helpful error messages in the web repl!
JuliaLang · Oct 13, 2011 · 1b4e4f4 · 1b4e4f4
2 parents ebd4d3b + bf076a0
commit 1b4e4f4
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/ui/webserver/julia-web.j b/ui/webserver/julia-web.j
@@ -147,9 +147,9 @@ function socket_callback(fd)
         try
             result = eval(expr)
         catch error
-            return send_error("There was an error!")
+            return send_error(print_to_string(show, error))
         end
-        return send_eval_result(string(result))
+        return send_eval_result(print_to_string(show, result))
     end
 end