1.1 --- a/src/Pure/System/isabelle_process.ML	Sun May 12 14:25:16 2013 +0200
     1.2 +++ b/src/Pure/System/isabelle_process.ML	Sun May 12 15:05:15 2013 +0200
     1.3 @@ -237,6 +237,7 @@
     1.4    protocol_command "Isabelle_Process.options"
     1.5      (fn [options_yxml] =>
     1.6        let val options = Options.decode (YXML.parse_body options_yxml) in
     1.7 +        Options.set_default options;
     1.8          Future.ML_statistics := true;
     1.9          Multithreading.trace := Options.int options "threads_trace";
    1.10          Multithreading.max_threads := Options.int options "threads";

     2.1 --- a/src/Pure/Tools/build.ML	Sun May 12 14:25:16 2013 +0200
     2.2 +++ b/src/Pure/Tools/build.ML	Sun May 12 15:05:15 2013 +0200
     2.3 @@ -109,7 +109,9 @@
     2.4  fun use_theories_condition last_timing (options, thys) =
     2.5    let val condition = space_explode "," (Options.string options "condition") in
     2.6      (case filter_out (can getenv_strict) condition of
     2.7 -      [] => use_theories last_timing options (map (rpair Position.none) thys)
     2.8 +      [] =>
     2.9 +        (Options.set_default options;
    2.10 +         use_theories last_timing options (map (rpair Position.none) thys))
    2.11      | conds =>
    2.12          Output.physical_stderr ("Skipping theories " ^ commas_quote thys ^
    2.13            " (undefined " ^ commas conds ^ ")\n"))
    2.14 @@ -128,6 +130,8 @@
    2.15                  ((list (pair Options.decode (list string)))))))))))
    2.16            end;
    2.17  
    2.18 +      val _ = Options.set_default options;
    2.19 +
    2.20        val document_variants =
    2.21          map Present.read_variant (space_explode ":" (Options.string options "document_variants"));
    2.22        val _ =
    2.23 @@ -160,6 +164,7 @@
    2.24        val res2 = Exn.capture Session.finish ();
    2.25        val _ = Par_Exn.release_all [res1, res2];
    2.26  
    2.27 +      val _ = Options.reset_default ();
    2.28        val _ = if do_output then () else exit 0;
    2.29      in 0 end);
    2.30