diff options
| author | Fredrik Gustafsson <[email protected]> | 2012-08-10 10:42:03 +0200 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2012-08-10 10:42:03 +0200 |
| commit | f20c64056d2f36d1ea7b07faf2a104378f4c97ee (patch) | |
| tree | 162f9f9d315c98c8fe13847eac09b8b5b1f722ff | |
| parent | 2c799b1c86308246a0aca04d92f301d45509b951 (diff) | |
| parent | 3d9dcf8a8a483742f57924348ae56e4a6bfa1c3c (diff) | |
| download | otp-f20c64056d2f36d1ea7b07faf2a104378f4c97ee.tar.gz otp-f20c64056d2f36d1ea7b07faf2a104378f4c97ee.tar.bz2 otp-f20c64056d2f36d1ea7b07faf2a104378f4c97ee.zip | |
Merge branch 'rc/edoc-0.7.10/OTP-10174' into maint
* rc/edoc-0.7.10/OTP-10174:
bumped revision
List behaviour callbacks in Edoc when using -callback attribute
added special case for file names under Windows, thanks to Beads Land-Trujillo
| -rw-r--r-- | lib/edoc/src/edoc_data.erl | 5 | ||||
| -rw-r--r-- | lib/edoc/src/edoc_lib.erl | 4 | ||||
| -rw-r--r-- | lib/edoc/vsn.mk | 2 |
3 files changed, 9 insertions, 2 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 -> diff --git a/lib/edoc/vsn.mk b/lib/edoc/vsn.mk index b8f33894f1..2f403212c8 100644 --- a/lib/edoc/vsn.mk +++ b/lib/edoc/vsn.mk @@ -1 +1 @@ -EDOC_VSN = 0.7.9.1 +EDOC_VSN = 0.7.10 |