From bff2b36cb0e2dbd02c4f181fba545a420e847767 Mon Sep 17 00:00:00 2001
From: Hugo Herbelin
Date: Sun, 1 Feb 2015 15:11:14 +0100
Subject: Capital letter in plugins.

---
 plugins/setoid_ring/newring.ml4 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/setoid_ring/newring.ml4 b/plugins/setoid_ring/newring.ml4
index 2f9e8509c2..f040de33cf 100644
--- a/plugins/setoid_ring/newring.ml4
+++ b/plugins/setoid_ring/newring.ml4
@@ -260,7 +260,7 @@ let rec dest_rel t =
 (****************************************************************************)
 (* Library linking *)
 
-let plugin_dir = "setoid_ring"
+let plugin_dir = "Setoid_ring"
 
 let cdir = ["Coq";plugin_dir]
 let plugin_modules =
-- 
cgit v1.2.3


From 9daec838c8896e7c1048b42d01eba0c71c912f00 Mon Sep 17 00:00:00 2001
From: Hugo Herbelin
Date: Thu, 12 Feb 2015 18:51:14 +0100
Subject: Revert "Capital letter in plugins." (Sorry, was not intended to be
 pushed)

This reverts commit bff2b36cb0e2dbd02c4f181fba545a420e847767.
---
 plugins/setoid_ring/newring.ml4 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/setoid_ring/newring.ml4 b/plugins/setoid_ring/newring.ml4
index f040de33cf..2f9e8509c2 100644
--- a/plugins/setoid_ring/newring.ml4
+++ b/plugins/setoid_ring/newring.ml4
@@ -260,7 +260,7 @@ let rec dest_rel t =
 (****************************************************************************)
 (* Library linking *)
 
-let plugin_dir = "Setoid_ring"
+let plugin_dir = "setoid_ring"
 
 let cdir = ["Coq";plugin_dir]
 let plugin_modules =
-- 
cgit v1.2.3


From 5c603ebd99e4e8e7abb8b2036a6ffac5b19f66cf Mon Sep 17 00:00:00 2001
From: Matthieu Sozeau
Date: Thu, 12 Feb 2015 22:41:40 +0100
Subject: Univs: fix bug #3978: carry around the universe context used to
 typecheck with definitions and thread it accordingly when typechecking module
 expressions.

---
 plugins/extraction/extract_env.ml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/extraction/extract_env.ml b/plugins/extraction/extract_env.ml
index 42e69d342e..90ee6d0ef1 100644
--- a/plugins/extraction/extract_env.ml
+++ b/plugins/extraction/extract_env.ml
@@ -235,7 +235,7 @@ let rec extract_structure_spec env mp = function
 
 and extract_mexpr_spec env mp1 (me_struct,me_alg) = match me_alg with
   | MEident mp -> Visit.add_mp_all mp; MTident mp
-  | MEwith(me',WithDef(idl,c))->
+  | MEwith(me',WithDef(idl,(c,ctx)))->
       let env' = env_for_mtb_with_def env (mp_of_mexpr me') me_struct idl in
       let mt = extract_mexpr_spec env mp1 (me_struct,me') in
       (match extract_with_type env' c with (* cb may contain some kn *)
-- 
cgit v1.2.3