fusion des changements 3.09.2 -> 3.09.3

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@7619 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02

1 files changed, 15 insertions, 15 deletions

diff --git a/ocamldoc/odoc.ml b/ocamldoc/odoc.ml
index 1d4df9c6a2..e66ce37543 100644
--- a/ocamldoc/odoc.ml
+++ b/ocamldoc/odoc.ml
@@ -21,7 +21,7 @@ open Typedtree
 
 module M = Odoc_messages
 
-let print_DEBUG s = print_string s ; print_newline () 
+let print_DEBUG s = print_string s ; print_newline ()
 
 (* we check if we must load a module given on the command line *)
 let arg_list = Array.to_list Sys.argv
@@ -42,7 +42,7 @@ let (cmo_or_cma_opt, paths) =
 
 let _ = print_DEBUG "Fin analyse des arguments pour le dynamic load"
 
-(** Return the real name of the file to load, 
+(** Return the real name of the file to load,
    searching it in the paths if it is
    a simple name and not in the current directory. *)
 let get_real_filename name =
@@ -74,16 +74,16 @@ let _ =
         let real_file = get_real_filename file in
         ignore(Dynlink.loadfile real_file)
       with
-        Dynlink.Error e -> 
+        Dynlink.Error e ->
           prerr_endline (Odoc_messages.load_file_error file (Dynlink.error_message e)) ;
           exit 1
       | Not_found ->
           prerr_endline (Odoc_messages.load_file_error file "Not_found");
-          exit 1  
+          exit 1
       | Sys_error s
       |	Failure s ->
           prerr_endline (Odoc_messages.load_file_error file s);
-          exit 1  
+          exit 1
 
 let _ = print_DEBUG "Fin du chargement dynamique éventuel"
 
@@ -101,16 +101,16 @@ let _ = Odoc_args.parse
 
 
 let loaded_modules =
-  List.flatten 
-    (List.map 
+  List.flatten
+    (List.map
        (fun f ->
          Odoc_info.verbose (Odoc_messages.loading f);
-         try 
+         try
            let l = Odoc_analyse.load_modules f in
            Odoc_info.verbose Odoc_messages.ok;
            l
-         with Failure s -> 
-           prerr_endline s ; 
+         with Failure s ->
+           prerr_endline s ;
            incr Odoc_global.errors ;
            []
        )
@@ -124,20 +124,20 @@ let _ =
     None -> ()
   | Some f ->
       try Odoc_analyse.dump_modules f modules
-      with Failure s -> 
+      with Failure s ->
         prerr_endline s ;
         incr Odoc_global.errors
 
-let _ = 
+let _ =
   match !Odoc_args.doc_generator with
     None ->
       ()
-  | Some gen -> 
+  | Some gen ->
       Odoc_info.verbose Odoc_messages.generating_doc;
       gen#generate modules;
       Odoc_info.verbose Odoc_messages.ok
 
-let _ = 
+let _ =
   if !Odoc_global.errors > 0 then
   (
    prerr_endline (Odoc_messages.errors_occured !Odoc_global.errors) ;
@@ -145,6 +145,6 @@ let _ =
   )
   else
     exit 0
-  
+
 
 (* eof $Id$ *)