diff options
| author | barras | 2005-11-25 17:09:25 +0000 |
|---|---|---|
| committer | barras | 2005-11-25 17:09:25 +0000 |
| commit | fdb545de08669f1e95c9d3fcf4b5bac42f6cbd7c (patch) | |
| tree | 02d6dc2a6e83b60a14f54678a8c5d13ad424947e | |
| parent | cd7a642a58b1189d465fedf99c15c2bc588a037d (diff) | |
*** empty log message ***
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@7608 85f007b7-540e-0410-9357-904b9bb8a0f7
| -rw-r--r-- | ide/coqide.ml | 6 | ||||
| -rw-r--r-- | ide/ideutils.ml | 4 | ||||
| -rw-r--r-- | ide/ideutils.mli | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/ide/coqide.ml b/ide/coqide.ml index c54fde2084..3b9349d8b4 100644 --- a/ide/coqide.ml +++ b/ide/coqide.ml @@ -1729,7 +1729,7 @@ let main files = ~title:"CoqIde" () in (try - let icon_image = Filename.concat lib_ide "coq.ico" in + let icon_image = lib_ide_file "coq.ico" in let icon = GdkPixbuf.from_file icon_image in w#set_icon (Some icon) with _ -> ()); @@ -3210,7 +3210,7 @@ with _ := Induction for _ Sort _.\n",61,10, Some GdkKeysyms._S); ); let about (b:GText.buffer) = (try - let image = Filename.concat lib_ide "coq.png" in + let image = lib_ide_file "coq.png" in let startup_image = GdkPixbuf.from_file image in b#insert_pixbuf ~iter:b#start_iter ~pixbuf:startup_image; @@ -3258,7 +3258,7 @@ with _ := Induction for _ Sort _.\n",61,10, Some GdkKeysyms._S); (* ignore (faq_m#connect#activate ~callback:(fun () -> - load (Filename.concat lib_ide "FAQ"))); + load (lib_ide_file "FAQ"))); *) resize_window := (fun () -> diff --git a/ide/ideutils.ml b/ide/ideutils.ml index d0d025d635..5d7ff31351 100644 --- a/ide/ideutils.ml +++ b/ide/ideutils.ml @@ -32,12 +32,12 @@ let prerr_endline s = let prerr_string s = if !debug then (prerr_string s;flush stderr) -let lib_ide = +let lib_ide_file f = let coqlib = System.getenv_else "COQLIB" (if Coq_config.local || !Options.boot then Coq_config.coqtop else Coq_config.coqlib) in - Filename.concat coqlib "ide" + Filename.concat (Filename.concat coqlib "ide") f let get_insert input_buffer = input_buffer#get_iter_at_mark `INSERT diff --git a/ide/ideutils.mli b/ide/ideutils.mli index 50b04ad0c3..5dad5b18b1 100644 --- a/ide/ideutils.mli +++ b/ide/ideutils.mli @@ -29,7 +29,7 @@ val get_insert : < get_iter_at_mark : [> `INSERT] -> 'a; .. > -> 'a val is_char_start : char -> bool -val lib_ide : string +val lib_ide_file : string -> string val my_stat : string -> Unix.stats option val prerr_endline : string -> unit |