From 4bc9529ece085441121678a07e4b269c7633471c Mon Sep 17 00:00:00 2001
From: Emilio Jesus Gallego Arias <e+git@x80.org>
Date: Mon, 5 Feb 2018 04:02:27 +0100
Subject: [ide] Localize a IDE-specific flag.

---
 ide/coq.ml    | 4 +++-
 ide/coq.mli   | 3 +++
 ide/coqide.ml | 2 +-
 lib/flags.ml  | 2 --
 lib/flags.mli | 1 -
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/ide/coq.ml b/ide/coq.ml
index 42ab86dd6..34b4875af 100644
--- a/ide/coq.ml
+++ b/ide/coq.ml
@@ -9,6 +9,8 @@
 open Ideutils
 open Preferences
 
+let ideslave_coqtop_flags = ref None
+
 (** * Version and date *)
 
 let get_version_date () =
@@ -375,7 +377,7 @@ let spawn_handle args respawner feedback_processor =
   in
   let args = Array.of_list ("--xml_format=Ppcmds" :: "-async-proofs" :: async_default :: "-ideslave" :: args) in
   let env =
-    match !Flags.ideslave_coqtop_flags with
+    match !ideslave_coqtop_flags with
     | None -> None
     | Some s ->
       let open Str in
diff --git a/ide/coq.mli b/ide/coq.mli
index 463dd134a..8c4727b37 100644
--- a/ide/coq.mli
+++ b/ide/coq.mli
@@ -171,3 +171,6 @@ val check_connection : string list -> unit
 
 val interrupter : (int -> unit) ref
 val save_all : (unit -> unit) ref
+
+(* Flags to be used for ideslave *)
+val ideslave_coqtop_flags : string option ref
diff --git a/ide/coqide.ml b/ide/coqide.ml
index 3cc46b6aa..4de9a5288 100644
--- a/ide/coqide.ml
+++ b/ide/coqide.ml
@@ -1360,7 +1360,7 @@ let read_coqide_args argv =
       Backtrace.record_backtrace true;
       filter_coqtop coqtop project_files ("-debug"::out) args
     |"-coqtop-flags" :: flags :: args->
-      Flags.ideslave_coqtop_flags := Some flags;
+      Coq.ideslave_coqtop_flags := Some flags;
       filter_coqtop coqtop project_files out args
     |arg::args when out = [] && Minilib.is_prefix_of "-psn_" arg ->
       (* argument added by MacOS during .app launch *)
diff --git a/lib/flags.ml b/lib/flags.ml
index 01361dad5..415e4399a 100644
--- a/lib/flags.ml
+++ b/lib/flags.ml
@@ -56,10 +56,8 @@ let in_toplevel = ref false
 let profile = false
 
 let ide_slave = ref false
-let ideslave_coqtop_flags = ref None
 
 let raw_print = ref false
-
 let univ_print = ref false
 
 let we_are_parsing = ref false
diff --git a/lib/flags.mli b/lib/flags.mli
index 33d281798..c82410f07 100644
--- a/lib/flags.mli
+++ b/lib/flags.mli
@@ -33,7 +33,6 @@ val profile : bool
 
 (* -ide_slave: printing will be more verbose, will affect stm caching *)
 val ide_slave : bool ref
-val ideslave_coqtop_flags : string option ref
 
 (* development flag to detect race conditions, it should go away. *)
 val we_are_parsing : bool ref
-- 
cgit v1.2.3