aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--ide/preferences.ml7
-rw-r--r--lib/flags.ml3
2 files changed, 7 insertions, 3 deletions
diff --git a/ide/preferences.ml b/ide/preferences.ml
index a99424cf7..a6aaef257 100644
--- a/ide/preferences.ml
+++ b/ide/preferences.ml
@@ -266,7 +266,12 @@ let load_pref () =
set_command_with_pair_compat "cmd_editor" (fun v -> np.cmd_editor <- v);
set_hd "text_font" (fun v -> np.text_font <- Pango.Font.from_string v);
set_hd "doc_url" (fun v ->
- if not (Flags.is_standard_doc_url v) && v <> use_default_doc_url then
+ if not (Flags.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" &&
+ v <> Coq_config.wwwcoq ^ "doc/"
+ then
prerr_endline ("Warning: Non-standard URL for Coq documentation in preference file: "^v);
np.doc_url <- v);
set_hd "library_url" (fun v -> np.library_url <- v);
diff --git a/lib/flags.ml b/lib/flags.ml
index cb450a5db..8ec4a2351 100644
--- a/lib/flags.ml
+++ b/lib/flags.ml
@@ -112,8 +112,7 @@ let browser_cmd_fmt =
let is_standard_doc_url url =
let wwwcompatprefix = "http://www.lix.polytechnique.fr/coq/" in
- let wwwprefix = "http://coq.inria.fr/" in
- let n = String.length wwwprefix 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 ||