diff options
| author | Richard Carlsson <[email protected]> | 2011-08-02 13:11:23 +0200 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2011-08-04 11:27:00 +0200 |
| commit | 403d462964b773516a99726129ea8dcdcc9a96f5 (patch) | |
| tree | 2a27d637402666c82236878b7a077a9183578936 /lib/edoc/src/edoc_wiki.erl | |
| parent | 07936436b8a8b18b80451a09e040283ebecbd43b (diff) | |
| download | otp-403d462964b773516a99726129ea8dcdcc9a96f5.tar.gz otp-403d462964b773516a99726129ea8dcdcc9a96f5.tar.bz2 otp-403d462964b773516a99726129ea8dcdcc9a96f5.zip | |
synchronized with edoc development version
Diffstat (limited to 'lib/edoc/src/edoc_wiki.erl')
| -rw-r--r-- | lib/edoc/src/edoc_wiki.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/edoc/src/edoc_wiki.erl b/lib/edoc/src/edoc_wiki.erl index ba33198787..0516de4b9f 100644 --- a/lib/edoc/src/edoc_wiki.erl +++ b/lib/edoc/src/edoc_wiki.erl @@ -70,7 +70,7 @@ -export([parse_xml/2, expand_text/2]). -include("edoc.hrl"). --include("xmerl.hrl"). +-include_lib("xmerl/include/xmerl.hrl"). -define(BASE_HEADING, 3). @@ -82,8 +82,8 @@ parse_xml(Data, Line) -> parse_xml_1(Text, Line) -> Text1 = "<doc>" ++ Text ++ "</doc>", - Options = [{line, Line}, {encoding, "iso-8859-1"}], - case catch {ok, xmerl_scan:string(Text1, Options)} of + Opts = [{line, Line}, {encoding, 'iso-8859-1'}], + case catch {ok, xmerl_scan:string(Text1, Opts)} of {ok, {E, _}} -> E#xmlElement.content; {'EXIT', {fatal, {Reason, L, _C}}} -> |