diff options
| author | Pierre-Marie Pédrot | 2015-09-06 13:23:28 +0200 |
|---|---|---|
| committer | Pierre-Marie Pédrot | 2015-09-06 13:23:28 +0200 |
| commit | d8b245d688ff64d17acd9e7591daf6d63b4e54f7 (patch) | |
| tree | 0e202d1f39e97844d94a873b30e4fb14fb481f84 /stm | |
| parent | c53f2f75375dfffd2f258c76f5b722d37ab0daf9 (diff) | |
| parent | 5080991902a05ee720ab1d6fa1c9d592d3ffd36c (diff) | |
Merge branch 'v8.5'
Diffstat (limited to 'stm')
| -rw-r--r-- | stm/stm.ml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/stm/stm.ml b/stm/stm.ml index bf91c3aa4f..e6271f6089 100644 --- a/stm/stm.ml +++ b/stm/stm.ml @@ -1773,7 +1773,7 @@ let known_state ?(redefine_qed=false) ~cache id = ), cache, true | `Cmd { cast = x; cqueue = `QueryQueue cancel } when Flags.async_proofs_is_master () -> (fun () -> - reach ~cache:`Shallow view.next; + reach view.next; Query.vernac_interp cancel view.next id x ), cache, false | `Cmd { cast = x } -> (fun () -> @@ -1935,7 +1935,7 @@ let finish ?(print_goals=false) () = VCS.print (); (* Some commands may by side effect change the proof mode *) match VCS.get_branch head with - | { VCS.kind = `Edit (mode, _,_,_,_) } -> Proof_global.activate_proof_mode mode + | { VCS.kind = `Edit (mode,_,_,_,_) } -> Proof_global.activate_proof_mode mode | { VCS.kind = `Proof (mode, _) } -> Proof_global.activate_proof_mode mode | _ -> () |