--- a/typing/stypes.ml	2012-05-30 15:29:48.000000000 +0200
+++ b/typing/stypes.ml	2013-06-04 12:46:13.897524763 +0200
@@ -117,9 +117,9 @@

 let print_ident_annot pp str k =
   match k with
-  | Idef l -> fprintf pp "def %s %a@." str print_location l;
-  | Iref_internal l -> fprintf pp "int_ref %s %a@." str print_location l;
-  | Iref_external -> fprintf pp "ext_ref %s@." str;
+  | Idef l -> fprintf pp "def %s %a@\n" str print_location l;
+  | Iref_internal l -> fprintf pp "int_ref %s %a@\n" str print_location l;
+  | Iref_external -> fprintf pp "ext_ref %s@\n" str;
 ;;

 (* The format of the annotation file is documented in emacs/caml-types.el. *)
@@ -129,22 +129,22 @@
   | Ti_class _ | Ti_mod _ -> prev_loc
   | Ti_pat  {pat_loc = loc; pat_type = typ}
   | Ti_expr {exp_loc = loc; exp_type = typ} ->
-      if loc <> prev_loc then fprintf pp "%a@." print_location loc;
-      fprintf pp "type(@.  ";
+      if loc <> prev_loc then fprintf pp "%a@\n" print_location loc;
+      fprintf pp "type(@\n  ";
       printtyp_reset_maybe loc;
       Printtyp.mark_loops typ;
       Printtyp.type_sch pp typ;
-      fprintf pp "@.)@.";
+      fprintf pp "@\n)@\n";
       loc
   | An_call (loc, k) ->
-      if loc <> prev_loc then fprintf pp "%a@." print_location loc;
-      fprintf pp "call(@.  %s@.)@." (call_kind_string k);
+      if loc <> prev_loc then fprintf pp "%a@\n" print_location loc;
+      fprintf pp "call(@\n  %s@\n)@\n" (call_kind_string k);
       loc
   | An_ident (loc, str, k) ->
-      if loc <> prev_loc then fprintf pp "%a@." print_location loc;
-      fprintf pp "ident(@.  ";
+      if loc <> prev_loc then fprintf pp "%a@\n" print_location loc;
+      fprintf pp "ident(@\n  ";
       print_ident_annot pp str k;
-      fprintf pp ")@.";
+      fprintf pp ")@\n";
       loc
 ;;

@@ -163,6 +163,7 @@
         | Some filename -> formatter_of_out_channel (open_out filename) in
     sort_filter_phrases ();
     ignore (List.fold_left (print_info pp) Location.none info);
+    pp_print_flush pp ();
     phrases := [];
   end else begin
     annotations := [];