summaryrefslogtreecommitdiff
path: root/proofs
diff options
context:
space:
mode:
Diffstat (limited to 'proofs')
-rw-r--r--proofs/clenvtac.ml1
-rw-r--r--proofs/pfedit.ml7
2 files changed, 6 insertions, 2 deletions
diff --git a/proofs/clenvtac.ml b/proofs/clenvtac.ml
index ca8fd6ae..d18ee73f 100644
--- a/proofs/clenvtac.ml
+++ b/proofs/clenvtac.ml
@@ -105,6 +105,7 @@ let fail_quick_unif_flags = {
use_metas_eagerly_in_conv_on_closed_terms = false;
modulo_delta = empty_transparent_state;
modulo_delta_types = full_transparent_state;
+ modulo_delta_in_merge = None;
check_applied_meta_types = false;
resolve_evars = false;
use_pattern_unification = false;
diff --git a/proofs/pfedit.ml b/proofs/pfedit.ml
index 5e314069..45e4a84e 100644
--- a/proofs/pfedit.ml
+++ b/proofs/pfedit.ml
@@ -62,9 +62,12 @@ let get_undo _ = None
let start_proof id str hyps c ?init_tac ?compute_guard hook =
let goals = [ (Global.env_of_context hyps , c) ] in
- let init_tac = Option.map Proofview.V82.tactic init_tac in
Proof_global.start_proof id str goals ?compute_guard hook;
- try Option.iter Proof_global.run_tactic init_tac
+ let tac = match init_tac with
+ | Some tac -> Proofview.V82.tactic tac
+ | None -> Proofview.tclUNIT ()
+ in
+ try Proof_global.run_tactic tac
with e -> Proof_global.discard_current (); raise e
let restart_proof () = undo_todepth 1