Merge PR#623: Remove the Sigma (monotonous state) API.

1 files changed, 3 insertions, 3 deletions

diff --git a/grammar/argextend.mlp b/grammar/argextend.mlp
index 3af63de4d0..5068ba8a6a 100644
--- a/grammar/argextend.mlp
+++ b/grammar/argextend.mlp
@@ -137,11 +137,11 @@ let declare_tactic_argument loc s (typ, f, g, h) cl =
       let typ = match globtyp with None -> ExtraArgType s | Some typ -> typ in
       <:expr<
         let f = $lid:f$ in
-        fun ist v -> Ftactic.nf_s_enter { Proofview.Goal.s_enter = fun gl ->
+        fun ist v -> Ftactic.nf_enter (fun gl ->
           let (sigma, v) = Tacmach.New.of_old (fun gl -> f ist gl v) gl in
           let v = Geninterp.Val.inject (Geninterp.val_tag $make_topwit loc typ$) v in
-          Sigma.Unsafe.of_pair (Ftactic.return v, sigma)
-        }
+          Proofview.tclTHEN (Proofview.Unsafe.tclEVARS sigma) (Ftactic.return v)
+        )
       >> in
   let subst = match h with
     | None ->