From 81ef6a6dc1bfc3db0e7df3e32b6446fc4d2c4008 Mon Sep 17 00:00:00 2001
From: Maxime Dénès
Date: Mon, 14 Dec 2015 11:22:54 +0100
Subject: Moved proof_admitted to its own file, named "AdmitAxiom.v".

---
 doc/stdlib/index-list.html.template |  1 +
 theories/Compat/AdmitAxiom.v        | 15 +++++++++++++++
 theories/Compat/Coq84.v             |  4 ----
 theories/Compat/vo.itarget          |  1 +
 4 files changed, 17 insertions(+), 4 deletions(-)
 create mode 100644 theories/Compat/AdmitAxiom.v

diff --git a/doc/stdlib/index-list.html.template b/doc/stdlib/index-list.html.template
index 866193ffb4..292b2b36cc 100644
--- a/doc/stdlib/index-list.html.template
+++ b/doc/stdlib/index-list.html.template
@@ -617,6 +617,7 @@ through the <tt>Require Import</tt> command.</p>
     Compatibility wrappers for previous versions of Coq
   </dt>
   <dd>
+    theories/Compat/AdmitAxiom.v
     theories/Compat/Coq84.v
     theories/Compat/Coq85.v
   </dd>
diff --git a/theories/Compat/AdmitAxiom.v b/theories/Compat/AdmitAxiom.v
new file mode 100644
index 0000000000..68607f6b2d
--- /dev/null
+++ b/theories/Compat/AdmitAxiom.v
@@ -0,0 +1,15 @@
+(************************************************************************)
+(*  v      *   The Coq Proof Assistant  /  The Coq Development Team     *)
+(* <O___,, *   INRIA - CNRS - LIX - LRI - PPS - Copyright 1999-2015     *)
+(*   \VV/  **************************************************************)
+(*    //   *      This file is distributed under the terms of the       *)
+(*         *       GNU Lesser General Public License Version 2.1        *)
+(************************************************************************)
+
+(** Compatibility file for making the admit tactic act similar to Coq v8.4. In
+8.4, [admit] created a new axiom; in 8.5, it just shelves the goal. This
+compatibility definition is not in the Coq84.v file to avoid loading an
+inconsistent axiom implicitly. *)
+
+Axiom proof_admitted : False.
+Ltac admit := clear; abstract case proof_admitted.
diff --git a/theories/Compat/Coq84.v b/theories/Compat/Coq84.v
index b04d5168f2..1c70a894a5 100644
--- a/theories/Compat/Coq84.v
+++ b/theories/Compat/Coq84.v
@@ -18,10 +18,6 @@ Global Set Asymmetric Patterns.
 (** See bug 3545 *)
 Global Set Universal Lemma Under Conjunction.
 
-(** In 8.4, [admit] created a new axiom; in 8.5, it just shelves the goal. *)
-Axiom proof_admitted : False.
-Ltac admit := clear; abstract case proof_admitted.
-
 (** In 8.5, [refine] leaves over dependent subgoals. *)
 Tactic Notation "refine" uconstr(term) := refine term; shelve_unifiable.
 
diff --git a/theories/Compat/vo.itarget b/theories/Compat/vo.itarget
index c0c40ab1cf..43b197004f 100644
--- a/theories/Compat/vo.itarget
+++ b/theories/Compat/vo.itarget
@@ -1,2 +1,3 @@
+AdmitAxiom.vo
 Coq84.vo
 Coq85.vo
-- 
cgit v1.2.3