diff options
| author | Jacques Garrigue <garrigue at math.nagoya-u.ac.jp> | 2001-09-02 13:42:19 +0000 |
|---|---|---|
| committer | Jacques Garrigue <garrigue at math.nagoya-u.ac.jp> | 2001-09-02 13:42:19 +0000 |
| commit | fe2e11a8fb4dcf166ffb7f91e6eb8dd0f4402f25 (patch) | |
| tree | 8dff8da7bfc88f25c78afe5340d78daa8c89587c /otherlibs/labltk/browser | |
| parent | 7e053c39de8693928b83038c1727f5d90228c39d (diff) | |
| download | ocaml-strict_labels.tar.gz | |
remove doublonsstrict_labels
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/strict_labels@3687 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'otherlibs/labltk/browser')
| -rw-r--r-- | otherlibs/labltk/browser/editor.ml | 6 | ||||
| -rw-r--r-- | otherlibs/labltk/browser/searchpos.ml | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/otherlibs/labltk/browser/editor.ml b/otherlibs/labltk/browser/editor.ml index b1900c6765..279098d3da 100644 --- a/otherlibs/labltk/browser/editor.ml +++ b/otherlibs/labltk/browser/editor.ml @@ -113,7 +113,7 @@ let select_shell txt = begin fun () -> try let name = Listbox.get box ~index:`Active in - txt.shell <- Some (name, List.assoc name shells); + txt.shell <- Some (name, List.assoc name ~map:shells); destroy tl with Not_found -> txt.shell <- None; destroy tl end @@ -392,7 +392,7 @@ class editor ~top ~menus = object (self) try if Sys.file_exists name then if txt.name = name then - Sys.rename' ~src:name ~dst:(name ^ "~") + Sys.rename name (name ^ "~") else begin match Jg_message.ask ~master:top ~title:"Save" ("File `" ^ name ^ "' exists. Overwrite it?") @@ -434,7 +434,7 @@ class editor ~top ~menus = object (self) and buf = String.create 4096 in Text.delete tw ~start:tstart ~stop:tend; while - len := input' file ~buf ~pos:0 ~len:4096; + len := input file buf 0 4096; !len > 0 do Jg_text.output tw ~buf ~pos:0 ~len:!len diff --git a/otherlibs/labltk/browser/searchpos.ml b/otherlibs/labltk/browser/searchpos.ml index 18e01e531e..e5c222d6da 100644 --- a/otherlibs/labltk/browser/searchpos.ml +++ b/otherlibs/labltk/browser/searchpos.ml @@ -14,6 +14,7 @@ (* $Id$ *) open StdLabels +open Support open Tk open Jg_tk open Parsetree @@ -235,7 +236,7 @@ let filter_modules () = Hashtbl.remove shown_modules key) shown_modules let add_shown_module path ~widgets = - Hashtbl.add' shown_modules ~key:path ~data:widgets + Hashtbl'.add shown_modules ~key:path ~data:widgets let find_shown_module path = try filter_modules (); |