diff options
| author | Henrik Nord <[email protected]> | 2011-08-16 15:01:22 +0200 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2011-08-16 15:01:32 +0200 |
| commit | 48d0c4adbe85450f1224311f9b8495affaae9c6a (patch) | |
| tree | b7ca1cb97b452768898094eb44ddc6b0286af214 /lib/edoc/src/edoc_wiki.erl | |
| parent | f74168772f6eb7765d8cfe0ffcce58273f920bcf (diff) | |
| parent | 52e430eb1570c0cda49a8070063f1a6a2328578b (diff) | |
| download | otp-48d0c4adbe85450f1224311f9b8495affaae9c6a.tar.gz otp-48d0c4adbe85450f1224311f9b8495affaae9c6a.tar.bz2 otp-48d0c4adbe85450f1224311f9b8495affaae9c6a.zip | |
Merge branch 'rc/edoc-minor' into dev
* rc/edoc-minor:
forgot to ensure that xmerl is found in path for include_lib to work
fix -spec declaration that doesn't work in R13B04
eliminate warnings about unused imports
removed CVS-keywords from source files
synchronized with edoc development version
OTP-9463
Diffstat (limited to 'lib/edoc/src/edoc_wiki.erl')
| -rw-r--r-- | lib/edoc/src/edoc_wiki.erl | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/lib/edoc/src/edoc_wiki.erl b/lib/edoc/src/edoc_wiki.erl index ba33198787..2f2d14853c 100644 --- a/lib/edoc/src/edoc_wiki.erl +++ b/lib/edoc/src/edoc_wiki.erl @@ -14,8 +14,6 @@ %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 %% USA %% -%% $Id$ -%% %% @private %% @copyright 2001-2003 Richard Carlsson %% @author Richard Carlsson <[email protected]> @@ -70,7 +68,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 +80,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}}} -> |