--- a/src/Pure/System/options.scala Sat Jul 27 18:02:41 2013 +0200
+++ b/src/Pure/System/options.scala Sat Jul 27 20:28:28 2013 +0200
@@ -142,9 +142,12 @@
if (get_option != "")
java.lang.System.out.println(options.check_name(get_option).value)
- else if (export_file != "")
+
+ if (export_file != "")
File.write(Path.explode(export_file), YXML.string_of_body(options.encode))
- else java.lang.System.out.println(options.print)
+
+ if (get_option == "" && export_file == "")
+ java.lang.System.out.println(options.print)
0
case _ => error("Bad arguments:\n" + cat_lines(args))
--- a/src/Pure/goal.ML Sat Jul 27 18:02:41 2013 +0200
+++ b/src/Pure/goal.ML Sat Jul 27 20:28:28 2013 +0200
@@ -182,7 +182,7 @@
Inttab.lookup_list (#3 (Synchronized.value forked_proofs)) id;
fun stable_futures id =
- not (Par_Exn.is_interrupted (Future.join_results (peek_futures id)));
+ not (Par_Exn.is_interrupted (map_filter Future.peek (peek_futures id)));
fun reset_futures () =
Synchronized.change_result forked_proofs (fn (_, groups, _) =>