From ba9ba59be9534b42ede74adfcbf8b85b876590c7 Mon Sep 17 00:00:00 2001 From: Pierre-Marie Pédrot Date: Thu, 4 Sep 2014 12:09:43 +0200 Subject: Revert "Ltac's [idtac] is now interpreted outside of a goal if possible." This reverts commit afa441019432f70245fed6adc5eb0318514e4357. --- tactics/tacinterp.ml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'tactics') diff --git a/tactics/tacinterp.ml b/tactics/tacinterp.ml index e69a307bd..df79361fe 100644 --- a/tactics/tacinterp.ml +++ b/tactics/tacinterp.ml @@ -1102,13 +1102,14 @@ and eval_tactic ist tac : unit Proofview.tactic = match tac with | TacMatchGoal _ | TacMatch _ -> assert false | TacId s -> Proofview.tclTHEN - (Proofview.tclENV >>= fun env -> + (Proofview.Goal.enter begin fun gl -> let msg = - try Proofview.tclUNIT (interp_message_nl ist env s) + try Proofview.tclUNIT (interp_message_nl ist (Proofview.Goal.env gl) s) with e when Errors.noncritical e -> Proofview.tclZERO e in msg >>= fun msg -> - Proofview.tclLIFT (Proofview.NonLogical.print (Pp.hov 0 msg))) + Proofview.tclLIFT (Proofview.NonLogical.print (Pp.hov 0 msg)) + end) (Proofview.tclLIFT (db_breakpoint (curr_debug ist) s)) | TacFail (n,s) -> Proofview.V82.tactic begin fun gl -> -- cgit v1.2.3