From 05b31844f683c3bc81b371c94be5cc6f6f4edf61 Mon Sep 17 00:00:00 2001
From: msozeau
Date: Sun, 18 Jan 2009 18:01:12 +0000
Subject: Various little fixes: - allow a new line after a (** printing *)
 directive in coqdoc so as not to output spurious new lines. - never directly
 unify the lemma with an evar in setoid_rewrite (they act as opaque
 constants). - Fix a useless dependency introduced by tauto which splits a
 record in SetoidList.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@11799 85f007b7-540e-0410-9357-904b9bb8a0f7
---
 tactics/class_tactics.ml4   | 3 ++-
 theories/Lists/SetoidList.v | 2 +-
 tools/coqdoc/pretty.mll     | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/tactics/class_tactics.ml4 b/tactics/class_tactics.ml4
index e38b9a6e69..6d01ea00c9 100644
--- a/tactics/class_tactics.ml4
+++ b/tactics/class_tactics.ml4
@@ -808,7 +808,8 @@ let refresh_hypinfo env sigma hypinfo =
   else ()
 
 let unify_eqn env sigma hypinfo t = 
-  try 
+  if isEvar t then None
+  else try 
     let {cl=cl; prf=prf; car=car; rel=rel; l2r=l2r; c1=c1; c2=c2; c=c; abs=abs} = !hypinfo in
     let env', prf, c1, c2, car, rel =
       let left = if l2r then c1 else c2 in
diff --git a/theories/Lists/SetoidList.v b/theories/Lists/SetoidList.v
index 886c95aad3..aed4a3bca0 100644
--- a/theories/Lists/SetoidList.v
+++ b/theories/Lists/SetoidList.v
@@ -687,7 +687,7 @@ destruct (eqA_dec x a).
 left; auto.
 destruct IHl.
 left; auto.
-right; red; inversion_clear 1; tauto.
+right; red; inversion_clear 1; contradiction. 
 Qed.
 
 Fixpoint removeA (x : A) (l : list A){struct l} : list A :=
diff --git a/tools/coqdoc/pretty.mll b/tools/coqdoc/pretty.mll
index c427cc6ffe..dc07e8156b 100644
--- a/tools/coqdoc/pretty.mll
+++ b/tools/coqdoc/pretty.mll
@@ -706,7 +706,7 @@ and skip_hide = parse
 (*s Reading token pretty-print *)
 
 and printing_token_body = parse
-  | "*)" | eof 
+  | "*)" nl? | eof 
 	{ let s = Buffer.contents token_buffer in 
 	  Buffer.clear token_buffer;
 	  s }
-- 
cgit v1.2.3