From 4de95593380294b3d2c4f10f346aaf9bb5d4d6eb Mon Sep 17 00:00:00 2001
From: Emilio Jesus Gallego Arias
Date: Thu, 27 Sep 2018 02:28:30 +0200
Subject: [lib] [flags] Move private IDE functions to `ide`

---
 ide/preferences.ml | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

(limited to 'ide')

diff --git a/ide/preferences.ml b/ide/preferences.ml
index 955ee87840..3f10af04c9 100644
--- a/ide/preferences.ml
+++ b/ide/preferences.ml
@@ -345,8 +345,15 @@ let _ = attach_modifiers modifier_for_queries "<Actions>/Queries/"
 let modifiers_valid =
   new preference ~name:["modifiers_valid"] ~init:"<Alt><Control><Shift>" ~repr:Repr.(string)
 
+let browser_cmd_fmt =
+ try
+  let coq_netscape_remote_var = "COQREMOTEBROWSER" in
+  Sys.getenv coq_netscape_remote_var
+ with
+  Not_found -> Coq_config.browser
+
 let cmd_browse =
-  new preference ~name:["cmd_browse"] ~init:Flags.browser_cmd_fmt ~repr:Repr.(string)
+  new preference ~name:["cmd_browse"] ~init:browser_cmd_fmt ~repr:Repr.(string)
 
 let cmd_editor =
   let init = if Sys.os_type = "Win32" then "NOTEPAD %s" else "emacs %s" in
@@ -359,6 +366,14 @@ let text_font =
   in
   new preference ~name:["text_font"] ~init ~repr:Repr.(string)
 
+let is_standard_doc_url url =
+  let wwwcompatprefix = "http://www.lix.polytechnique.fr/coq/" in
+  let n = String.length Coq_config.wwwcoq in
+  let n' = String.length Coq_config.wwwrefman in
+  url = Coq_config.localwwwrefman ||
+  url = Coq_config.wwwrefman ||
+  url = wwwcompatprefix ^ String.sub Coq_config.wwwrefman n (n'-n)
+
 let doc_url =
 object
   inherit [string] preference
@@ -366,7 +381,7 @@ object
     as super
 
   method! set v =
-    if not (Flags.is_standard_doc_url v) &&
+    if not (is_standard_doc_url v) &&
       v <> use_default_doc_url &&
       (* Extra hack to support links to last released doc version *)
       v <> Coq_config.wwwcoq ^ "doc" &&
-- 
cgit v1.2.3


From 8c40e6eb7f5bd2421ed6a22a0b44490f3d1fb9ef Mon Sep 17 00:00:00 2001
From: Emilio Jesus Gallego Arias
Date: Thu, 27 Sep 2018 02:50:42 +0200
Subject: [config] Remove unused ML variables.

These are unused and not likely to come back.
---
 ide/coq.ml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'ide')

diff --git a/ide/coq.ml b/ide/coq.ml
index e948360191..88ffb4f0b7 100644
--- a/ide/coq.ml
+++ b/ide/coq.ml
@@ -42,14 +42,11 @@ let version () =
       "The Coq Proof Assistant, version %s (%s)\
        \nArchitecture %s running %s operating system\
        \nGtk version is %s\
-       \nThis is %s (%s is the best one for this architecture and OS)\
-       \n"
+       \nThis is %s \n"
       ver date
       Coq_config.arch Sys.os_type
       (let x,y,z = GMain.Main.version in Printf.sprintf "%d.%d.%d" x y z)
       (Filename.basename Sys.executable_name)
-      Coq_config.best
-
 
 (** * Initial checks by launching test coqtop processes *)
 
-- 
cgit v1.2.3