From e2e45e45a09ab25bf33ba49eef5a7cba9a30b337 Mon Sep 17 00:00:00 2001
From: Enrico Tassi
Date: Wed, 7 Nov 2018 13:18:13 +0100
Subject: Revert "Do not allow spliting in res_pf, this is reserved for
 pretyping"

This reverts commit 8d8200d4bff3ffc44efc51ad44dccee9eb14ec6a.

Fix #7936

# Conflicts:
#	proofs/clenvtac.ml
---
 proofs/clenvtac.ml         | 2 +-
 test-suite/success/Hints.v | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/proofs/clenvtac.ml b/proofs/clenvtac.ml
index 77f5804665..b99cf245fe 100644
--- a/proofs/clenvtac.ml
+++ b/proofs/clenvtac.ml
@@ -72,7 +72,7 @@ let clenv_refine ?(with_evars=false) ?(with_classes=true) clenv =
     if with_classes then
       let evd' =
         Typeclasses.resolve_typeclasses ~filter:Typeclasses.all_evars
-          ~fail:(not with_evars) ~split:false clenv.env clenv.evd
+          ~fail:(not with_evars) clenv.env clenv.evd
       in
       Typeclasses.make_unresolvables (fun x -> List.mem_f Evar.equal x evars) evd'
     else clenv.evd
diff --git a/test-suite/success/Hints.v b/test-suite/success/Hints.v
index ebf5b094e1..2f13b7c225 100644
--- a/test-suite/success/Hints.v
+++ b/test-suite/success/Hints.v
@@ -169,7 +169,7 @@ Proof.
 Hint Cut [_* (a_is_b | b_is_c | c_is_d | d_is_e)
                  (a_compose | b_compose | c_compose | d_compose | e_compose)] : typeclass_instances.
 
-Timeout 1 Fail apply _. (* 0.06s *)
+  Timeout 1 Fail apply _. (* 0.06s *)
 Abort.
 End HintCut.
 
-- 
cgit v1.2.3