diff options
| author | Pierre-Marie Pédrot | 2018-10-02 15:34:04 +0200 |
|---|---|---|
| committer | Pierre-Marie Pédrot | 2018-10-02 15:34:04 +0200 |
| commit | e65d160d5fa4e0b8b5754b0925b0b5a880523bc5 (patch) | |
| tree | 21600f3e1fbb6fb82ccf941d6f4246968eb541d6 /ide | |
| parent | 5424ad236574e22a7ef2dce0d1d9468a9b768a16 (diff) | |
| parent | 8c40e6eb7f5bd2421ed6a22a0b44490f3d1fb9ef (diff) | |
Merge PR #8572: [config] Miscellaneous cleaning of configuration variables.
Diffstat (limited to 'ide')
| -rw-r--r-- | ide/coq.ml | 5 | ||||
| -rw-r--r-- | ide/preferences.ml | 19 |
2 files changed, 18 insertions, 6 deletions
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 *) 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" && |