diff options
| author | Raimo Niskanen <[email protected]> | 2010-07-07 10:43:10 +0200 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2010-07-07 10:43:10 +0200 |
| commit | 4e0dc5047e67f8c697c98e4967b44315d54eff1a (patch) | |
| tree | ece26801f1681c719be4062207e4080314b9a9c6 /lib/docbuilder/src/docb_xmerl_tree_cb.erl | |
| parent | 91078fbc7b0719150a0c7749a1de9e5c0c9bbdeb (diff) | |
| parent | 8e79baa449f43889f7e92030258df90ab0045a81 (diff) | |
| download | otp-4e0dc5047e67f8c697c98e4967b44315d54eff1a.tar.gz otp-4e0dc5047e67f8c697c98e4967b44315d54eff1a.tar.bz2 otp-4e0dc5047e67f8c697c98e4967b44315d54eff1a.zip | |
Merge branch 'ks/cleanups' into dev
* ks/cleanups:
compiler: Fix incorrect types and specs
escript: Add more types to records
debugger: Clean up as suggested by tidier
docbuilder: Clean up as suggested by tidier
Conflicts:
lib/debugger/src/dbg_iload.erl
lib/debugger/src/dbg_ui_trace_win.erl
Diffstat (limited to 'lib/docbuilder/src/docb_xmerl_tree_cb.erl')
| -rw-r--r-- | lib/docbuilder/src/docb_xmerl_tree_cb.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/docbuilder/src/docb_xmerl_tree_cb.erl b/lib/docbuilder/src/docb_xmerl_tree_cb.erl index d57f55bff8..bc62069230 100644 --- a/lib/docbuilder/src/docb_xmerl_tree_cb.erl +++ b/lib/docbuilder/src/docb_xmerl_tree_cb.erl @@ -188,8 +188,8 @@ attrs(DTD, Tag, GivenAttrs) -> merge_attrs(Tag, default_attrs(DTD, Tag), GivenAttrs). merge_attrs(Tag, [{NameA, Type, DefVal}|Default], GivenAttrs) -> - Val = case lists:keysearch(NameA, #xmlAttribute.name, GivenAttrs) of - {value, #xmlAttribute{value=Val0}} -> Val0; + Val = case lists:keyfind(NameA, #xmlAttribute.name, GivenAttrs) of + #xmlAttribute{value=Val0} -> Val0; false -> DefVal end, Attr = {attr_name(NameA), Type, attr_val(Type, Val)}, |