From 403d462964b773516a99726129ea8dcdcc9a96f5 Mon Sep 17 00:00:00 2001 From: Richard Carlsson Date: Tue, 2 Aug 2011 13:11:23 +0200 Subject: synchronized with edoc development version --- lib/edoc/src/edoc.erl | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'lib/edoc/src/edoc.erl') 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); _ -> -- cgit v1.2.3 From 9c9ed58c9d1dda28d47b714aa76dab49edb6abc6 Mon Sep 17 00:00:00 2001 From: Richard Carlsson Date: Sun, 21 Nov 2010 14:14:39 +0100 Subject: removed CVS-keywords from source files --- lib/edoc/src/edoc.erl | 2 -- 1 file changed, 2 deletions(-) (limited to 'lib/edoc/src/edoc.erl') diff --git a/lib/edoc/src/edoc.erl b/lib/edoc/src/edoc.erl index 6ea57ac713..bcbf47b6ea 100644 --- a/lib/edoc/src/edoc.erl +++ b/lib/edoc/src/edoc.erl @@ -14,8 +14,6 @@ %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 %% USA %% -%% $Id$ -%% %% @copyright 2001-2007 Richard Carlsson %% @author Richard Carlsson %% @version {@version} -- cgit v1.2.3 From d23c1374a4b19a7b6ced9d1a1b0bac536ff4d104 Mon Sep 17 00:00:00 2001 From: Richard Carlsson Date: Tue, 2 Aug 2011 14:53:02 +0200 Subject: eliminate warnings about unused imports --- lib/edoc/src/edoc.erl | 2 -- 1 file changed, 2 deletions(-) (limited to 'lib/edoc/src/edoc.erl') diff --git a/lib/edoc/src/edoc.erl b/lib/edoc/src/edoc.erl index bcbf47b6ea..a279f7dcb3 100644 --- a/lib/edoc/src/edoc.erl +++ b/lib/edoc/src/edoc.erl @@ -58,8 +58,6 @@ -compile({no_auto_import,[error/1]}). --import(edoc_report, [report/2, report/3, error/1, error/3]). - -include("edoc.hrl"). -- cgit v1.2.3