From c46981cfcdfe804178e1fe48a8489de6f7733c9c Mon Sep 17 00:00:00 2001
From: Erik Martin-Dorel <erik.martin-dorel@irit.fr>
Date: Sun, 18 Sep 2016 17:02:10 +0200
Subject: Fix typos in RefMan-uti.tex.

- Ensure "coq_makefile --help" is properly typeset with HeVeA/PdfLaTeX
- Replace 's with "s so they are typeset as true ASCII characters
- Add missing ; before closing brace.
---
 doc/refman/RefMan-uti.tex | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/refman/RefMan-uti.tex b/doc/refman/RefMan-uti.tex
index c282083b5..3bac7f5c1 100644
--- a/doc/refman/RefMan-uti.tex
+++ b/doc/refman/RefMan-uti.tex
@@ -102,7 +102,7 @@ generator using for instance the command:
 
 This command generates a file \texttt{Makefile} that can be used to
 compile all the sources of the current project. It follows the
-syntax described by the output of \texttt{\% coq\_makefile ----help}.
+syntax described by the output of \texttt{\% coq\_makefile -{}-help}.
 Once the \texttt{Makefile} file has been generated a first time, it
 can be used by the \texttt{make} command to compile part or all of
 the project. Note that once it has been generated once, as soon as
@@ -112,8 +112,8 @@ automatically regenerated by an invocation of \texttt{make}.
 The following command generates a minimal example of
 \texttt{\_CoqProject} file:
 \begin{quotation}
-\texttt{\% \{ echo '-R .} \textit{MyFancyLib} \texttt{' ; find . -name
-  '*.v' -print \} > \_CoqProject}
+\texttt{\% \{ echo "-R .} \textit{MyFancyLib}\texttt{" ; find . -name
+  "*.v" -print ; \} > \_CoqProject}
 \end{quotation}
 when executed at the root of the directory containing the
 project. Here the \texttt{\_CoqProject} lists all the \texttt{.v} files
-- 
cgit v1.2.3


From da708e759a1518bf4304e3d0edd725ed4176941f Mon Sep 17 00:00:00 2001
From: Erik Martin-Dorel <erik.martin-dorel@irit.fr>
Date: Mon, 19 Sep 2016 19:08:23 +0200
Subject: Replace { command ; } with ( command )

as suggested by Hugo. Also, escape the spaces after the dots to obtain
a better PdfLaTeX output.
---
 doc/refman/RefMan-uti.tex | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/refman/RefMan-uti.tex b/doc/refman/RefMan-uti.tex
index 3bac7f5c1..f7d07772f 100644
--- a/doc/refman/RefMan-uti.tex
+++ b/doc/refman/RefMan-uti.tex
@@ -112,8 +112,8 @@ automatically regenerated by an invocation of \texttt{make}.
 The following command generates a minimal example of
 \texttt{\_CoqProject} file:
 \begin{quotation}
-\texttt{\% \{ echo "-R .} \textit{MyFancyLib}\texttt{" ; find . -name
-  "*.v" -print ; \} > \_CoqProject}
+\texttt{\% ( echo "-R .\ }\textit{MyFancyLib}\texttt{" ; find .\ -name
+  "*.v" -print ) > \_CoqProject}
 \end{quotation}
 when executed at the root of the directory containing the
 project. Here the \texttt{\_CoqProject} lists all the \texttt{.v} files
-- 
cgit v1.2.3


From 464c680b631e1ba892f2171a36002d6ca184bc4f Mon Sep 17 00:00:00 2001
From: Hugo Herbelin <Hugo.Herbelin@inria.fr>
Date: Thu, 22 Sep 2016 11:14:37 +0200
Subject: Fixing #5095 (non relevant too strict test in let-in abstraction).

---
 pretyping/unification.ml      | 9 +--------
 test-suite/bugs/closed/5095.v | 5 +++++
 2 files changed, 6 insertions(+), 8 deletions(-)
 create mode 100644 test-suite/bugs/closed/5095.v

diff --git a/pretyping/unification.ml b/pretyping/unification.ml
index cd0bbfa30..347bf6f9e 100644
--- a/pretyping/unification.ml
+++ b/pretyping/unification.ml
@@ -1570,14 +1570,7 @@ let make_abstraction_core name (test,out) env sigma c ty occs check_occs concl =
   let compute_dependency _ (hyp,_,_ as d) (sign,depdecls) =
     match occurrences_of_hyp hyp occs with
     | NoOccurrences, InHyp ->
-        if indirectly_dependent c d depdecls then
-          (* Told explicitly not to abstract over [d], but it is dependent *)
-          let id' = indirect_dependency d depdecls in
-          errorlabstrm "" (str "Cannot abstract over " ++ Nameops.pr_id id'
-            ++ str " without also abstracting or erasing " ++ Nameops.pr_id hyp
-            ++ str ".")
-        else
-          (push_named_context_val d sign,depdecls)
+        (push_named_context_val d sign,depdecls)
     | AllOccurrences, InHyp as occ ->
         let occ = if likefirst then LikeFirst else AtOccs occ in
         let newdecl = replace_term_occ_decl_modulo occ test mkvarid d in
diff --git a/test-suite/bugs/closed/5095.v b/test-suite/bugs/closed/5095.v
new file mode 100644
index 000000000..b6f38e3e8
--- /dev/null
+++ b/test-suite/bugs/closed/5095.v
@@ -0,0 +1,5 @@
+(* Checking let-in abstraction *)
+Goal let x := Set in let y := x in True.
+  intros x y.
+  (* There used to have a too strict dependency test there *)
+  set (s := Set) in (value of x).
-- 
cgit v1.2.3