From 300293c119981054c95182a90c829058530a6b6f Mon Sep 17 00:00:00 2001
From: Stephane Glondu <steph@glondu.net>
Date: Sun, 25 Dec 2011 13:19:42 +0100
Subject: Imported Upstream version 8.3.pl3

---
 toplevel/vernacentries.ml | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

(limited to 'toplevel/vernacentries.ml')

diff --git a/toplevel/vernacentries.ml b/toplevel/vernacentries.ml
index 7710cb95..3be3c6db 100644
--- a/toplevel/vernacentries.ml
+++ b/toplevel/vernacentries.ml
@@ -1,12 +1,12 @@
 (************************************************************************)
 (*  v      *   The Coq Proof Assistant  /  The Coq Development Team     *)
-(* <O___,, *   INRIA - CNRS - LIX - LRI - PPS - Copyright 1999-2010     *)
+(* <O___,, *   INRIA - CNRS - LIX - LRI - PPS - Copyright 1999-2011     *)
 (*   \VV/  **************************************************************)
 (*    //   *      This file is distributed under the terms of the       *)
 (*         *       GNU Lesser General Public License Version 2.1        *)
 (************************************************************************)
 
-(*i $Id: vernacentries.ml 13922 2011-03-21 16:25:18Z letouzey $ i*)
+(*i $Id: vernacentries.ml 14641 2011-11-06 11:59:10Z herbelin $ i*)
 
 (* Concrete syntax of the mathematical vernacular MV V2.6 *)
 
@@ -370,9 +370,6 @@ let vernac_exact_proof c =
 	(strbrk "Command 'Proof ...' can only be used at the beginning of the proof.")
 
 let vernac_assumption kind l nl=
-  if Pfedit.refining () then
-    errorlabstrm ""
-      (str "Cannot declare an assumption while in proof editing mode.");
   let global = fst kind = Global in
     List.iter (fun (is_coe,(idl,c)) ->
       if Dumpglob.dump () then
@@ -1113,12 +1110,12 @@ let vernac_print = function
       pp (Notation.pr_visibility (Constrextern.without_symbols pr_lrawconstr) s)
   | PrintAbout qid -> msg (print_about qid)
   | PrintImplicit qid -> msg (print_impargs qid)
-(*spiwack: prints all the axioms and section variables used by a term *)
   | PrintAssumptions (o,r) ->
+      (* Prints all the axioms and section variables used by a term *)
       let cstr = constr_of_global (smart_global r) in
-      let nassumptions = Environ.assumptions (Conv_oracle.get_transp_state ())
-	~add_opaque:o cstr (Global.env ()) in
-      msg (Printer.pr_assumptionset (Global.env ()) nassumptions)
+      let st = Conv_oracle.get_transp_state () in
+      let nassums = Assumptions.assumptions st ~add_opaque:o cstr in
+      msg (Printer.pr_assumptionset (Global.env ()) nassums)
 
 let global_module r =
   let (loc,qid) = qualid_of_reference r in
-- 
cgit v1.2.3