diff options
| author | Fredrik Gustafsson <[email protected]> | 2012-08-10 11:01:08 +0200 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2012-08-10 11:01:08 +0200 |
| commit | a9953b23cbc7327132df4da61f236413a828e6b5 (patch) | |
| tree | 4bd8b35aca9aee02d81dfecc5cae76c97db55ce6 /lib/edoc/src | |
| parent | bd4eed6a3de6f759f17b0715219987036dd3baba (diff) | |
| parent | f968ff87b1d6fb74237010bffa0390953337425e (diff) | |
| download | otp-a9953b23cbc7327132df4da61f236413a828e6b5.tar.gz otp-a9953b23cbc7327132df4da61f236413a828e6b5.tar.bz2 otp-a9953b23cbc7327132df4da61f236413a828e6b5.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/edoc/src')
| -rw-r--r-- | lib/edoc/src/edoc_data.erl | 5 | ||||
| -rw-r--r-- | lib/edoc/src/edoc_lib.erl | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/lib/edoc/src/edoc_data.erl b/lib/edoc/src/edoc_data.erl index aad0b14371..624f9177a2 100644 --- a/lib/edoc/src/edoc_data.erl +++ b/lib/edoc/src/edoc_data.erl @@ -167,7 +167,10 @@ callbacks(Es, Module, Env, Opts) -> case lists:any(fun (#entry{name = {behaviour_info, 1}}) -> true; (_) -> false end, - Es) of + Es) + orelse + lists:keymember(callback, 1, Module#module.attributes) + of true -> try (Module#module.name):behaviour_info(callbacks) of Fs -> diff --git a/lib/edoc/src/edoc_lib.erl b/lib/edoc/src/edoc_lib.erl index 7fd8358add..90fb8a679c 100644 --- a/lib/edoc/src/edoc_lib.erl +++ b/lib/edoc/src/edoc_lib.erl @@ -469,6 +469,10 @@ uri_get("ftp:" ++ Path) -> uri_get("//" ++ Path) -> Msg = io_lib:format("cannot access network-path: '//~s'.", [Path]), {error, Msg}; +uri_get([C, $:, $/ | _]=Path) when C >= $A, C =< $Z; C >= $a, C =< $z -> + uri_get_file(Path); % special case for Windows +uri_get([C, $:, $\ | _]=Path) when C >= $A, C =< $Z; C >= $a, C =< $z -> + uri_get_file(Path); % special case for Windows uri_get(URI) -> case is_relative_uri(URI) of true -> |