Imported Upstream version 8.2.pl1+dfsgupstream/8.2.pl1+dfsg

3 files changed, 19 insertions, 3 deletions

diff --git a/test-suite/bugs/closed/shouldsucceed/1905.v b/test-suite/bugs/closed/shouldsucceed/1905.v
index bd7fd796..fb2725c9 100644
--- a/test-suite/bugs/closed/shouldsucceed/1905.v
+++ b/test-suite/bugs/closed/shouldsucceed/1905.v
@@ -1,5 +1,5 @@
 
-Require Import Setoid.
+Require Import Setoid Program.
 
 Axiom t : Set.
 Axiom In : nat -> t -> Prop.
diff --git a/test-suite/bugs/closed/shouldsucceed/2089.v b/test-suite/bugs/closed/shouldsucceed/2089.v
new file mode 100644
index 00000000..aebccc94
--- /dev/null
+++ b/test-suite/bugs/closed/shouldsucceed/2089.v
@@ -0,0 +1,17 @@
+Inductive even (x: nat): nat -> Prop :=
+  | even_base: even x O
+  | even_succ: forall n, odd x n -> even x (S n)
+
+with odd (x: nat): nat -> Prop :=
+  | odd_succ: forall n, even x n -> odd x (S n).
+
+Scheme even_ind2 := Minimality for even Sort Prop
+  with odd_ind2 := Minimality for odd Sort Prop.
+
+Combined Scheme even_odd_ind from even_ind2, odd_ind2.
+
+Check (even_odd_ind :forall (x : nat) (P P0 : nat -> Prop),
+  P 0 ->
+  (forall n : nat, odd x n -> P0 n -> P (S n)) ->
+  (forall n : nat, even x n -> P n -> P0 (S n)) ->
+  (forall n : nat, even x n -> P n) /\ (forall n : nat, odd x n -> P0 n)).
diff --git a/test-suite/success/dependentind.v b/test-suite/success/dependentind.v
index 488b057f..46dd0cb6 100644
--- a/test-suite/success/dependentind.v
+++ b/test-suite/success/dependentind.v
@@ -1,5 +1,4 @@
 Require Import Coq.Program.Program.
-Set Manual Implicit Arguments.
 
 
 Variable A : Set.
@@ -105,7 +104,7 @@ Save.
 
 (** Example by Andrew Kenedy, uses simplification of the first component of dependent pairs. *)
 
-Unset Manual Implicit Arguments.
+Set Implicit Arguments.
 
 Inductive Ty :=
  | Nat : Ty