aboutsummaryrefslogtreecommitdiffhomepage
path: root/toplevel
diff options
context:
space:
mode:
authorGravatar Maxime Dénès <mail@maximedenes.fr>2016-07-06 11:42:35 +0200
committerGravatar Maxime Dénès <mail@maximedenes.fr>2016-07-06 12:25:03 +0200
commit9a1eb2f4fefcc52f56785f20831e854bb626ae95 (patch)
treef08dd10e4d4dde5e9450eb005b8b8e60d64c66e7 /toplevel
parentb2dd4dd979577e4f384750872f7f0e7f9bd8df94 (diff)
Fix #4793: Coq 8.6 should accept -compat 8.6
We also add a Coq86.v compat file.
Diffstat (limited to 'toplevel')
-rw-r--r--toplevel/coqinit.ml3
-rw-r--r--toplevel/coqtop.ml1
2 files changed, 3 insertions, 1 deletions
diff --git a/toplevel/coqinit.ml b/toplevel/coqinit.ml
index 5438b163a..d9cd574a0 100644
--- a/toplevel/coqinit.ml
+++ b/toplevel/coqinit.ml
@@ -130,7 +130,8 @@ let init_ocaml_path () =
[ "grammar" ]; [ "ide" ]; [ "ltac" ]; ]
let get_compat_version = function
- | "8.5" -> Flags.Current
+ | "8.6" -> Flags.Current
+ | "8.5" -> Flags.V8_5
| "8.4" -> Flags.V8_4
| "8.3" -> Flags.V8_3
| "8.2" -> Flags.V8_2
diff --git a/toplevel/coqtop.ml b/toplevel/coqtop.ml
index 7c0b9bec2..d141cd8ec 100644
--- a/toplevel/coqtop.ml
+++ b/toplevel/coqtop.ml
@@ -200,6 +200,7 @@ let require () =
let add_compat_require v =
match v with
| Flags.V8_4 -> add_require "Coq.Compat.Coq84"
+ | Flags.V8_5 -> add_require "Coq.Compat.Coq85"
| _ -> ()
let compile_list = ref ([] : (bool * string) list)