4 files changed, 8 insertions, 8 deletions
diff --git a/otherlibs/labltk/browser/editor.ml b/otherlibs/labltk/browser/editor.ml
index 3955f4ba4..ceadef8f7 100644
--- a/otherlibs/labltk/browser/editor.ml
+++ b/otherlibs/labltk/browser/editor.ml
@@ -598,7 +598,7 @@ class editor ~top ~menus = object (self)
             Env.add_module (Ident.create modname)
               (Types.Tmty_signature txt.signature)
               Env.initial
-          in Viewer.view_defined (Longident.Lident modname) ~env
+          in Viewer.view_defined (Longident.Lident modname) ~env ~show_all:true
       end;
 
     (* Modules *)
diff --git a/otherlibs/labltk/browser/main.ml b/otherlibs/labltk/browser/main.ml
index a14e814f1..7eb4c64c4 100644
--- a/otherlibs/labltk/browser/main.ml
+++ b/otherlibs/labltk/browser/main.ml
@@ -58,7 +58,7 @@ let _ =
     with Env.Error _ -> ()
   end;
   
-  Searchpos.view_defined_ref := Viewer.view_defined;
+  Searchpos.view_defined_ref := (fun s ~env -> Viewer.view_defined s ~env);
   Searchpos.editor_ref := Editor.f;
 
   let top = openTk ~clas:"OCamlBrowser" () in
diff --git a/otherlibs/labltk/browser/viewer.ml b/otherlibs/labltk/browser/viewer.ml
index 617d40bb8..ccbda5549 100644
--- a/otherlibs/labltk/browser/viewer.ml
+++ b/otherlibs/labltk/browser/viewer.ml
@@ -225,7 +225,7 @@ let ident_of_decl ~modlid = function
   | Tsig_class (id, _) -> Lident (Ident.name id), Pclass
   | Tsig_cltype (id, _) -> Lident (Ident.name id), Pcltype
 
-let view_defined modlid ~env =
+let view_defined ~env ?(show_all=false) modlid =
   try match lookup_module modlid env with path, Tmty_signature sign ->
     let rec iter_sign sign idents =
       match sign with
@@ -238,8 +238,10 @@ let view_defined modlid ~env =
           in iter_sign rem (ident_of_decl ~modlid decl :: idents)
     in
     let l = iter_sign sign [] in
-    !choose_symbol_ref l ~title:(string_of_path path) ~signature:sign
-       ~env:(open_signature path sign env) ~path
+    let title = string_of_path path in
+    let env = open_signature path sign env in
+    !choose_symbol_ref l ~title ~signature:sign ~env ~path;
+    if show_all then view_signature sign ~title ~env ~path
   | _ -> ()
   with Not_found -> ()
   | Env.Error err ->
@@ -532,7 +534,6 @@ object (self)
           1
 
   method set_path path ~sign =
-    prerr_endline ("* " ^ string_of_path path);
     let rec path_elems l path =
       match path with
         Path.Pdot (path, _, _) -> path_elems (path::l) path
@@ -563,7 +564,6 @@ object (self)
         let s =
           if n = 0 then string_of_longident li else
           string_of_longident li ^ " (" ^ string_of_kind k ^ ")" in
-        prerr_endline s;
         let n = index s texts in
         Listbox.see box (`Num n);
         Listbox.activate box (`Num n)
diff --git a/otherlibs/labltk/browser/viewer.mli b/otherlibs/labltk/browser/viewer.mli
index ac7745c55..d8bec671d 100644
--- a/otherlibs/labltk/browser/viewer.mli
+++ b/otherlibs/labltk/browser/viewer.mli
@@ -25,7 +25,7 @@ val f : ?dir:string -> ?on:toplevel widget -> unit -> unit
 val st_viewer : ?dir:string -> ?on:toplevel widget -> unit -> unit
         (* one-box viewer *)
 
-val view_defined : Longident.t -> env:Env.t -> unit
+val view_defined : env:Env.t -> ?show_all:bool -> Longident.t -> unit
         (* displays a signature, found in environment *)
 
 val close_all_views : unit -> unit