diff options
| author |  Stephane Glondu <steph@glondu.net> | 2010-10-14 17:58:31 +0200 |
|---|---|---|
| committer | Stephane Glondu <steph@glondu.net> | 2010-10-14 17:58:31 +0200 |
| commit | d06cea3ce4526736b5d32ba1780dbbc87c37c981 (patch) | |
| tree | 2c2ea5a4633a41cfd4451e1eefb79c171312c881 /ide/preferences.ml | |
| parent | aae7cec8d7f5048215b7ed06a8e94cb032bfd21a (diff) | |
| parent | 8f4d4c66134804bbf2d2fe65c893b68387272d31 (diff) | |
Merge commit 'upstream/8.3+dfsg' into experimental/master
Diffstat (limited to 'ide/preferences.ml')
| -rw-r--r-- | ide/preferences.ml | 9 |
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); |