diff options
| author | herbelin | 2008-05-30 10:13:59 +0000 |
|---|---|---|
| committer | herbelin | 2008-05-30 10:13:59 +0000 |
| commit | 10fa0c0b6b6d29901de9258d7fad402e3b6ec79a (patch) | |
| tree | a1ef47f9ca22aecf79f07e067632cae608d0d1a5 /ide/ideutils.ml | |
| parent | b33218fb446a0b2d46eb4ccdd234512dad0c0001 (diff) | |
- Correction d'un nouveau bug de undo de CoqIDE ("Admitted" et "Proof t"
n'étaient pas gérés, merci à Julien).
- Correction pb blocage CoqIDE quand le browser n'est pas déja lancé
(utilisation pour cela de Sys.command au lieu de Unix.open_process_full).
- MAJ CHANGES et COMPATIBILITY.
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@11022 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'ide/ideutils.ml')
| -rw-r--r-- | ide/ideutils.ml | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/ide/ideutils.ml b/ide/ideutils.ml index 6a4833ec88..3442910d35 100644 --- a/ide/ideutils.ml +++ b/ide/ideutils.ml @@ -289,10 +289,8 @@ let run_command f c = let buffe = String.make 127 ' ' in let n = ref 0 in let ne = ref 0 in - - while n:= input cin buff 0 127 ; ne := input cerr buffe 0 127 ; - !n+ !ne <> 0 - do + while n:= input cin buff 0 127 ; ne := input cerr buffe 0 127 ; !n+ !ne <> 0 + do let r = try_convert (String.sub buff 0 !n) in f r; Buffer.add_string result r; @@ -304,10 +302,10 @@ let run_command f c = let browse f url = let com = Flags.subst_command_placeholder !current.cmd_browse url in - let (s,_res) = run_command f com in - if s = Unix.WEXITED 127 then - prerr_endline - ("Could not execute\n \""^com^"\"\ncheck your preferences for setting a valid browser command") + let s = Sys.command com in + if s = 127 then + f ("Could not execute\n\""^com^ + "\"\ncheck your preferences for setting a valid browser command\n") let url_for_keyword = let ht = Hashtbl.create 97 in @@ -332,8 +330,7 @@ let url_for_keyword = let browse_keyword f text = try let u = url_for_keyword text in browse f (!current.doc_url ^ u) - with Not_found -> - prerr_endline ("No documentation found for "^text) + with Not_found -> f ("No documentation found for "^text) let underscore = Glib.Utf8.to_unichar "_" (ref 0) |
