synchronized with edoc development version

1 files changed, 7 insertions, 8 deletions

diff --git a/lib/edoc/src/edoc.erl b/lib/edoc/src/edoc.erl
index 360f2dbc9e..6ea57ac713 100644
--- a/lib/edoc/src/edoc.erl
+++ b/lib/edoc/src/edoc.erl
@@ -179,8 +179,8 @@ application(App, Options) when is_atom(App) ->
  	Dir when is_list(Dir) ->
  	    application(App, Dir, Options);
  	_ ->
- 	    report("cannot find application directory for '~s'.",
- 		   [App]),
+	    edoc_report:report("cannot find application directory for '~s'.",
+                               [App]),
  	    exit(error)
     end.
 
@@ -663,8 +663,8 @@ read_source(Name, Opts0) ->
 	    check_forms(Forms, Name),
 	    Forms;
 	{error, R} ->
-	    error({"error reading file '~s'.",
-		   [edoc_lib:filename(Name)]}),
+	    edoc_report:error({"error reading file '~s'.",
+                               [edoc_lib:filename(Name)]}),
 	    exit({error, R})
     end.
 
@@ -688,11 +688,10 @@ check_forms(Fs, Name) ->
 		 error_marker ->
 		     case erl_syntax:error_marker_info(F) of
 			 {L, M, D} ->
-			     error(L, Name, {format_error, M, D});
-
+			     edoc_report:error(L, Name, {format_error, M, D});
 			 Other ->
-			     report(Name, "unknown error in "
-				    "source code: ~w.", [Other])
+			     edoc_report:report(Name, "unknown error in "
+                                                "source code: ~w.", [Other])
 		     end,
 		     exit(error);
 		 _ ->