summaryrefslogtreecommitdiff
path: root/theories/Compat/AdmitAxiom.v
diff options
context:
space:
mode:
authorGravatar Enrico Tassi <gareuselesinge@debian.org>2016-01-26 16:56:34 +0100
committerGravatar Enrico Tassi <gareuselesinge@debian.org>2016-01-26 16:56:34 +0100
commitbb08c29807439697fa7c2045000dd3e17a9428b1 (patch)
tree9100a2dd5c2cb92ddd083cb052e236cdee6b9690 /theories/Compat/AdmitAxiom.v
parentd55ac4014632489e3009a2a7351d018b3b2d27ac (diff)
parent164c6861860e6b52818c031f901ffeff91fca16a (diff)
Merge tag 'upstream/8.5'
Upstream version 8.5
Diffstat (limited to 'theories/Compat/AdmitAxiom.v')
-rw-r--r--theories/Compat/AdmitAxiom.v15
1 files changed, 15 insertions, 0 deletions
diff --git a/theories/Compat/AdmitAxiom.v b/theories/Compat/AdmitAxiom.v
new file mode 100644
index 00000000..4d9f55cf
--- /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-2016 *)
+(* \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.