merged

--- a/Admin/isatest/isatest-makeall	Mon Aug 16 11:18:28 2010 +0200
+++ b/Admin/isatest/isatest-makeall	Mon Aug 16 12:11:01 2010 +0200
@@ -176,7 +176,7 @@
         echo >> $ERRORLOG
 
         FAIL="$FAIL$SHORT "
-        (cd $ERRORDIR; cp -a $TESTLOG .)
+        (cd $ERRORDIR; cp $TESTLOG .)
     fi
 
     rm -f $RUNNING/$SHORT.running

--- a/src/HOL/Tools/ATP/atp_systems.ML	Mon Aug 16 11:18:28 2010 +0200
+++ b/src/HOL/Tools/ATP/atp_systems.ML	Mon Aug 16 12:11:01 2010 +0200
@@ -221,8 +221,7 @@
 
 fun remote_config atp_prefix
         ({proof_delims, known_failures, max_new_relevant_facts_per_iter,
-          prefers_theory_relevant, explicit_forall, ...} : prover_config)
-        : prover_config =
+          prefers_theory_relevant, ...} : prover_config) : prover_config =
   {exec = ("ISABELLE_ATP", "scripts/remote_atp"),
    required_execs = [],
    arguments = fn _ => fn timeout =>
@@ -234,7 +233,7 @@
      [(TimedOut, "says Timeout")],
    max_new_relevant_facts_per_iter = max_new_relevant_facts_per_iter,
    prefers_theory_relevant = prefers_theory_relevant,
-   explicit_forall = explicit_forall}
+   explicit_forall = true}
 
 val remote_name = prefix "remote_"
 

--- a/src/HOL/Tools/Sledgehammer/metis_tactics.ML	Mon Aug 16 11:18:28 2010 +0200
+++ b/src/HOL/Tools/Sledgehammer/metis_tactics.ML	Mon Aug 16 12:11:01 2010 +0200
@@ -789,7 +789,7 @@
       Meson.MESON (maps neg_clausify)
                   (fn cls => resolve_tac (FOL_SOLVE mode ctxt cls ths) 1)
                   ctxt i st0
-     handle ERROR msg => raise METIS ("generic_metis_tac", msg)
+      handle ERROR msg => raise METIS ("generic_metis_tac", msg)
   end
   handle METIS (loc, msg) =>
          if mode = HO then