Coqide: the coqtop to launch is a preference.

If it is AUTO then we keep the heuristic to change coqide by coqtop in Sys.executable_name.
If it fails coqtop location must be given by the users.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@15188 85f007b7-540e-0410-9357-904b9bb8a0f7

1 files changed, 13 insertions, 7 deletions

diff --git a/ide/coqide_main.ml4 b/ide/coqide_main.ml4
index 3fec06313..5c6034d5c 100644
--- a/ide/coqide_main.ml4
+++ b/ide/coqide_main.ml4
@@ -65,12 +65,6 @@ let () =
 END
 
 let () =
-  let argl = Array.to_list Sys.argv in
-  let argl = Coqide.read_coqide_args argl in
-  let files = Coqide.process_argv argl in
-  let args = List.filter (fun x -> not (List.mem x files)) (List.tl argl) in
-  Coq.check_connection args;
-  Coqide.sup_args := args;
   Coqide.ignore_break ();
   (try
      let gtkrcdir = List.find
@@ -78,6 +72,12 @@ let () =
        Minilib.xdg_config_dirs in
      GtkMain.Rc.add_default_file (Filename.concat gtkrcdir "coqide-gtk2rc");
    with Not_found -> ());
+  (* Statup preferences *)
+  begin
+    try Preferences.load_pref ()
+    with e ->
+      Ideutils.flash_info ("Could not load preferences ("^Printexc.to_string e^").");
+  end;
   ignore (GtkMain.Main.init ());
   initmac () ;
 (*    GtkData.AccelGroup.set_default_mod_mask
@@ -89,7 +89,13 @@ let () =
 		  if level land Glib.Message.log_level `WARNING <> 0
 		  then Printf.eprintf "Warning: %s\n" msg
 		  else failwith ("Coqide internal error: " ^ msg)));
-    Coqide.main files;
+  let argl = Array.to_list Sys.argv in
+  let argl = Coqide.read_coqide_args argl in
+  let files = Coqide.process_argv argl in
+  let args = List.filter (fun x -> not (List.mem x files)) (List.tl argl) in
+  Coq.check_connection args;
+  Coqide.sup_args := args;
+  Coqide.main files;
     if !Coq_config.with_geoproof then ignore (Thread.create Coqide.check_for_geoproof_input ());
     macready (Coqide_ui.ui_m#get_widget "/CoqIde MenuBar") (Coqide_ui.ui_m#get_widget "/CoqIde MenuBar/Edit/Prefs")
              (Coqide_ui.ui_m#get_widget "/CoqIde MenuBar/Help/Abt");