3 files changed, 4 insertions, 11 deletions
diff --git a/lib/flags.ml b/lib/flags.ml
index 341e7f8e41..8491873e07 100644
--- a/lib/flags.ml
+++ b/lib/flags.ml
@@ -69,17 +69,11 @@ let we_are_parsing = ref false
 (* Current means no particular compatibility consideration.
    For correct comparisons, this constructor should remain the last one. *)
 
-type compat_version = VOld | V8_5 | V8_6 | V8_7 | Current
+type compat_version = V8_6 | V8_7 | Current
 
 let compat_version = ref Current
 
 let version_compare v1 v2 = match v1, v2 with
-  | VOld, VOld -> 0
-  | VOld, _ -> -1
-  | _, VOld -> 1
-  | V8_5, V8_5 -> 0
-  | V8_5, _ -> -1
-  | _, V8_5 -> 1
   | V8_6, V8_6 -> 0
   | V8_6, _ -> -1
   | _, V8_6 -> 1
@@ -92,8 +86,6 @@ let version_strictly_greater v = version_compare !compat_version v > 0
 let version_less_or_equal v = not (version_strictly_greater v)
 
 let pr_version = function
-  | VOld -> "old"
-  | V8_5 -> "8.5"
   | V8_6 -> "8.6"
   | V8_7 -> "8.7"
   | Current -> "current"
diff --git a/lib/flags.mli b/lib/flags.mli
index a128617ce4..85aaf879f3 100644
--- a/lib/flags.mli
+++ b/lib/flags.mli
@@ -45,7 +45,7 @@ val raw_print : bool ref
 (* Univ print flag, never set anywere. Maybe should belong to Univ? *)
 val univ_print : bool ref
 
-type compat_version = VOld | V8_5 | V8_6 | V8_7 | Current
+type compat_version = V8_6 | V8_7 | Current
 val compat_version : compat_version ref
 val version_compare : compat_version -> compat_version -> int
 val version_strictly_greater : compat_version -> bool
diff --git a/lib/system.ml b/lib/system.ml
index 547c5a6912..dfede29e8f 100644
--- a/lib/system.ml
+++ b/lib/system.ml
@@ -56,7 +56,8 @@ let make_dir_table dir =
   let filter_dotfiles s f = if f.[0] = '.' then s else StrSet.add f s in
   Array.fold_left filter_dotfiles StrSet.empty (Sys.readdir dir)
 
-let trust_file_cache = ref true
+(** Don't trust in interactive mode (the default) *)
+let trust_file_cache = ref false
 
 let exists_in_dir_respecting_case dir bf =
   let cache_dir dir =