Merge branch 'v8.5'

2 files changed, 4 insertions, 16 deletions

diff --git a/theories/Compat/Coq84.v b/theories/Compat/Coq84.v
index 5c60966f2..e46a556a9 100644
--- a/theories/Compat/Coq84.v
+++ b/theories/Compat/Coq84.v
@@ -58,22 +58,6 @@ Tactic Notation "esplit" := esplit.
 
 Global Set Regular Subst Tactic.
 
-(** Some names have changed in the standard library, so we add aliases. *)
-Require Coq.ZArith.Int.
-Module Export Coq.
-  Module Export ZArith.
-    Module Int.
-      Module Z_as_Int.
-        Include Coq.ZArith.Int.Z_as_Int.
-        (* FIXME: Should these get a (compat "8.4")?  Or be moved to Z_as_Int, probably? *)
-        Notation plus := Coq.ZArith.Int.Z_as_Int.add (only parsing).
-        Notation minus := Coq.ZArith.Int.Z_as_Int.sub (only parsing).
-        Notation mult := Coq.ZArith.Int.Z_as_Int.mul (only parsing).
-      End Z_as_Int.
-    End Int.
-  End ZArith.
-End Coq.
-
 (** Many things now import [PeanoNat] rather than [NPeano], so we require it so that the old absolute names in [NPeano.Nat] are available. *)
 Require Coq.Numbers.Natural.Peano.NPeano.
 
diff --git a/theories/ZArith/Int.v b/theories/ZArith/Int.v
index 32e13d389..72021f2e4 100644
--- a/theories/ZArith/Int.v
+++ b/theories/ZArith/Int.v
@@ -451,4 +451,8 @@ Module Z_as_Int <: Int.
   Lemma i2z_ltb n p : ltb n p = Z.ltb (i2z n) (i2z p).
   Proof. reflexivity. Qed.
 
+  (** Compatibility notations for Coq v8.4 *)
+  Notation plus := add (compat "8.4").
+  Notation minus := sub (compat "8.4").
+  Notation mult := mul (compat "8.4").
 End Z_as_Int.