summaryrefslogtreecommitdiff
path: root/ide/preferences.ml
diff options
context:
space:
mode:
authorGravatar Stephane Glondu <steph@glondu.net>2010-10-14 17:51:11 +0200
committerGravatar Stephane Glondu <steph@glondu.net>2010-10-14 17:51:11 +0200
commit3e96002677226c0cdaa8f355938a76cfb37a722a (patch)
tree3ca96e142fdb68e464d2f5f403f315282b94f922 /ide/preferences.ml
parentf18e6146f4fd6ed5b8ded10a3e602f5f64f919f4 (diff)
Imported Upstream version 8.3upstream/8.3
Diffstat (limited to 'ide/preferences.ml')
-rw-r--r--ide/preferences.ml9
1 files changed, 7 insertions, 2 deletions
diff --git a/ide/preferences.ml b/ide/preferences.ml
index 31d03ab9..5d97f659 100644
--- a/ide/preferences.ml
+++ b/ide/preferences.ml
@@ -6,7 +6,7 @@
(* * GNU Lesser General Public License Version 2.1 *)
(************************************************************************)
-(* $Id: preferences.ml 13323 2010-07-24 15:57:30Z herbelin $ *)
+(* $Id: preferences.ml 13436 2010-09-19 10:18:18Z herbelin $ *)
open Configwin
open Printf
@@ -268,7 +268,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);